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

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

3 files changed, 57 insertions, 4 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/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"