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

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

5 files changed, 57 insertions, 10 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/Manifest b/x11-misc/google-gadgets/Manifest
index 748f826674dd..3d0044d4c73e 100644
--- a/x11-misc/google-gadgets/Manifest
+++ b/x11-misc/google-gadgets/Manifest
@@ -1,11 +1,12 @@
 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
 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
 DIST google-gadgets-for-linux-0.10.4.tar.bz2 2384725 RMD160 d47586e7a97e27c3a2a0a4dbb11087b0a2b98b5d SHA1 d1d53b7a1fff2dd3bbe7670ebaf4a9a0996d92a9 SHA256 03ff4140070ae7518a40fef94993c1f32b02d8f65f88f69363447cff501977df
 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 4185 RMD160 dd39ea87bfd4de1aabe07ed3b58bd05868a9edd8 SHA1 93a9a7cb1bbf7e0a5631b74f7e720c90bab94855 SHA256 00a143b2e38b3d05716cebde77980078c073fd8c17a2e943281637b2f21e39f5
-EBUILD google-gadgets-0.10.4.ebuild 4246 RMD160 3f5c204865a876438106b28f5b44abf4e3c1053b SHA1 2f5156a3bb9e4c66a29f005932a3f74366516639 SHA256 54324d44098460be8b7c706596ea01b27f14adcca8797e36119d1c23f782e015
-MISC ChangeLog 3594 RMD160 ff9c6fea530ce0d1de2aba39746fc282194baacf SHA1 02159f3af0585af698e20e340ccfc5087b3f51ae SHA256 0bd8d3a6667637dd9fb520c7d3008d3d414162a4b6e5d20ee8d1223e18810e16
+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
 MISC metadata.xml 260 RMD160 af6650245d6ccbcbdb2e829cd5d7be36bef71058 SHA1 a09861327ac9225fbbfafb891a8998f2ea6c73bb SHA256 1dfcd18a238fd7d714e848ad5661fbe98c7556e276b054d962cccfe44f7240f6
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"