Fix building with GLIBC 2.11+ wrt #292072, thanks to Manfred Knick for reporting.

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

4 files changed, 33 insertions, 4 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 6569fdadbf21..cba97783cb86 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.634 2009/11/02 20:57:50 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.635 2009/11/06 12:31:33 ssuominen Exp $
+
+  06 Nov 2009; Samuli Suominen <ssuominen@gentoo.org> kdelibs-4.3.3.ebuild,
+  +files/kdelibs-4.3.3-glibc-2.11.patch:
+  Fix building with GLIBC 2.11+ wrt #292072, thanks to Manfred Knick for
+  reporting.
 
 *kdelibs-4.3.3 (02 Nov 2009)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 787a34571e3c..6289cd35fc45 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -22,6 +22,7 @@ AUX kdelibs-4.3.1-dom-docimpl-crash.patch 1547 RMD160 7943693fcdd9e03bab297518fd
 AUX kdelibs-4.3.1-fix-crash-on-konqueror-tabs.patch 349 RMD160 dd79ab167971d1266ce4ef72aae4431caa5c24cb SHA1 fa392cfb329d29c0a8b3a3d8a4b8982cba1b90d3 SHA256 1af1cd5f326eb9538b118083284872706a25d62ad754af2220bf51c8f2895005
 AUX kdelibs-4.3.2-fix-deadlock-in-KLocale.patch 7842 RMD160 2aa83a297e4708b980a0ed6d65ac7e01a8ef3f79 SHA1 a46ab9b2ebc97caf4c5e53538bfb7cdacac42a71 SHA256 94206e03ff381001c9adc5d9bee861a946473af3da098ce07ded326112597df6
 AUX kdelibs-4.3.2-fix-plasma-crash.patch 496 RMD160 919ed996649a7f05ab5e9b4f90d0f0a6663756fd SHA1 aad7d634e1702ee6dc8e3ecfe220a4fe579b06dc SHA256 6d9ae3e0e0f51ef7e28256cc080872a01a3c31761ffb8d9a2212ae98b3f48f58
+AUX kdelibs-4.3.3-glibc-2.11.patch 514 RMD160 87304f8319e06b9ce5a0e6c263dfa3544bf78bdd SHA1 ad356e84872e885d5db023a2b966b3efc1382668 SHA256 74a6db7c6370bf21d320896928740bdd9c637e507d33ee86a95b8580d28d7c3a
 DIST kde-3.5.9-seli-xinerama.tar.bz2 15150 RMD160 09f9dc74e52d1507a73d1140654021d2baedde3a SHA1 cb8eaba630ee7c8f93c634512d52a9d1603d5405 SHA256 769b0135b327b3274aa45d78ae882811073041fdbfd55267106b1a3f42115966
 DIST kdelibs-3.5-patchset-14.tar.bz2 23248 RMD160 223ad8aa6d3dab3a6e23a89e00eaf2e90bab399e SHA1 5d50fff6b6a26d8abffa4dda7360b42e0fc29eac SHA256 50d1517fbb3b70890b1858533a77fb0e6e1e72612e155ebe5350e8fea7405273
 DIST kdelibs-3.5-patchset-15.tar.bz2 6707 RMD160 55958374bfc4ba27caf573e13337677c35cbe2c0 SHA1 e0a35642adfcf223ce7490b21af1fa2c3d922b93 SHA256 4a25bc340ce2567ea017456b4aa2292b288779d59d0dd012bd50f5189fe739ec
@@ -37,6 +38,6 @@ EBUILD kdelibs-4.2.4-r4.ebuild 6119 RMD160 31636ca3139ffbeb1de5169c7c675a60ebe66
 EBUILD kdelibs-4.3.1-r1.ebuild 6433 RMD160 3f0a829ef8c9c927da8760d367a1c1e9f7d8983d SHA1 5ee2c2e5cfd4b7b3e344dfcc45e484e128b39cdc SHA256 1bf55897439b9f25873fd8d35f8e2f9ccfdbb4f2d13aab61bbd1e96493782a87
 EBUILD kdelibs-4.3.1-r2.ebuild 6429 RMD160 e1e0e5698301f1d27cef09a20f18a40815a231d9 SHA1 23675761bdc73b70fd9ae3a98206e3b50097c27b SHA256 c876c4a38c5f6cd77acec396d4bd1e629a3c1c6f30fb72077ae334385ecc3b1f
 EBUILD kdelibs-4.3.2-r3.ebuild 6570 RMD160 c9111069320c6a6da45b8ca5960a919e6144292c SHA1 eff617aa98520a8922b690c59f6f5dd221acb6d4 SHA256 d7f2cdeaf833b6c4c7f033eaede8e6830fdaf21c26c1b6cef39172028a939104
