Fix glibc-2.10 compilation ( Bug 270404 )

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 33 insertions, 4 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 1854d1b915a2..51208a615c7d 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.592 2009/05/15 11:01:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.593 2009/05/21 21:56:06 loki_val Exp $
+
+  21 May 2009; Peter Alfredsen <loki_val@gentoo.org>
+  kdelibs-3.5.10-r5.ebuild, +files/kdelibs-3.5.10-glibc-2.10.patch:
+  Fix glibc-2.10 compilation ( Bug 270404 )
 
 *kdelibs-3.5.10-r5 (15 May 2009)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 0f6dc6a815ca..7d5ecf8afda0 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -11,6 +11,7 @@ AUX dist/09_disable_debug_messages_if_not_explicitly_enabled.patch 1840 RMD160 0
 AUX dist/20_use_dejavu_as_default_font.patch 1543 RMD160 805f4c6e685b8b6598acb1c69b5f6d41fa6ce010 SHA1 09eeafca53dd1c4b9347fd9d295949d37022e2f5 SHA256 9a6b141d5eb5fd73700086fef591074674563a2e5b374d3af4c6cea52726fc03
 AUX dist/23_solid_no_double_build.patch 838 RMD160 24bea0cd76edd2709edcdc654b74ebf1566e7ef7 SHA1 534aef07069b9b89ff3ff80619eb35f0fd588b61 SHA256 1ef6f6e7fe4b31b79126fd0cefaadab03f0e6a4bd9194fc8f4bee4750620c4ad
 AUX e-tempdir.patch 1413 RMD160 f0a369f929c18770d66a54b605dad8c99d03367c SHA1 779714956d94366a3b05514df19e21b4b3434f5c SHA256 1a7e888cd5173b68039717030119e3ab479675fed8f9df4b5e1d98869d89235a
+AUX kdelibs-3.5.10-glibc-2.10.patch 887 RMD160 467ea27befe92e3cf11fd8104e450e49fa2640b3 SHA1 4bdc64469e3edc0fcc842ea86094766d082f7c6f SHA256 f85cc8f6e3aae14ba0824cb2666ff036022571c52bd3aca2734c411c1cc01596
 AUX kdelibs-3.5.10-kde4-apps.patch 2068 RMD160 be0e4d35d22a39af3cbc407c5a3ee020a78c120f SHA1 9e87b3759040fb292c62e22489568be0c68f36fb SHA256 b0d2c3544ffc8624eba6f2698f3b4b95892e24594839a2752517413badce8e8e
 AUX kdelibs-3.5.8-kinit-CVE-2008-1671.patch 3964 RMD160 e5e7dc462c88ad45ac7051261aaec5b83c64d59e SHA1 35147db4d6791e4c98d7cec5e72509547813dd98 SHA256 6f7d54983c950300621918259511cb4de1efffcebe9c588607b529e27b462c5c
 AUX kdelibs-3.5.9-bug_203433_khtml.patch 874 RMD160 2d69661af5beb4ef0a1ff685ae38b7c543bb2229 SHA1 149386170b51e38d88c373f9407ca2c2240121b4 SHA256 23c48898e80b0497b6b8c1fe4af40c83b51d229e0f194560290bb42242f9c203
@@ -40,7 +41,7 @@ EBUILD kdelibs-3.5.10-r1.ebuild 7357 RMD160 e0eb6cb759364250a3af86c27e9e889d1fb7
 EBUILD kdelibs-3.5.10-r2.ebuild 7940 RMD160 4b0e949c8b6c384d4eef29e67110feda59f2fb7a SHA1 58236927873f5d88aefde37467b075d096b526e6 SHA256 728b02e8db78c8cc5cf01856c396ed190937ab3e74cbec4e752c217792ef1a39
 EBUILD kdelibs-3.5.10-r3.ebuild 7940 RMD160 f73568735fea4e7f273c9dde111eb3c8ed6500c1 SHA1 aa5d79c9be3dc6d9e6e3748b61fb685831bcfd0e SHA256 0607e2f89603db622857479e9800baaad2b37f52d80922b9bc09e4a4bfc2527d
 EBUILD kdelibs-3.5.10-r4.ebuild 8238 RMD160 78c9a4020d055c4cc6bb8b9d29604698e8493481 SHA1 da2ff0dcdd518332b75a725a2ae0902a907fcd4e SHA256 6fdb0e9d4b6ef3d98bcafebd3d8fec60bcbd7e703a9ac8c75c4645f2569f6ba9
-EBUILD kdelibs-3.5.10-r5.ebuild 8335 RMD160 a2069ce692d26401f2afe005453b28f358c0333e SHA1 6eac87750c562181bde8deffe58c2ab15ed5e89c SHA256 4b9c9d60739f2225cbf38fc77f83c7895212899be29a8b671dd41a1e9b5a6e54
+EBUILD kdelibs-3.5.10-r5.ebuild 8423 RMD160 453d8445dade09920d83ea0c798a6367d306aedf SHA1 004f0e3adf450e949f4c60d369cc7a7b17eea883 SHA256 59af3148b27761fba50b0ae982e2a537cb333657bc652cf6df9c336ba851ace6
 EBUILD kdelibs-3.5.9-r1.ebuild 6129 RMD160 5c3374dc64c90656d6cf8f30c7bcf8a95f5f3eeb SHA1 1d307fac7d9a6644d275cd0ccb8be566f01ddc1b SHA256 2f2d844853ed90df74a4c90ebf5f9cdc3e7c4aaf8f906437b09bfa84cf7f6e41
 EBUILD kdelibs-3.5.9-r2.ebuild 6205 RMD160 a751f94f3026c1233e3ed10a110d950e60620f12 SHA1 886b2e2ac989d6f5934f28d7a7accb4bef5e5a35 SHA256 0fab24586d56dc98b53a4cbe934f2ac565b3a55580c206db4c28b19c3076f594
 EBUILD kdelibs-3.5.9-r3.ebuild 6285 RMD160 0946a13cebba7c34600acaee2cb1b9be6341c797 SHA1 55f98208b2c6304f7e9126bb8e695987037fe934 SHA256 654c8b45e36dde370d9c6609a36f45f5eec216a204c3b6048fcc8d44d8658652
