Add upstream patch to fix compilation with xulrunner 1.9.2, bug #301908

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

4 files changed, 60 insertions, 16 deletions

diff --git a/x11-misc/google-gadgets/ChangeLog b/x11-misc/google-gadgets/ChangeLog
index 3b19fc836b4f..eecf17afd027 100644
--- a/x11-misc/google-gadgets/ChangeLog
+++ b/x11-misc/google-gadgets/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/google-gadgets
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.29 2009/11/23 20:29:01 halcy0n Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.30 2010/01/27 12:44:22 voyageur Exp $
+
+  27 Jan 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  google-gadgets-0.11.1-r1.ebuild,
+  +files/google-gadgets-0.11.1-xulrunner-1.9.2.patch:
+  Add upstream patch to fix compilation with xulrunner 1.9.2, bug #301908
 
   23 Nov 2009; Mark Loeser <halcy0n@gentoo.org>
   +google-gadgets-0.10.5.ebuild:
diff --git a/x11-misc/google-gadgets/Manifest b/x11-misc/google-gadgets/Manifest
index 90e2ebdca6cc..1f512312ffeb 100644
--- a/x11-misc/google-gadgets/Manifest
+++ b/x11-misc/google-gadgets/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX google-gadgets-0.11.1-xulrunner-1.9.2.patch 1463 RMD160 2d28d9313f3aad389eed101bef020cc712cbec97 SHA1 be142d9a21fb30d94fb998ac0d024b2f9155e9cd SHA256 7ab848e6f991a9a70608c3407bcde1a5039f54027b07b125a297ed0ecc4d6c76
 DIST google-gadgets-0.11.1-gtk+-2.18.patch.bz2 5842 RMD160 ecfd042b8e8026364524b7a85650ce2874803067 SHA1 4f5e17e618fa7af08eb83fa4c5058c942d517eb8 SHA256 050b55424f9833253b80a95870da7f557b305fa06cf69489ffd1dc3c753ebf96
 DIST google-gadgets-for-linux-0.10.5.tar.bz2 2429875 RMD160 974f135f8e1e15732f7492ab6ba5c43bc9d44daa SHA1 c85136c862384d789dc0fab7bc4d8b9d82572f30 SHA256 944810df4b134542a1e675e6d9518503466ce9398e8bfca5e3637d994ef5038d
 DIST google-gadgets-for-linux-0.11.1.tar.bz2 2531591 RMD160 e295ee6fd8694e6384d96282d2175f8e43767350 SHA1 f33be5c7bd8dde1103766c27cab638fe52b7b36a SHA256 353eccec0b10bea3ee7cac7594d9c20af606484ba71f2e04df09f4ad78ce7dbe
 EBUILD google-gadgets-0.10.5.ebuild 4184 RMD160 acfb53b545e43241cd0c4a42bc83b62f7eab0894 SHA1 f5b6942fcc9bb8748bd6aaa629dff83fd1791e4a SHA256 99f6c157eb089cf1abdcef8ec2588ed5746fdda3463a4bde14f54a8c3637d1c1
