Fix patch that was failing, thanks to galtgendo for reporting

Package-Manager: portage-2.1.8.3/cvs/Linux i686

diff --git a/www-client/mozilla-firefox/ChangeLog b/www-client/mozilla-firefox/ChangeLog
index c7f60ef41f83bdb66782767d39da3978eb60c029..92d289de7a4473634a24ed81ff47e85b23b70f47 100644 (file)
--- a/www-client/mozilla-firefox/ChangeLog
+++ b/www-client/mozilla-firefox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/mozilla-firefox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.616 2010/06/22 21:18:12 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/ChangeLog,v 1.617 2010/06/23 00:46:26 nirbheek Exp $
+
+  23 Jun 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  mozilla-firefox-3.6.4.ebuild,
+  +files/137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch:
+  Fix patch that was failing, thanks to galtgendo for reporting
 
 *mozilla-firefox-3.6.4 (22 Jun 2010)
 

diff --git a/www-client/mozilla-firefox/Manifest b/www-client/mozilla-firefox/Manifest
index dd09839eed5e495b13d8d158ffb084c93dc430fb..8a2dbd94650c477ca83b18fea7505998648f8db0 100644 (file)
--- a/www-client/mozilla-firefox/Manifest
+++ b/www-client/mozilla-firefox/Manifest
@@ -1,5 +1,6 @@
 AUX 000_flex-configure-LANG.patch 1761 RMD160 638ae47607f582d6d264f7b6f4c3626ff60dbcb6 SHA1 db6d868d034b46b63ad292ab2e1c9b889fbeef75 SHA256 88719f2b3ab2be74a4d27173f7464f6fbc8e7697b84e3c32d19cf6e16170e532
 AUX 1000_fix_alignment.patch 796 RMD160 d6098c483a90d47ead8cc7c643bf51270465b4cd SHA1 d2e861a0892550659a152d6a4ae9a1d31996c800 SHA256 49675bf2771b3e1bc50069f3a07f96062c771e8281d8e5abc2219dd08a23d377
+AUX 137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch 2473 RMD160 cfbed88e1813f4880dabb18b6a9540cf3747f7f4 SHA1 5e0d98b3e3bf3ffb5f88eef30b1af095a6f0057d SHA256 be069b468eff7f06bb0fe160dea947c081cb00e1a8cbde2bd39c52ebf9aa2984
 AUX firefox-default-prefs.js 95 RMD160 805cdfec6fb31c224322cb71125547ad7a515f49 SHA1 7fab69d85b12a9f1b0c87fbb1821bdafd7485ac9 SHA256 8bc4cb870bc402db1f20b135a689f8c5dbfa5de8f1755b1926198d627c12c5f1
 AUX firefox.1 2538 RMD160 4564007d7d5345e9ab09c941015e3cdb78913835 SHA1 8be1987451117820744ecc67fa411facdc653a12 SHA256 3483439a73c74b818bdde98c15223b6d3fcfe78e3ad974fb35f197cf3ad614e7
 AUX gentoo-default-prefs.js 598 RMD160 9ee952b88ebee3b47f6466e2d19674805d8529d2 SHA1 980bc21282021b8be5c420155d2126c86b174068 SHA256 ad533b62fcc7e0ebbafe039e74db68734c86077178b03d37a01868cf790c42f9
@@ -283,6 +284,6 @@ DIST mozilla-firefox-3.6.4-zh-TW.xpi 128404 RMD160 6f78df2c439f12ac62d0765ec591e
 EBUILD mozilla-firefox-2.0.0.19.ebuild 10148 RMD160 0abf5dac24c47da9df18690fbbada3dcd5c612be SHA1 62d453d2a38fa7353c991e07aa0753c1e361ccd8 SHA256 15f59686b4948e52d46221483b4c3124886846f100b9266047b236ada6a30fe1
 EBUILD mozilla-firefox-3.5.8.ebuild 8551 RMD160 1ade6f7f07446b1da263d1a58fd6e0dad42dec1e SHA1 a7660c3308b5953d8b0a48f5e1beb75194ffcc3a SHA256 4c7154f594860a5471ba4d1b75a10edec968ff0cccd1f2426a355cf1521022ac
 EBUILD mozilla-firefox-3.6.3.ebuild 8652 RMD160 7709adca8f16a264d4fba4c893fb30161d3f655f SHA1 ba76763dd93b4516303d03983caa7515bd49cbcf SHA256 5ef2b9ab794ec5a839d59d2c946784e2e3fda435323b639f36007d440fc9603a