@@ -49,5 +50,5 @@ EBUILD kdelibs-3.5.9.ebuild 6042 RMD160 5402e42899c0e55787f8b7f5650143dcbc4410d7
 EBUILD kdelibs-4.2.2-r1.ebuild 7139 RMD160 0d527fa084afa40671631e1f33b10d7951b5697a SHA1 4107b28613c3c1f0837a5f9599ed9a367c6e6fe2 SHA256 804b45e952bf1aebd79a0ffac89cc96fd558da731d7d74fcfcd6161154950a3b
 EBUILD kdelibs-4.2.2.ebuild 7136 RMD160 0422951dd81f8a0c2ace4d942915688f5b17182f SHA1 cc3eaaa9163e3ed4d17f99bea721ebd6f6ff17b9 SHA256 981bf12799595b264c2c703436d13c18c8e9226686252253e7127b4df32e2372
 EBUILD kdelibs-4.2.3.ebuild 5993 RMD160 d58d07310e6b2c2b6ea9e21d26cdc4d393d353b7 SHA1 27eeafb1c810e861bc2d4db22a2c3d8d295bd1ce SHA256 709ed77fe529d92d952c7c3a418299ead740371d4e851c68813318eb3fdb0104
-MISC ChangeLog 97978 RMD160 4cc93d256534144c603a1d010f9178b1ba9be0f1 SHA1 94fa43b61dbeecfe826840a876e60a37fcfd6d68 SHA256 cf7ce8ae7665ad9bb66fe671354472a4b338fdf1cedba20b8d5c3d2343675991
+MISC ChangeLog 98143 RMD160 98622c7acd7ca8ca36503304ca551dbf27de9987 SHA1 c81e45f48aabef02eb74374fa4a93a44437de74e SHA256 059cfa54af37c36c7548bf53beed0e6dae161759855f354a56f9b6544b9e7d85
 MISC metadata.xml 441 RMD160 e57f70d613371f6611dd4b9836dcc2d782b37dff SHA1 a9ccd73256be801916ce41b1e40269bc094587eb SHA256 e9b96a886144e7453b3cf5f6361e14b2f35a448f24a10c00074ce00c5a179caf
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.10-glibc-2.10.patch b/kde-base/kdelibs/files/kdelibs-3.5.10-glibc-2.10.patch
new file mode 100644
index 000000000000..9196c0a5c921
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.5.10-glibc-2.10.patch
@@ -0,0 +1,21 @@
+diff -up kdelibs-3.5.10/kioslave/ftp/ftp.cc.orig kdelibs-3.5.10/kioslave/ftp/ftp.cc
+--- kdelibs-3.5.10/kioslave/ftp/ftp.cc.orig	2009-02-25 13:18:13.000000000 +0100
++++ kdelibs-3.5.10/kioslave/ftp/ftp.cc	2009-02-25 13:34:13.000000000 +0100
+@@ -876,7 +876,7 @@ int Ftp::ftpOpenPASVDataConnection()
+   // The usual answer is '227 Entering Passive Mode. (160,39,200,55,6,245)'
+   // but anonftpd gives '227 =160,39,200,55,6,245'
+   int i[6];
+-  char *start = strchr(ftpResponse(3), '(');
++  const char *start = strchr(ftpResponse(3), '(');
+   if ( !start )
+     start = strchr(ftpResponse(3), '=');
+   if ( !start ||
+@@ -931,7 +931,7 @@ int Ftp::ftpOpenEPSVDataConnection()
+     return ERR_INTERNAL;
+   }
+ 
+-  char *start = strchr(ftpResponse(3), '|');
++  const char *start = strchr(ftpResponse(3), '|');
+   if ( !start || sscanf(start, "|||%d|", &portnum) != 1)
+     return ERR_INTERNAL;
+ 
diff --git a/kde-base/kdelibs/kdelibs-3.5.10-r5.ebuild b/kde-base/kdelibs/kdelibs-3.5.10-r5.ebuild
index 296bdd2a70b4..1a5a5fbecaf7 100644
--- a/kde-base/kdelibs/kdelibs-3.5.10-r5.ebuild
+++ b/kde-base/kdelibs/kdelibs-3.5.10-r5.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/kde-base/kdelibs/kdelibs-3.5.10-r5.ebuild,v 1.1 2009/05/15 11:01:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.10-r5.ebuild,v 1.2 2009/05/21 21:56:06 loki_val Exp $
 
 EAPI="1"
 inherit kde flag-o-matic eutils multilib
@@ -148,6 +148,9 @@ src_unpack() {
 
 	# patch that fixes kde4 in menus (adapted from archlinux)
 	epatch "${FILESDIR}/${P}-kde4-apps.patch"
+
+	#Fix glibc-2.10 compilation ( Bug 270404 )
+	epatch "${FILESDIR}/${P}-glibc-2.10.patch"
 }
 
 src_compile() {