Fixed build with gcc-4.7 (bug#422065)

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 31 insertions, 15 deletions

diff --git a/x11-libs/libyui/ChangeLog b/x11-libs/libyui/ChangeLog
index 1e2161c6854c..f6b03972c8cd 100644
--- a/x11-libs/libyui/ChangeLog
+++ b/x11-libs/libyui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/libyui
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libyui/ChangeLog,v 1.2 2011/08/15 17:08:20 miska Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libyui/ChangeLog,v 1.3 2012/07/30 18:14:12 miska Exp $
+
+  30 Jul 2012; Michal Hrusecky <miska@gentoo.org> libyui-2.21.1.ebuild,
+  +files/libyui-2.21.1-gcc-47.patch:
+  Fixed build with gcc-4.7 (bug#422065)
 
   15 Aug 2011; Michal Hrusecky <miska@gentoo.org> libyui-2.21.1.ebuild:
   Disabling ~x86 for now, enabled by accident
diff --git a/x11-libs/libyui/Manifest b/x11-libs/libyui/Manifest
index 063e55151f08..01b5990c8a1e 100644
--- a/x11-libs/libyui/Manifest
+++ b/x11-libs/libyui/Manifest
@@ -1,16 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST libyui-2.21.1.tar.gz 1075118 RMD160 68e7b047879998c591ae0cd2a8eb41d6fa81877e SHA1 3787654eb3fa386ef164bbe6ae65496b5e590b5e SHA256 0e1e6065e444ea029463229ca02057c994bb9f9ac8f7e4b21df5ce1861aabef8
-EBUILD libyui-2.21.1.ebuild 757 RMD160 0bdafe9bc0de2a12825e21cc07f3b40262dbfa26 SHA1 b3870fd9659439a8472c6afb0397e0c1a3bc0760 SHA256 3f17cfc81d0a58c35a19b2c5526108109dda9981702dfc717a7279e8bef0cf26
-MISC ChangeLog 489 RMD160 5208d07d755b1479092a56b06c8c8de7afe37b90 SHA1 c67a796db7e4abbc956239cfb19232eeecbc3926 SHA256 23e1d266c7742b9497df1421e09be55e5eb9ba3fa66552d6bb19a55ef7f295e9
-MISC metadata.xml 490 RMD160 370b4bde4d5193d65f16020e53e28c7fe58d3bb2 SHA1 b2c83811df1f06a0d39c9c5b7c45cb743ba4aaa0 SHA256 372bcdb012a54b79f6d393a4b9c9a551476a475daff348b5662b9dddbda47339
+AUX libyui-2.21.1-gcc-47.patch 398 SHA256 0ec582ca68e93ec747f144e7f4bc06376696968959b57d788001b3a59accf0fb SHA512 2bb42bed86d8e8f2beb10865f9b39bb4be76144c00cb315a4aa260467d10d5335490085ff8a2cf608a9766a71998cfa6a0facb2c1537f1197df264063e4f699d WHIRLPOOL 0719012448b87b036a3449207b7f6252592bf9e543d4c221a863533f2e7125803b12cb84cfa94b8006d03c7e347240273eb77990a505b84e7c714b2a0e3cd7b3
+DIST libyui-2.21.1.tar.gz 1075118 SHA256 0e1e6065e444ea029463229ca02057c994bb9f9ac8f7e4b21df5ce1861aabef8 SHA512 d70bb0fceff8a05fcaad8e4d20161c1985177f69a5904baaf357eedd3b1d767b6a860e2cef1ecc766e059d4c503068656cfa135ccfa4e651c3bf46c6ef27c575 WHIRLPOOL d2b5a611b294dde27d4dee1817b7a6f3cc1788f5d0342653d4a1d90131d3d2d00d500c10851d2ae2ff03fd1fb46e28d0084350621c7e89ca908087d05716e832
+EBUILD libyui-2.21.1.ebuild 804 SHA256 d7c6f087b7482b24f48d9ece10e7ffcee2d69aea5248ec83ea4bb1622815f595 SHA512 1db3e0922ae61f04e0d5cfb8811662ac77ed817d790ca5dd0313566c4f35c5955d27d07775d9f8ae9ed5519bd3b890dba1effaa7194262bcd37f75026754bdab WHIRLPOOL d96f96ecd3cc099026f53e3d9e6fe30e9a16916303935674760adc8bd08f662449e0f70afb522a3db7f230cc022984cc22708a42caec0f021eb5d1a6edc76cd9
+MISC ChangeLog 639 SHA256 2f06e174484e5951634d85996a8b1c4cc5f766d3f83d4c79652b0693aa5a9e55 SHA512 1d2d4bada10a9e302c6a6fc9b9fb37442af98b6ed215ea030909ba766188c2b74f89b423cfeb79e15d915a7d9ae4e683d50cd22de432ac803e1e73d901dd36ce WHIRLPOOL 1473aeb41ae9673a33e3b69d3e54ec27f4dcaf3907568c5f6fcbd596e430f894fd7c4cb23959b4d5deed253e2932d9276a59e4e717708197f04ed24f13ebb9a3
+MISC metadata.xml 490 SHA256 372bcdb012a54b79f6d393a4b9c9a551476a475daff348b5662b9dddbda47339 SHA512 5bd8c884898d9016af54a0ea3ac119fbe7d7a412e4797e09eb38b96b6c120cc87c2e089d3f4a1bb0af740511c56ac1a591ac409a9b29d0db09346b2e48760e2f WHIRLPOOL 9338b307194bf99fbeb0f30b7ceef5db3378d65fd55b269c6fcb4d26f78c4f4f5525567fdb8f86f003cb6d416e48d2181cc1bae6c9d832df0697f7c8bb3884e0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAk59ueoACgkQfXuS5UK5QB3vKAP/W0VQHD5zOPR3i9WuUqrJtOMd
-hNHn735ipWndgvjmC693+ywDBz1vjfQZ42zbnKvBd81/hBhcPLYCdEeIepu4EsGy
-oneaV2Y/NGouT9awC2mKumgiCRRXg7jLtQKpYOv9evI8zk4cJLhu3MC2/sFcRBXk
-SU/YcmHrXhNZjaoPWy4=
-=LET6
+iF4EAREIAAYFAlAWzvUACgkQpFCI79Oct8U3UwD+MvjIUSBsuRMhzQ1wFarqg43S
+Nd2e4dZ7htx1mbXWckoBAIsIpnyyjn5Akqv8fsnCFmm7x9SdAhuEUPxr70laS9H0
+=EDR2
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libyui/files/libyui-2.21.1-gcc-47.patch b/x11-libs/libyui/files/libyui-2.21.1-gcc-47.patch
new file mode 100644
index 000000000000..66fad127ddd9
--- /dev/null
+++ b/x11-libs/libyui/files/libyui-2.21.1-gcc-47.patch
@@ -0,0 +1,12 @@
+diff -Naru libyui-2.21.1-orig/src/TreeItem.h libyui-2.21.1/src/TreeItem.h
+--- libyui-2.21.1-orig/src/TreeItem.h	2012-07-30 14:22:00.833938743 +0200
++++ libyui-2.21.1/src/TreeItem.h	2012-07-30 14:22:59.310288616 +0200
+@@ -251,7 +251,7 @@
+ 	    // Insert as first child
+ 
+ 	    newChild->setNext( firstChild() );
+-	    setFirstChild( newChild );
++	    this->setFirstChild( newChild );
+ 	}
+ 	else
+ 	{
diff --git a/x11-libs/libyui/libyui-2.21.1.ebuild b/x11-libs/libyui/libyui-2.21.1.ebuild
index c1560563c8ae..095ee1927131 100644
--- a/x11-libs/libyui/libyui-2.21.1.ebuild
+++ b/x11-libs/libyui/libyui-2.21.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libyui/libyui-2.21.1.ebuild,v 1.2 2011/08/15 17:08:20 miska Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libyui/libyui-2.21.1.ebuild,v 1.3 2012/07/30 18:14:12 miska Exp $
 
 EAPI=4
 
-inherit autotools
+inherit autotools eutils
 
 DESCRIPTION="UI abstraction library"
 HOMEPAGE="http://sourceforge.net/projects/libyui/"
@@ -24,6 +24,7 @@ PDEPEND="
 	"
 
 src_prepare() {
+	epatch "${FILESDIR}/${P}-gcc-47.patch"
 	eautoreconf
 }