Apply a upstream patch to fix race condition when two xulrunners are installed and wrong headers get picked up wrt #273059, thanks to Anarchy for poking me on IRC.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 36 insertions, 9 deletions

diff --git a/www-plugins/gecko-mediaplayer/ChangeLog b/www-plugins/gecko-mediaplayer/ChangeLog
index 2bcde04bfba4..b738a1637ead 100644
--- a/www-plugins/gecko-mediaplayer/ChangeLog
+++ b/www-plugins/gecko-mediaplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-plugins/gecko-mediaplayer
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.8 2009/06/07 19:04:54 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/ChangeLog,v 1.9 2009/06/21 19:08:20 ssuominen Exp $
+
+  21 Jun 2009; Samuli Suominen <ssuominen@gentoo.org>
+  gecko-mediaplayer-0.9.6.ebuild, +files/gecko-mediaplayer-0.9.6-xul.patch:
+  Apply a upstream patch to fix race condition when two xulrunners are
+  installed and wrong headers get picked up wrt #273059, thanks to Anarchy
+  for poking me on IRC.
 
   07 Jun 2009; Tobias Klausmann <klausman@gentoo.org>
   gecko-mediaplayer-0.9.6.ebuild:
diff --git a/www-plugins/gecko-mediaplayer/Manifest b/www-plugins/gecko-mediaplayer/Manifest
index 00ccf03fc3e7..9abeb6f95a2b 100644
--- a/www-plugins/gecko-mediaplayer/Manifest
+++ b/www-plugins/gecko-mediaplayer/Manifest
@@ -1,6 +1,7 @@
+AUX gecko-mediaplayer-0.9.6-xul.patch 687 RMD160 f31e072487afa241cd35d9649b5284c7ead24167 SHA1 25ce0ce8b1b1f33c4dc5ba5be8118b120c53553f SHA256 a618947606fd92efa779d6939146c2e5b6b49541c1f6520f1d34a4a2ca40f856
 DIST gecko-mediaplayer-0.9.5.tar.gz 220301 RMD160 674de88a6654c829855094d5d20f8d21bebd768b SHA1 74ad7f5f62f8c7bc0709d25bc14c668f545cec75 SHA256 60cd30e5d44e0ee1e3b96309c3767f5f2eb1cbc29d3d49b7c624cfa60579bf16
 DIST gecko-mediaplayer-0.9.6.tar.gz 389598 RMD160 d50463aeec54ac25404b915f7e659e41b2070e5c SHA1 8de13d93a92729ad9ea2e9e0ccaa1f019c7a44ac SHA256 27fba7e5c1ff53d7b88742a40e85d045a25b9da05b6e3d77fd9de4b4c39687a0
 EBUILD gecko-mediaplayer-0.9.5.ebuild 1255 RMD160 5faefb1b33a2baf466502bb765ec5defbcd60f2b SHA1 a763eaa58d762a765a9a32f0756bb372a91b42a6 SHA256 2f1cf86779ff9bcc425db589a062dd80604f2fe36a272f4a97201e2cd3b60d10
-EBUILD gecko-mediaplayer-0.9.6.ebuild 1257 RMD160 48c1dd7af07bc7a95e77d6360a78fd2dc6e89c39 SHA1 27ca73d5a10993581603e0475d00ab2fc1f5fc1f SHA256 4a54581e42ff6a916b27af9085a6e91ca93267188660fb86014b2cd8f5fd51b7
-MISC ChangeLog 2909 RMD160 76725372638819b85bc594c5466bfa03dd751113 SHA1 5d1e128e016e01ac205de868ac26edf7ecd57111 SHA256 47f981cc25d35f7c4aa34b0d811c69796e53919497e583dc29c31d7a8a752d24
+EBUILD gecko-mediaplayer-0.9.6.ebuild 1329 RMD160 27e8ef297077d15913207c2a90995288e989a018 SHA1 fa8a5438f7a2d527406e2e33b817e949a946704f SHA256 4c7bcf952fa4c32c8ea48a826725784bf26c7fbd714ea180b4f8bb102d6b693b
+MISC ChangeLog 3211 RMD160 9d427917ff55c57446ae799f10b24880a5dfc57c SHA1 bacfaeb4c3d97b17b3a36eb1d023804e223da26c SHA256 d75e8fcdffea13b47c5958865206a5376e51b6eeeeb554f713d68f7e41a62721
 MISC metadata.xml 228 RMD160 3071d739d8e15041d594882afdfc434453568466 SHA1 06e3ee83b7a5a910d2d63ea77afb2e5a292606f6 SHA256 060670a1a67923937e4bf55598ae59368d5e716b0b618dedaf12b15f45e8e234
diff --git a/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.6-xul.patch b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.6-xul.patch
new file mode 100644
index 000000000000..073c611df8a9
--- /dev/null
+++ b/www-plugins/gecko-mediaplayer/files/gecko-mediaplayer-0.9.6-xul.patch
@@ -0,0 +1,16 @@
+Upstreamized patch wrt http://bugs.gentoo.org/attachment.cgi?id=273059
+Fixes race condition where two different xulrunners are installed, and
+old headers get picked up by mistake.
+
+--- src/plugin_setup.cpp-old	2009-06-09 19:48:33.518153163 -0500
++++ src/plugin_setup.cpp	2009-06-09 19:48:12.522163011 -0500
+@@ -362,7 +362,7 @@
+ 
+     }
+ 
+-    nperror = NPN_GetValue (instance->mInstance, NPNVSupportsWindowless, &supportsWindowless);
++    nperror = NPN_GetValue (instance->mInstance, (NPNVariable) 17 /* NPNVSupportsWindowless */, &supportsWindowless);
+ 	supportsWindowless = (nperror == NPERR_NO_ERROR) && supportsWindowless;
+ 	if (instance->windowless) {
+ 		if (supportsWindowless) {
+
diff --git a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.6.ebuild b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.6.ebuild
index 4b7b1c6ce0b1..01b075e86d7d 100644
--- a/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.6.ebuild
+++ b/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.6.ebuild,v 1.2 2009/06/07 19:04:54 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gecko-mediaplayer/gecko-mediaplayer-0.9.6.ebuild,v 1.3 2009/06/21 19:08:20 ssuominen Exp $
 
 EAPI=2
 GCONF_DEBUG=no
@@ -25,15 +25,19 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	sys-devel/gettext"
 
-G2CONF="$(use_with gnome gconf)
-	$(use_enable gnome schemas-install)"
+pkg_setup() {
+	G2CONF+=" $(use_with gnome gconf)
+		$(use_enable gnome schemas-install)"
+	DOCS="ChangeLog DOCS/tech/javascript.txt"
+}
 
-DOCS="ChangeLog DOCS/tech/javascript.txt"
+src_prepare() {
+	gnome2_src_prepare
+	epatch "${FILESDIR}"/${P}-xul.patch
+}
 
 src_install() {
 	gnome2_src_install
-
-	# remove duplicate dir
 	rm -rf "${D}"/usr/share/doc/${PN}
 
 	# move plugins to correct location and clean up empty dirs