Get ready for xulrunner 1.9.1, patch spotted by loki_val

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 93 insertions, 4 deletions

diff --git a/x11-misc/google-gadgets/ChangeLog b/x11-misc/google-gadgets/ChangeLog
index 374c0ad95946..9aba3cbe6812 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-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.17 2008/12/17 09:18:59 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.18 2008/12/30 10:42:12 voyageur Exp $
+
+  30 Dec 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/google-gadgets-0.10.4-xulrunner-1.9.1.patch,
+  google-gadgets-0.10.4.ebuild:
+  Get ready for xulrunner 1.9.1, patch spotted by loki_val
 
   17 Dec 2008; Bernard Cafarelli <voyageur@gentoo.org>
   +files/google-gadgets-0.10.4-gcc41.patch, google-gadgets-0.10.3.ebuild,
diff --git a/x11-misc/google-gadgets/Manifest b/x11-misc/google-gadgets/Manifest
index 3d0044d4c73e..d691df7d5e08 100644
--- a/x11-misc/google-gadgets/Manifest
+++ b/x11-misc/google-gadgets/Manifest
@@ -1,5 +1,6 @@
 AUX google-gadgets-0.10.0-xulrunner-1.9.patch 13284 RMD160 4bbb2f3ba511bafddd888a32641ee1e7224739be SHA1 b4ae542da4266e8e3fe70c8ce691e40c3d458b17 SHA256 7644f7b00a0e0b2c798079b6c62c4fd6ace16428e7d23c44e149ceb4ff5ca4d4
 AUX google-gadgets-0.10.4-gcc41.patch 1480 RMD160 8a6ce24cb6973d2fe6b687857b3df50bc85ea1d8 SHA1 50bf007b5fecec9157f11bc28190adc547bdc29c SHA256 00a1af861867848300ff69072ddfdfa675a4c310b94e26ffc5ab8851a359d7cc
+AUX google-gadgets-0.10.4-xulrunner-1.9.1.patch 2805 RMD160 949e5d8192f92da33c0ae702ed27a5095ae60413 SHA1 661877a741ddf1332ce6dedd88378dd55ae45a9d SHA256 11948ac7151d7e10798b8815692bf8769f060ced485cf95a4c066686ce947665
 DIST google-gadgets-for-linux-0.10.0.tar.gz 2499027 RMD160 c76ba7b37f7bb976c018c5cbdb60e8ec504601dd SHA1 198e71445e5be4f5880b51cc0dfd9c6b51b908e5 SHA256 5367a44d47d60e31fc17dc43b7b1e1d393147bd901cb8c24f7975781e4abed5a
 DIST google-gadgets-for-linux-0.10.2.tar.bz2 2188977 RMD160 c38346902f7c5e9cb176677e914683a8e8bf7256 SHA1 b8e18080aeb0758e8eeddfa3f8373e7a95ec958c SHA256 0429408cd215dc8cb33c6fda31c65425366597426e3679004633b874f8fed164
 DIST google-gadgets-for-linux-0.10.3.tar.bz2 2310377 RMD160 6256a0e34e4c157aef4b88537c54192d93f3af0c SHA1 a067ba48fa195bbeed407dc0e528e608e59156ee SHA256 fe63758aacb3842829c5a6d7698152b34becb44fe3e2d84d9706bf4ea9956c1e
@@ -7,6 +8,6 @@ DIST google-gadgets-for-linux-0.10.4.tar.bz2 2384725 RMD160 d47586e7a97e27c3a2a0
 EBUILD google-gadgets-0.10.0-r2.ebuild 4131 RMD160 8dfabe6b0de0591bfa3601eb5868be030a2146d5 SHA1 80a0d9deb5c9ffca3a15dd4bfd1cd1ec0c87d729 SHA256 b5602b80df5dbe69b2d09862be7011c13581bce157659765f63fd3790da6efc7
 EBUILD google-gadgets-0.10.2-r2.ebuild 4668 RMD160 e4e72d58f191ebce8394672f6ddfe27cdf7a5a6d SHA1 d3ff404e5289833a01d3ef549f2940f08ac34289 SHA256 531100d5da78b869a923197571f5257d7491909517ed82e8aca54720ea0a9155
 EBUILD google-gadgets-0.10.3.ebuild 4138 RMD160 ebca1f9c2f520b51cc252435ce2181ffb68de639 SHA1 3ddbd963ae7122910b8f15589d9073b96e6e8e23 SHA256 85e5c00decff6dd2e8763545d0730e747d3e8063c6065237520fdbc4ea7fda71
-EBUILD google-gadgets-0.10.4.ebuild 4239 RMD160 62f75f0d0f2d794bd28ff04a7fffba4ee4784bf1 SHA1 f1a21da55fe696afc5b2973c4f6e22eb11202b1a SHA256 a6a4a18b10f99f180f9d814ec66cd45cff9943d4abe109f556d19484b5825e8a
-MISC ChangeLog 3850 RMD160 78c3de576ef1295b16c64b95cba8dcb744a3d16e SHA1 18850e616aae9387cb522d937ed9533a90adc2f3 SHA256 90bc5d7c15797e667b2db05a20cce6574782648446f34b028f2b80124478d4a5
+EBUILD google-gadgets-0.10.4.ebuild 4288 RMD160 adf8a9965d0b787a09442129e90b559d52c40ab4 SHA1 668c296fbe7e9090c6baf7f69862ef323bbce0fc SHA256 7188126e09438f76e6f0251058a79bfa06fb0472828f0d1e34d77250d804a0f5
+MISC ChangeLog 4051 RMD160 d3d3b5d49a02eedf5a6e3266b4ea837480f858d6 SHA1 970423bc762fb6f9b518f3f1ac927a4c3aaf3c59 SHA256 7dbb8e8c6dc915198b3eb80969d1b8700c59ad2bf9a2e4324e0bde87fec5f4d3
 MISC metadata.xml 260 RMD160 af6650245d6ccbcbdb2e829cd5d7be36bef71058 SHA1 a09861327ac9225fbbfafb891a8998f2ea6c73bb SHA256 1dfcd18a238fd7d714e848ad5661fbe98c7556e276b054d962cccfe44f7240f6
