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.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 33 insertions, 7 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/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