Added a patch to allow glibc-1.2.10-r5 compile under gcc-3.4.x. Closes Bug #47047.

4 files changed, 65 insertions, 10 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 87f8418d1df8..1650506987f4 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/glib
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.63 2004/03/22 17:18:24 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.64 2004/04/08 09:32:51 kumba Exp $
+
+  08 Apr 2004; Joshua Kinard <kumba@gentoo.org> glib-1.2.10-r5.ebuild,
+  files/glib-1.2.10-gcc34-fix.patch:
+  Added a patch to allow glibc-1.2.10-r5 compile under gcc-3.4.x. Closes Bug
+  #47047.
 
   22 Mar 2004; foser <foser@gentoo.org> glib-2.4.0.ebuild :
   Fix a very dumb mistake by mixing up src_compile & src_install
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index bf203a7e4868..535b049ca570 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,14 +1,15 @@
-MD5 0b6b97a59b4b0e1acc433697ce022a3c files/digest-glib-1.2.10-r5 63
-MD5 f1d1917d455b88ebd5cdcf76d94e84d4 files/digest-glib-2.2.1 64
-MD5 f1d1917d455b88ebd5cdcf76d94e84d4 files/digest-glib-2.2.1-r1 64
-MD5 8edb351cbbf69e68f599f517e2152ca4 files/digest-glib-2.2.2 64
-MD5 b8ffd1df331b401706a2ac487f28fee8 files/digest-glib-2.2.3 64
-MD5 4d1022292a5ca1a8dc708f7dac746b91 files/digest-glib-2.4.0 64
-MD5 1f7e3b23a8f6434185235a2d2754cba6 ChangeLog 8474
-MD5 2ad109318daece3f00682a2962ba37ed glib-1.2.10-r5.ebuild 1217
+MD5 fb37274cc62e7d4d7de9eb45d42caf5a ChangeLog 8670
+MD5 d82e04b694628c4e88fc1e8522002fee glib-1.2.10-r5.ebuild 1349
 MD5 0fb4513bc18a08f8d2ab709b9ea68215 glib-2.2.1-r1.ebuild 1190
 MD5 08829d19dd1751736b8c86fc65cc28c7 glib-2.2.1.ebuild 1064
 MD5 74da7bd6b8a2f13c22d068ba87de8289 glib-2.2.2.ebuild 1192
 MD5 fbf2fcb880edb27c620dd6c1ee0d6571 glib-2.2.3.ebuild 1027
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 5833b69478724386d3f548f982415788 glib-2.4.0.ebuild 1012
+MD5 0b6b97a59b4b0e1acc433697ce022a3c files/digest-glib-1.2.10-r5 63
+MD5 f1d1917d455b88ebd5cdcf76d94e84d4 files/digest-glib-2.2.1 64
+MD5 f1d1917d455b88ebd5cdcf76d94e84d4 files/digest-glib-2.2.1-r1 64
+MD5 8edb351cbbf69e68f599f517e2152ca4 files/digest-glib-2.2.2 64
+MD5 b8ffd1df331b401706a2ac487f28fee8 files/digest-glib-2.2.3 64
+MD5 4d1022292a5ca1a8dc708f7dac746b91 files/digest-glib-2.4.0 64
+MD5 2657ca6d0c857b4e97ad93525212ffa1 files/glib-1.2.10-gcc34-fix.patch 2008
diff --git a/dev-libs/glib/files/glib-1.2.10-gcc34-fix.patch b/dev-libs/glib/files/glib-1.2.10-gcc34-fix.patch
new file mode 100644
index 000000000000..1b896484d2d9
--- /dev/null
+++ b/dev-libs/glib/files/glib-1.2.10-gcc34-fix.patch
@@ -0,0 +1,41 @@
+--- glib-1.2.10/gstrfuncs.c.orig	2001-02-27 07:00:22.000000000 +0100
++++ glib-1.2.10/gstrfuncs.c	2004-03-01 13:19:49.531603760 +0100
+@@ -867,7 +867,7 @@
+                   /* beware of positional parameters
+                    */
+                 case '$':
+-                  g_warning (G_GNUC_PRETTY_FUNCTION
++                  g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
+                              "(): unable to handle positional parameters (%%n$)");
+                   len += 1024; /* try adding some safety padding */
+                   break;
+@@ -1034,7 +1034,7 @@
+                   /*          n   .   dddddddddddddddddddddddd   E   +-  eeee */
+                   conv_len += 1 + 1 + MAX (24, spec.precision) + 1 + 1 + 4;
+                   if (spec.mod_extra_long)
+-                    g_warning (G_GNUC_PRETTY_FUNCTION
++                    g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
+                                "(): unable to handle long double, collecting double only");
+ #ifdef HAVE_LONG_DOUBLE
+ #error need to implement special handling for long double
+@@ -1077,7 +1077,7 @@
+                   conv_done = TRUE;
+                   if (spec.mod_long)
+                     {
+-                      g_warning (G_GNUC_PRETTY_FUNCTION
++                      g_warning ("%s%s", G_GNUC_PRETTY_FUNCTION,
+                                  "(): unable to handle wide char strings");
+                       len += 1024; /* try adding some safety padding */
+                     }
+@@ -1108,9 +1108,8 @@
+                   conv_len += format - spec_start;
+                   break;
+                 default:
+-                  g_warning (G_GNUC_PRETTY_FUNCTION
+-                             "(): unable to handle `%c' while parsing format",
+-                             c);
++                  g_warning ("%s(): unable to handle `%c' while parsing format",
++                             G_GNUC_PRETTY_FUNCTION, c);
+                   break;
+                 }
+               conv_done |= conv_len > 0;
diff --git a/dev-libs/glib/glib-1.2.10-r5.ebuild b/dev-libs/glib/glib-1.2.10-r5.ebuild
index 801557d8ec1e..6ce997584546 100644
--- a/dev-libs/glib/glib-1.2.10-r5.ebuild
+++ b/dev-libs/glib/glib-1.2.10-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.16 2004/04/05 21:17:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-1.2.10-r5.ebuild,v 1.17 2004/04/08 09:32:51 kumba Exp $
 
 inherit libtool
 
@@ -15,6 +15,14 @@ KEYWORDS="x86 ppc sparc alpha mips hppa amd64 ia64 ppc64 s390"
 
 DEPEND="virtual/glibc"
 
+src_unpack() {
+	unpack ${A}
+
+	# Allow glib to build with gcc-3.4.x
+	# Closes Bug #47047
+	epatch ${FILESDIR}/${P}-gcc34-fix.patch
+}
+
 src_compile() {
 #	elibtoolize
 	# For some reason, elibtoolize stopped doing its job in the last couple