-EBUILD kdelibs-4.3.3.ebuild 6295 RMD160 00821afbc936cbcbc55949d03e51347ce70c496e SHA1 075190ddab93729f1bcd9387ad8321845782d353 SHA256 24b1a5813a00536b2fff65b72b4762dc3135f9a89dd9413cd2920c89727f10eb
-MISC ChangeLog 106383 RMD160 225a04f841f89c0b9c4380905b140c04d66897dd SHA1 41559c361101289e438dd3232cf77bfe746d2060 SHA256 ef415dfda04d6fd59d1863732e244b9a6da6a9127b74242d7ffa2b67ec14b0aa
+EBUILD kdelibs-4.3.3.ebuild 6336 RMD160 4be81b879855b3adb0e3eaf920ed29cf7139d602 SHA1 f812720df12ad6928fddecd9827d0c2dfd9190ec SHA256 d308f1bb873858ffaf7f1da730d30e7ad60e60a5ed365ef3368fb362e073815b
+MISC ChangeLog 106591 RMD160 6a7ae3c731f80f9de2bcf0383ffeb499d112052c SHA1 917c08b63dc6de329778e73b94949d4e41333bef SHA256 0fd861b30cdaa17ec646c7b7e9fe35356d7fe788f2a2ef8f90580f4dd5cce0ab
 MISC metadata.xml 421 RMD160 1ac2a2321b85031d1a7d25ff97fd87fd7376cc12 SHA1 473e157bcd1bfbef6704dbc47fbe86688973e79e SHA256 03af52377b9a607997590a9cda326fa515c4e21207bf33953cb0e67b5831336d
diff --git a/kde-base/kdelibs/files/kdelibs-4.3.3-glibc-2.11.patch b/kde-base/kdelibs/files/kdelibs-4.3.3-glibc-2.11.patch
new file mode 100644
index 000000000000..1872a3521f2f
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.3.3-glibc-2.11.patch
@@ -0,0 +1,22 @@
+http://bugs.kde.org/show_bug.cgi?id=213223
+
+--- kdelibs-4.3.3/kdecore/fakes.c
++++ kdelibs-4.3.3/kdecore/fakes.c
+@@ -313,6 +313,8 @@
+ #endif /* !HAVE_MKDTEMP */
+ 
+ #ifndef HAVE_STRLCPY
++#include <string.h>
++
+ KDECORE_EXPORT unsigned long strlcpy(char* d, const char* s, unsigned long bufsize)
+ {
+     unsigned long len, ret = strlen(s);
+@@ -331,6 +333,8 @@
+ #endif
+ 
+ #ifndef HAVE_STRLCAT
++#include <string.h>
++
+ KDECORE_EXPORT unsigned long strlcat(char* d, const char* s, unsigned long bufsize)
+ {
+     char *cp;
diff --git a/kde-base/kdelibs/kdelibs-4.3.3.ebuild b/kde-base/kdelibs/kdelibs-4.3.3.ebuild
index 69a1fa64c5e7..97ab2d8598d2 100644
--- a/kde-base/kdelibs/kdelibs-4.3.3.ebuild
+++ b/kde-base/kdelibs/kdelibs-4.3.3.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-4.3.3.ebuild,v 1.1 2009/11/02 20:57:50 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-4.3.3.ebuild,v 1.2 2009/11/06 12:31:33 ssuominen Exp $
 
 EAPI="2"
 
@@ -108,6 +108,7 @@ PATCHES=(
 	"${FILESDIR}/dist/01_gentoo_set_xdg_menu_prefix.patch"
 	"${FILESDIR}/dist/02_gentoo_append_xdg_config_dirs.patch"
 	"${FILESDIR}/dist/23_solid_no_double_build.patch"
+	"${FILESDIR}/${P}-glibc-2.11.patch"
 )
 
 src_prepare() {