Fixed compile problems with gcc-4.x. This fixes bug #149191.

Package-Manager: portage-2.1.2_pre1-r1

4 files changed, 46 insertions, 13 deletions

diff --git a/sci-libs/galib/ChangeLog b/sci-libs/galib/ChangeLog
index e54240374640..722623d39b4d 100644
--- a/sci-libs/galib/ChangeLog
+++ b/sci-libs/galib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/galib
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/galib/ChangeLog,v 1.5 2006/04/30 14:59:22 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/galib/ChangeLog,v 1.6 2006/09/26 23:51:45 markusle Exp $
+
+  26 Sep 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/galib-2.4.6-gcc4-gentoo.patch, galib-2.4.6.ebuild:
+  Fixed compile problems with gcc-4.x. Thanks much to Jeno I. Hajdu
+  <jeno.i.hajdu@gmail.com> for his patch. This fixes bug #149191.
 
   30 Apr 2006; Markus Dittrich <markusle@gentoo.org>
   +files/galib-2.4.6-makefile.patch, galib-2.4.6.ebuild:
diff --git a/sci-libs/galib/Manifest b/sci-libs/galib/Manifest
index b023e55104a9..40bb404f50cc 100644
--- a/sci-libs/galib/Manifest
+++ b/sci-libs/galib/Manifest
@@ -1,17 +1,21 @@
-AUX galib-2.4.6-makefile.patch 693 RMD160 9a1cbf8c8602572ace28ef07035429da93f2ad9b SHA1 21f3ecbad2d93159aa80156ac7766db58e929c0c SHA256 27a0601ff786f9d9414dbbd5f9475751a7fb536450c67ed674ff31b7ac02d7e9 size 693
+AUX galib-2.4.6-gcc4-gentoo.patch 722 RMD160 5600275d176f87b6d92406f4afd5c8de2b40f349 SHA1 26edb385775f0058f807ee4f27047ba343743214 SHA256 3c84ee585b35484fd673706b06944d39715d8f8f5a92e48f075d337e27f1ae0a
+MD5 c2ac62a2a2fe1b34b2efc5681e37535e files/galib-2.4.6-gcc4-gentoo.patch 722
+RMD160 5600275d176f87b6d92406f4afd5c8de2b40f349 files/galib-2.4.6-gcc4-gentoo.patch 722
+SHA256 3c84ee585b35484fd673706b06944d39715d8f8f5a92e48f075d337e27f1ae0a files/galib-2.4.6-gcc4-gentoo.patch 722
+AUX galib-2.4.6-makefile.patch 693 RMD160 9a1cbf8c8602572ace28ef07035429da93f2ad9b SHA1 21f3ecbad2d93159aa80156ac7766db58e929c0c SHA256 27a0601ff786f9d9414dbbd5f9475751a7fb536450c67ed674ff31b7ac02d7e9
 MD5 232424c6c99124f222ff1c9abeecc73d files/galib-2.4.6-makefile.patch 693
 RMD160 9a1cbf8c8602572ace28ef07035429da93f2ad9b files/galib-2.4.6-makefile.patch 693
 SHA256 27a0601ff786f9d9414dbbd5f9475751a7fb536450c67ed674ff31b7ac02d7e9 files/galib-2.4.6-makefile.patch 693