-EBUILD google-gadgets-0.11.1-r1.ebuild 4619 RMD160 4ecf7371f8c2eea58c7d4d6625444a40e2e8b681 SHA1 b22c82e31140fa079c867009ac4334fdf4f63410 SHA256 8956739fba360e831a7eebfb807e3b163b8fa3b31d0ae2ff039e1253c27f32c4
-MISC ChangeLog 6277 RMD160 56578f7234e0c618659b786b8f94f13dd7043ce7 SHA1 afa284ebded5a8cf21f8aa77257cb06615531509 SHA256 22fc4a0401ee8cdde58c7caf36d5b8c4c7f3fd704f5e9bb270505533f332c1cf
+EBUILD google-gadgets-0.11.1-r1.ebuild 4833 RMD160 6b75b27be1952a3b58a425bbbb23761a34db1c8c SHA1 17ac78621f491bdea431c20eaea1d00f19ea7daa SHA256 3d5a77ce719f5a86874ca695b0fc6769a213fc0bd875a690a55bcf45cf61f47a
+MISC ChangeLog 6497 RMD160 fce3c71c8f1b3b8b8d7336a12e207a497205ba46 SHA1 4af2045343ff3ba433deac98c51717550b20d4f7 SHA256 578a9a6a4ea4a73ff9648d066f9f2386a6d164803be237314dd4969d15fb9f74
 MISC metadata.xml 486 RMD160 b08018667c1efbe528ecbbb88b4a0fe5932464f9 SHA1 6d0a5c446e901d47be27b4c707e986b8b8964c64 SHA256 200d5369ac38f83f0fe143ab1d87c734b88e52eb6eca146208fd21dec5776dda
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAksK8JUACgkQCRZPokWLroSalgCgl1tI9+ExYY25KxM0XhCsrig5
-WUsAnRJHaMCOIaW/fbqz+WymIXle5cMh
-=zto8
------END PGP SIGNATURE-----
diff --git a/x11-misc/google-gadgets/files/google-gadgets-0.11.1-xulrunner-1.9.2.patch b/x11-misc/google-gadgets/files/google-gadgets-0.11.1-xulrunner-1.9.2.patch
new file mode 100644
index 000000000000..7ac7dc138c5c
--- /dev/null
+++ b/x11-misc/google-gadgets/files/google-gadgets-0.11.1-xulrunner-1.9.2.patch
@@ -0,0 +1,43 @@
+Index: extensions/gtkmoz_browser_element/browser_child.cc
+===================================================================
+--- extensions/gtkmoz_browser_element/browser_child.cc	(révision 1282)
++++ extensions/gtkmoz_browser_element/browser_child.cc	(révision 1286)
+@@ -1269,7 +1269,7 @@
+ 
+   static const GREVersionRange kGREVersion = {
+     "1.9a", PR_TRUE,
+-    "1.9.2", PR_FALSE,
++    "1.9.4", PR_FALSE,
+   };
+ 
+   char xpcom_location[4096];
+Index: extensions/smjs_script_runtime/libmozjs_glue.cc
+===================================================================
+--- extensions/smjs_script_runtime/libmozjs_glue.cc	(révision 1282)
++++ extensions/smjs_script_runtime/libmozjs_glue.cc	(révision 1286)
+@@ -199,7 +199,7 @@
+ 
+   static const GREVersionRange kGREVersion = {
+     "1.9a", PR_TRUE,
+-    "1.9.2", PR_FALSE,
++    "1.9.4", PR_FALSE,
+   };
+ 
+   rv = GRE_GetGREPathWithProperties(&kGREVersion, 1, nsnull, 0,
+Index: extensions/smjs_script_runtime/converter.cc
+===================================================================
+--- extensions/smjs_script_runtime/converter.cc	(révision 1282)
++++ extensions/smjs_script_runtime/converter.cc	(révision 1286)
+@@ -16,11 +16,11 @@
+ 
+ #include "converter.h"
+ 
+-#include <cmath>
+ #include <jsobj.h>
+ #include <jscntxt.h>
+ #include <jsfun.h>
+ #include <jsnum.h>
++#include <cmath>
+ #include <ggadget/scriptable_array.h>
+ #include <ggadget/scriptable_binary_data.h>
+ #include <ggadget/scriptable_holder.h>
diff --git a/x11-misc/google-gadgets/google-gadgets-0.11.1-r1.ebuild b/x11-misc/google-gadgets/google-gadgets-0.11.1-r1.ebuild
index a1d9c342500c..512eec4e1a05 100644
--- a/x11-misc/google-gadgets/google-gadgets-0.11.1-r1.ebuild
+++ b/x11-misc/google-gadgets/google-gadgets-0.11.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.11.1-r1.ebuild,v 1.1 2009/11/23 14:04:34 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.11.1-r1.ebuild,v 1.2 2010/01/27 12:44:22 voyageur Exp $
 
 EAPI=2
 
@@ -84,6 +84,11 @@ pkg_setup() {
 src_prepare() {
 	epatch "${DISTDIR}"/${P}-gtk+-2.18.patch.bz2
 
+	# http://code.google.com/p/google-gadgets-for-linux/issues/detail?id=352
+	# recommends CXXFLAGS="-Wno-invalid-offsetof", apparently we do not
+	# need it on Gentoo
+	epatch "${FILESDIR}"/${P}-xulrunner-1.9.2.patch
+
 	sed -i -r \
 		-e '/^GGL_SYSDEPS_INCLUDE_DIR/ c\GGL_SYSDEPS_INCLUDE_DIR=$GGL_INCLUDE_DIR' \
 		configure.ac||die "404"