Fix compilation with gcc 4.1, clean warning on gcc version in 0.10.3 (works with gcc 4.1)

(Portage version: 2.2_rc17/cvs/Linux 2.6.26-gentoo x86_64)

4 files changed, 53 insertions, 7 deletions

diff --git a/x11-misc/google-gadgets/ChangeLog b/x11-misc/google-gadgets/ChangeLog
index cd82ab4e4d22..374c0ad95946 100644
--- a/x11-misc/google-gadgets/ChangeLog
+++ b/x11-misc/google-gadgets/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2008/12/16 10:31:22 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/ChangeLog,v 1.17 2008/12/17 09:18:59 voyageur Exp $
+
+  17 Dec 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  +files/google-gadgets-0.10.4-gcc41.patch, google-gadgets-0.10.3.ebuild,
+  google-gadgets-0.10.4.ebuild:
+  Fix compilation with gcc 4.1, clean warning on gcc version in 0.10.3
+  (works with gcc 4.1)
 
 *google-gadgets-0.10.4 (16 Dec 2008)
 
diff --git a/x11-misc/google-gadgets/files/google-gadgets-0.10.4-gcc41.patch b/x11-misc/google-gadgets/files/google-gadgets-0.10.4-gcc41.patch
new file mode 100644
index 000000000000..3b8a28c39480
--- /dev/null
+++ b/x11-misc/google-gadgets/files/google-gadgets-0.10.4-gcc41.patch
@@ -0,0 +1,42 @@
+=== extensions/gtkmoz_browser_element/browser_element.cc
+==================================================================
+--- extensions/gtkmoz_browser_element/browser_element.cc	(revision 1184)
++++ extensions/gtkmoz_browser_element/browser_element.cc	(revision 1185)
+@@ -416,6 +416,8 @@
+           object_id_str_(StringPrintf("%zu", object_id)),
+           call_self_(this),
+           to_string_(NewSlot(this, &BrowserObjectWrapper::ToString)) {
++      if (parent_)
++        parent_->Ref();
+     }
+ 
+     virtual ~BrowserObjectWrapper() {
+@@ -426,6 +428,8 @@
+         owner_->controller_->SendCommand(kUnrefCommand, owner_->browser_id_,
+                                          object_id_str_.c_str(), NULL);
+       }
++      if (parent_)
++        parent_->Unref();
+     }
+ 
+     void OnOwnerDestroy() {
+@@ -523,8 +527,8 @@
+         buffer += '\n';
+         buffer += wrapper_->object_id_str_;
+         buffer += '\n';
+-        if (wrapper_->parent_.Get())
+-          buffer += wrapper_->parent_.Get()->object_id_str_;
++        if (wrapper_->parent_)
++          buffer += wrapper_->parent_->object_id_str_;
+         for (int i = 0; i < argc; i++) {
+           buffer += '\n';
+           buffer += wrapper_->owner_->EncodeValue(argv[i]);
+@@ -546,7 +550,7 @@
+     };
+ 
+     BrowserElementImpl *owner_;
+-    ScriptableHolder<BrowserObjectWrapper> parent_;
++    BrowserObjectWrapper *parent_;
+     size_t object_id_;
+     std::string object_id_str_;
+     CallSelfSlot call_self_;
diff --git a/x11-misc/google-gadgets/google-gadgets-0.10.3.ebuild b/x11-misc/google-gadgets/google-gadgets-0.10.3.ebuild
index f8dc81b525f5..aabf76c3ef7b 100644
--- a/x11-misc/google-gadgets/google-gadgets-0.10.3.ebuild
+++ b/x11-misc/google-gadgets/google-gadgets-0.10.3.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.3.ebuild,v 1.2 2008/12/15 10:14:36 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/google-gadgets/google-gadgets-0.10.3.ebuild,v 1.3 2008/12/17 09:18:59 voyageur Exp $
 
 EAPI=2
 
@@ -20,8 +20,6 @@ IUSE="+dbus debug +gtk +qt4 +gstreamer networkmanager startup-notification"
 # I've just locked the deps to the versions I had as of Summer 2008. With any
 # luck, they'll be stable when we get to stabling this package.
 
-#BIG DANGLING NOTE: This fails with gcc <4.2.
-
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	>=dev-libs/libxml2-2.6.32
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 041d7870cea3..612811d874dd 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.1 2008/12/16 10:31:22 voyageur Exp $
+# $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 $
 
 EAPI=2
 
@@ -20,8 +20,6 @@ IUSE="+dbus debug +gtk +qt4 +gstreamer networkmanager startup-notification"
 # I've just locked the deps to the versions I had as of Summer 2008. With any
 # luck, they'll be stable when we get to stabling this package.
 
-#BIG DANGLING NOTE: This fails with gcc <4.2.
-
 RDEPEND="x11-libs/libX11
 	x11-libs/libXext
 	>=dev-libs/libxml2-2.6.32
@@ -80,6 +78,8 @@ src_unpack() {
 	base_src_unpack
 	cd "${S}"
 
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+
 	sed -i -r \
 		-e '/^GGL_SYSDEPS_INCLUDE_DIR/ c\GGL_SYSDEPS_INCLUDE_DIR=$GGL_INCLUDE_DIR' \
 		configure.ac||die "404"