-EBUILD mozilla-firefox-3.6.4.ebuild 8721 RMD160 125530b5e894a53bb2d4cea5a8559cc13c81aea7 SHA1 82186386faa89fe6819728d01088d3ccc2e33fc7 SHA256 d80ea988bbfb28877b207bc742957e04ac79ea0849427cbb9aa521cf1cac1a59
-MISC ChangeLog 114122 RMD160 61329b371c0f2e92396af9c9bfc7510e89ac2d54 SHA1 f0873290c37dcfb5a62c2005c9de2da4a9462edc SHA256 bd43330b8ffe1d7c61ab5eacd422dc7d41a88217e5cee70995a466dd181e6cb2
+EBUILD mozilla-firefox-3.6.4.ebuild 8950 RMD160 5d4603c800f32c04fd951e55a0981f0c00db2fce SHA1 bdcf704c072f2b4d9f867aefb5e03c7817be152a SHA256 0d7c629b227ccec85f15cf49aeec76a05677ba696adaaebd814cf35931dccb33
+MISC ChangeLog 114341 RMD160 79d799f23d998d4b3da047cd5356530b1dc88806 SHA1 ddcbd9f9a0a91c3a303cf6d2f09c288b89422605 SHA256 d85823c8081d58e9733f7132768bb6622ff60786c6387ba12de8062ce3703386
 MISC metadata.xml 934 RMD160 515723c95ea7fcc7715fbd781c4f9a9784c212c0 SHA1 24fe41af8aea9f860656f32381c6b55f97357487 SHA256 e1b3e8cc44a861538dcacbeca620ffc71a22060a428d34718635837d9e3166e0

diff --git a/www-client/mozilla-firefox/files/137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch b/www-client/mozilla-firefox/files/137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch
new file mode 100644 (file)
index 0000000..5d0c93c
--- /dev/null
+++ b/www-client/mozilla-firefox/files/137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch
@@ -0,0 +1,60 @@
+This patch has been ported to 3.6.4, may not be entirely correct.
+
+Original patch was from bmo 460917, att 350845
+
+---
+--- browser/base/content/browser.js
++++ browser/base/content/browser.js
+@@ -6009,9 +6009,18 @@
+     var pluginInfo = getPluginInfo(aEvent.target);
+     missingPluginsArray[pluginInfo.mimetype] = pluginInfo;
+ 
++ 
++    gBrowser.selectedBrowser.addEventListener("NewPluginInstalled",
++                                              gMissingPluginInstaller.refreshBrowser,
++                                              false);
++ 
+     openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",
+                "PFSWindow", "chrome,centerscreen,resizable=yes",
+                {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser});
++
++    gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled",
++                                                 gMissingPluginInstaller.refreshBrowser,
++                                                 false);
+   },
+ 
+   // Callback for user clicking on a disabled plugin
+@@ -6107,11 +6116,19 @@
+     function showPluginsMissing() {
+       // get the urls of missing plugins
+       var missingPluginsArray = gBrowser.selectedBrowser.missingPlugins;
++ 
++    gBrowser.selectedBrowser.addEventListener("NewPluginInstalled",
++                                              gMissingPluginInstaller.refreshBrowser,
++                                              false);
++ 
+       if (missingPluginsArray) {
+         window.openDialog("chrome://mozapps/content/plugins/pluginInstallerWizard.xul",
+                           "PFSWindow", "chrome,centerscreen,resizable=yes",
+                           {plugins: missingPluginsArray, browser: gBrowser.selectedBrowser});
+       }
++    gBrowser.selectedBrowser.removeEventListener("NewPluginInstalled",
++                                                 gMissingPluginInstaller.refreshBrowser,
++                                                 false);
+     }
+ 
+     if (aEvent.type == "PluginBlocklisted") {
+@@ -6442,6 +6459,13 @@
+       notificationBox.removeNotification(notification);
+     }
+     // reload the browser to make the new plugin show.
++  
++    // reload plugins
++    var pm = Components.classes["@mozilla.org/plugin/manager;1"]
++                 .getService(Components.interfaces.nsIPluginManager);
++    pm.reloadPlugins(false);
++  
++    // ... and reload the browser to activate new plugins available
+     browser.reload();
+   }
+ };

diff --git a/www-client/mozilla-firefox/mozilla-firefox-3.6.4.ebuild b/www-client/mozilla-firefox/mozilla-firefox-3.6.4.ebuild
index dabdd2c35fe55a2538c0b3cfb7d0a08feb2f5fd8..9ae0aa142a63db2432845feed8f8e6ff25166861 100644 (file)
--- a/www-client/mozilla-firefox/mozilla-firefox-3.6.4.ebuild
+++ b/www-client/mozilla-firefox/mozilla-firefox-3.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.6.4.ebuild,v 1.1 2010/06/22 21:18:12 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla-firefox/mozilla-firefox-3.6.4.ebuild,v 1.2 2010/06/23 00:46:26 nirbheek Exp $
 EAPI="2"
 WANT_AUTOCONF="2.1"
 
@@ -127,8 +127,12 @@ src_prepare() {
        # Apply our patches
        EPATCH_SUFFIX="patch" \
        EPATCH_FORCE="yes" \
+       EPATCH_EXCLUDE="137-bz460917_att350845_reload_new_plugins-gentoo-update.patch" \
        epatch "${WORKDIR}"
 
+       # The patch excluded above failed, ported patch is applied below
+       epatch "${FILESDIR}/137-bz460917_reload_new_plugins-gentoo-update-3.6.4.patch"
+
        # Fix media build failure
        epatch "${FILESDIR}/xulrunner-1.9.2-noalsa-fixup.patch"