Adding glibc 2.10 compile fix. Closes #273999

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 66 insertions, 3 deletions

diff --git a/net-libs/wvstreams/ChangeLog b/net-libs/wvstreams/ChangeLog
index 2a4c64eb9c20..30245943765a 100644
--- a/net-libs/wvstreams/ChangeLog
+++ b/net-libs/wvstreams/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/wvstreams
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.127 2009/06/20 07:47:55 gengor Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/ChangeLog,v 1.128 2009/06/28 08:58:12 patrick Exp $
+
+  28 Jun 2009; Patrick Lauer <patrick@gentoo.org> wvstreams-4.5.ebuild,
+  +files/wvstreams-4.5-glibc.patch:
+  Adding glibc 2.10 compile fix. Closes #273999. Patch by Fabio Erculiani
+  based on upstream fixes.
 
   20 Jun 2009; Gordon Malm <gengor@gentoo.org> wvstreams-4.5.ebuild:
   Minor spelling/grammar fixes.
diff --git a/net-libs/wvstreams/files/wvstreams-4.5-glibc.patch b/net-libs/wvstreams/files/wvstreams-4.5-glibc.patch
new file mode 100644
index 000000000000..534d0e18ae4e
--- /dev/null
+++ b/net-libs/wvstreams/files/wvstreams-4.5-glibc.patch
@@ -0,0 +1,56 @@
+diff -Nurp wvstreams-4.5.orig/ipstreams/wvaddr.cc wvstreams-4.5/ipstreams/wvaddr.cc
+--- wvstreams-4.5.orig/ipstreams/wvaddr.cc	2008-07-14 21:11:35.000000000 +0200
++++ wvstreams-4.5/ipstreams/wvaddr.cc	2009-06-19 16:39:37.757382441 +0200
+@@ -538,7 +538,7 @@ WvIPNet::WvIPNet(const WvIPNet &_net)
+ // If the netmask is not specified, it will default to all 1's.
+ void WvIPNet::string_init(const char string[])
+ {
+-    char *maskptr;
++    const char *maskptr;
+     int bits;
+     uint32_t imask;
+ 
+diff -Nurp wvstreams-4.5.orig/utils/strutils.cc wvstreams-4.5/utils/strutils.cc
+--- wvstreams-4.5.orig/utils/strutils.cc	2008-10-21 21:39:21.000000000 +0200
++++ wvstreams-4.5/utils/strutils.cc	2009-06-19 16:36:48.959741828 +0200
+@@ -315,7 +315,7 @@ WvString url_decode(WvStringParm str, bo
+  
+     const char *iptr;
+     char *optr;
+-    char *idx1, *idx2;
++    const char *idx1, *idx2;
+     static const char hex[] = "0123456789ABCDEF";
+     WvString in, intmp(str), out;
+ 
+@@ -967,7 +967,7 @@ WvString afterstr(WvStringParm line, WvS
+     if (!line || !a)
+ 	return WvString::null;
+ 
+-    char *loc = strstr(line, a);
++    const char *loc = strstr(line, a);
+     if (loc == 0)
+ 	return "";
+ 
+@@ -984,8 +984,8 @@ WvString beforestr(WvStringParm line, Wv
+ 	return WvString::null;
+ 
+     WvString ret = line;
+-    ret.unique();     
+-    char *loc = strstr(ret, a);
++    ret.unique();
++    char *loc = strstr(ret.edit(), a);
+ 
+     if (loc == 0)
+ 	return line;
+diff -Nurp wvstreams-4.5.orig/utils/verstring.cc wvstreams-4.5/utils/verstring.cc
+--- wvstreams-4.5.orig/utils/verstring.cc	2008-07-14 21:11:35.000000000 +0200
++++ wvstreams-4.5/utils/verstring.cc	2009-06-19 16:37:02.021698602 +0200
+@@ -147,7 +147,7 @@ bool is_new_ver(unsigned int ver)
+ 
+ bool is_new_verstr(const char *str)
+ {
+-    char *p = strchr(str, '.');
++    const char *p = strchr(str, '.');
+     if (p && strchr(p+1, '.'))
+         return true;
+ 
diff --git a/net-libs/wvstreams/wvstreams-4.5.ebuild b/net-libs/wvstreams/wvstreams-4.5.ebuild
index be210e6d5043..1549d5dfc697 100644
--- a/net-libs/wvstreams/wvstreams-4.5.ebuild
+++ b/net-libs/wvstreams/wvstreams-4.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.5.ebuild,v 1.2 2009/06/20 07:47:55 gengor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/wvstreams/wvstreams-4.5.ebuild,v 1.3 2009/06/28 08:58:12 patrick Exp $
 
 EAPI=2
 
@@ -57,6 +57,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-parallel-make.patch"
 	epatch "${FILESDIR}/${P}-dbus-configure-fix.patch"
 	epatch "${FILESDIR}/${P}-qt-fixup.patch"
+	# glibc 2.10 fix
+	epatch "${FILESDIR}/${P}-glibc.patch"
 	eautoreconf || die "eautoreconf failed"
 }