diff options
| -rw-r--r-- | x11-misc/google-gadgets/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-misc/google-gadgets/files/google-gadgets-0.10.4-xulrunner-1.9.1.patch | 82 | ||||
| -rw-r--r-- | x11-misc/google-gadgets/google-gadgets-0.10.4.ebuild | 3 |
3 files changed, 90 insertions, 2 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/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' \ |