-DIST galib246.tgz 378431 RMD160 9e74f2001d7583680effe6f8b04ebf9ced39291c SHA256 441150c728d401a93ed6d9e745eae85f9ddbd413cfe06396f1a426cd31c7cc00 size 378431
-EBUILD galib-2.4.6.ebuild 869 RMD160 8a590972adf3177876961904b3984c87f34a7f5c SHA1 54d1b1497793ae200956a2368a8dcbbb8ee0d744 SHA256 f2dfa3ea7cd9ff1fdd7a14044542d6bbf7aca58268093e42e3a8e7d19f9f11e6 size 869
-MD5 030b5291672083548b90960299023b55 galib-2.4.6.ebuild 869
-RMD160 8a590972adf3177876961904b3984c87f34a7f5c galib-2.4.6.ebuild 869
-SHA256 f2dfa3ea7cd9ff1fdd7a14044542d6bbf7aca58268093e42e3a8e7d19f9f11e6 galib-2.4.6.ebuild 869
-MISC ChangeLog 1311 RMD160 093cdd3a7c172fcabdb7f43582c54638ad3576c0 SHA1 6977973f274452b7f09ae9aedd9d3efe08dd8bc1 SHA256 5e43165689d7b9ba3487946e35ac5b24f5ec4cf6b80f8c2feeb6b465eb72db7b size 1311
-MD5 79db09eea523c29f1b7dda9bb25dbf42 ChangeLog 1311
-RMD160 093cdd3a7c172fcabdb7f43582c54638ad3576c0 ChangeLog 1311
-SHA256 5e43165689d7b9ba3487946e35ac5b24f5ec4cf6b80f8c2feeb6b465eb72db7b ChangeLog 1311
-MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 size 156
+DIST galib246.tgz 378431 RMD160 9e74f2001d7583680effe6f8b04ebf9ced39291c SHA1 00a0901e86fb0a2d5672d61318632cbb985749a8 SHA256 441150c728d401a93ed6d9e745eae85f9ddbd413cfe06396f1a426cd31c7cc00
+EBUILD galib-2.4.6.ebuild 914 RMD160 4f7d72fd0f4b141b48b0ec4760efa3a2e12ddf98 SHA1 b23ac1561aa241693c2d5837424807be56e7f6d1 SHA256 3b409d9b49021e74924e95480d7787d8be68eb5961d6b75cabf539c550bcf444
+MD5 f88bd1403176e620c0e11e9db78f1c43 galib-2.4.6.ebuild 914
+RMD160 4f7d72fd0f4b141b48b0ec4760efa3a2e12ddf98 galib-2.4.6.ebuild 914
+SHA256 3b409d9b49021e74924e95480d7787d8be68eb5961d6b75cabf539c550bcf444 galib-2.4.6.ebuild 914
+MISC ChangeLog 1559 RMD160 4d216f5482ef39da2013dbbf222ef2be8e9bc576 SHA1 24788086d54cbcec99b05f7b71d500249ef53693 SHA256 59f7366fcac94584e67eff20473d96727605db524d36c5bc6c80a1de87683c05
+MD5 419fa9527eb42db1ef34f696b82ea08f ChangeLog 1559
+RMD160 4d216f5482ef39da2013dbbf222ef2be8e9bc576 ChangeLog 1559
+SHA256 59f7366fcac94584e67eff20473d96727605db524d36c5bc6c80a1de87683c05 ChangeLog 1559
+MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156
diff --git a/sci-libs/galib/files/galib-2.4.6-gcc4-gentoo.patch b/sci-libs/galib/files/galib-2.4.6-gcc4-gentoo.patch
new file mode 100644
index 000000000000..ed2621649eef
--- /dev/null
+++ b/sci-libs/galib/files/galib-2.4.6-gcc4-gentoo.patch
@@ -0,0 +1,23 @@
+diff -Naur galib246/ga/gaconfig.h galib246-new/ga/gaconfig.h
+--- galib246/ga/gaconfig.h	2005-01-31 10:46:09.000000000 -0500
++++ galib246-new/ga/gaconfig.h	2006-09-26 19:38:09.000000000 -0400
+@@ -192,7 +192,9 @@
+ 
+ // determine the compiler
+ #if defined(__GNUG__) || defined(__GNUC__)
+-#if __GNUC__ == 3
++#if __GNUC__ == 4
++#define GALIB_COMPILER "gcc4"
++#elif __GNUC__ == 3
+ #define GALIB_COMPILER "gcc3"
+ #elif __GNUC__ == 2
+ #define GALIB_COMPILER "gcc2"
+@@ -365,7 +367,7 @@
+ #define GALIB_USE_PID
+ #define GALIB_USE_EMPTY_TEMPLATES
+ #define GALIB_NEED_INSTANTIATION_PREFIX
+-#if __GNUC__ == 3
++#if __GNUC__ >= 3
+ #define GALIB_USE_ANSI_HEADERS
+ #define GALIB_USE_STD_NAMESPACE
+ #define GALIB_USE_COMP_OPERATOR_TEMPLATES
diff --git a/sci-libs/galib/galib-2.4.6.ebuild b/sci-libs/galib/galib-2.4.6.ebuild
index d1230875683e..1273485abba1 100644
--- a/sci-libs/galib/galib-2.4.6.ebuild
+++ b/sci-libs/galib/galib-2.4.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/galib/galib-2.4.6.ebuild,v 1.3 2006/04/30 14:59:22 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/galib/galib-2.4.6.ebuild,v 1.4 2006/09/26 23:51:45 markusle Exp $
 
 inherit eutils
 
@@ -22,6 +22,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-makefile.patch
+	epatch "${FILESDIR}"/${P}-gcc4-gentoo.patch
 }
 
 src_compile() {