diff --git a/x11-misc/google-gadgets/files/google-gadgets-0.10.4-xulrunner-1.9.1.patch b/x11-misc/google-gadgets/files/google-gadgets-0.10.4-xulrunner-1.9.1.patch
new file mode 100644
index 000000000000..7550ac8c2add
--- /dev/null
+++ b/x11-misc/google-gadgets/files/google-gadgets-0.10.4-xulrunner-1.9.1.patch
@@ -0,0 +1,82 @@
+=== autotools/libmozjs.m4
+==================================================================
+--- autotools/libmozjs.m4	(revision 1354)
++++ autotools/libmozjs.m4	(revision 1355)
+@@ -32,9 +32,19 @@
+ 
+   AC_MSG_CHECKING([for libmozjs.so version >= $ggl_check_libmozjs_min_version])
+ 
++  AC_CHECK_HEADER([jsversion.h], [has_jsversion_h=yes], [has_jsversion_h=no])
++  if test x$has_jsversion_h = xyes; then
++    LIBMOZJS_CFLAGS="$LIBMOZJS_CFLAGS -DHAVE_JSVERSION_H"
++    CPPFLAGS=$LIBMOZJS_CFLAGS
++  fi
++
+   AC_LINK_IFELSE([[
+     #include<jsapi.h>
++    #ifdef HAVE_JSVERSION_H
++    #include<jsversion.h>
++    #else
+     #include<jsconfig.h>
++    #endif
+ 
+     #if JS_VERSION < $ggl_check_libmozjs_min_version
+     #error "libmozjs.so version is too low."
+@@ -68,7 +78,11 @@
+       // MOZILLA_1_8_BRANCH macro is not defined but the library was compiled
+       // with the flag, or vise versa.
+       #include <jsapi.h>
++      #ifdef HAVE_JSVERSION_H
++      #include<jsversion.h>
++      #else
+       #include<jsconfig.h>
++      #endif
+ 
+       static JSBool f(JSContext *c, JSObject *o, uintN ac, jsval *av, jsval *r) {
+         return JS_TRUE;
+=== extensions/gtkmoz_browser_element/Makefile.am
+==================================================================
+--- extensions/gtkmoz_browser_element/Makefile.am	(revision 1354)
++++ extensions/gtkmoz_browser_element/Makefile.am	(revision 1355)
+@@ -59,8 +59,10 @@
+ 
+ gtkmoz_browser_child_CPPFLAGS	= $(GTK2_CFLAGS) \
+ 				  $(GTKMOZEMBED_CFLAGS) \
++				  $(LIBMOZJS_CFLAGS) \
+ 				  $(PREDEFINED_MACROS)
+ 
++# Don't link to libmozjs explicitly.
+ gtkmoz_browser_child_LDADD	= $(GTK2_LIBS) \
+ 				  $(GTKMOZEMBED_LIBS) \
+ 				  $(top_builddir)/ggadget/libggadget@GGL_EPOCH@.la \
+=== extensions/gtkmoz_browser_element/browser_child.cc
+==================================================================
+--- extensions/gtkmoz_browser_element/browser_child.cc	(revision 1354)
++++ extensions/gtkmoz_browser_element/browser_child.cc	(revision 1355)
+@@ -37,7 +37,12 @@
+ #include <gtkmozembed.h>
+ #include <gtkmozembed_internal.h>
+ #include <jsapi.h>
++
++#ifdef HAVE_JSVERSION_H
++#include <jsversion.h>
++#else
+ #include <jsconfig.h>
++#endif
+ 
+ #include <nsComponentManagerUtils.h>
+ #include <nsCOMPtr.h>
+=== configure.ac
+==================================================================
+--- configure.ac	(revision 1354)
++++ configure.ac	(revision 1355)
+@@ -905,9 +905,6 @@
+     build_gtkmoz_browser_element=no
+   fi
+ else
+-  # Add smjs related cflags, we don't want to link to smjs explicitly,
+-  # so don't use its libs.
+-  GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS $LIBMOZJS_CFLAGS"
+   # Add additional include dirs for mozilla 1.8 and pre 1.9
+   EMBED_INCDIR=`$PKG_CONFIG --variable=includedir $has_gtkmozembed`
+   GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS -I$EMBED_INCDIR"
diff --git a/x11-misc/google-gadgets/google-gadgets-0.10.4.ebuild b/x11-misc/google-gadgets/google-gadgets-0.10.4.ebuild
index 612811d874dd..274f3553bdfb 100644
--- a/x11-misc/google-gadgets/google-gadgets-0.10.4.ebuild
+++ b/x11-misc/google-gadgets/google-gadgets-0.10.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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.10.4.ebuild,v 1.2 2008/12/17 09:18:59 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.10.4.ebuild,v 1.3 2008/12/30 10:42:12 voyageur Exp $
 
 EAPI=2
 
@@ -79,6 +79,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${P}-gcc41.patch
+	epatch "${FILESDIR}"/${P}-xulrunner-1.9.1.patch
 
 	sed -i -r \
 		-e '/^GGL_SYSDEPS_INCLUDE_DIR/ c\GGL_SYSDEPS_INCLUDE_DIR=$GGL_INCLUDE_DIR' \