Fix building with GLIBC 2.10+ wrt #276500.

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

4 files changed, 24 insertions, 5 deletions

diff --git a/kde-misc/kgtk/ChangeLog b/kde-misc/kgtk/ChangeLog
index 78ce5590ec4f..a549294fcceb 100644
--- a/kde-misc/kgtk/ChangeLog
+++ b/kde-misc/kgtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/kgtk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgtk/ChangeLog,v 1.20 2009/03/12 15:18:39 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgtk/ChangeLog,v 1.21 2009/08/08 21:57:48 ssuominen Exp $
+
+  08 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> kgtk-0.10.1.ebuild,
+  +files/kgtk-0.10.1-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #276500.
 
   12 Mar 2009; Tomas Chvatal <scarabeus@gentoo.org>
   -files/0.10.0-open_mode.patch:
diff --git a/kde-misc/kgtk/Manifest b/kde-misc/kgtk/Manifest
index dee263c4c989..247a8aedb48c 100644
--- a/kde-misc/kgtk/Manifest
+++ b/kde-misc/kgtk/Manifest
@@ -1,4 +1,5 @@
+AUX kgtk-0.10.1-glibc-2.10.patch 624 RMD160 6ff0fbcda7986c30096085daeab8009250e55383 SHA1 dd4b57387ba0917f022f3dc739c45bd14fc4f24d SHA256 487fdc0649e7ba2508e83dacc688f03670f606b66582fc35e5652ca6911a3f89
 DIST KGtk-0.10.1.tar.bz2 44548 RMD160 7944cfd420afd4e6a7795075a3a3788e98fc9715 SHA1 56f917b2391d985f104c32ffb7c01979d3cd4436 SHA256 453f60142c1ce333220ebf27d20c9053e3c8e79fbbe215a29d0942bfb3f2c509
-EBUILD kgtk-0.10.1.ebuild 2012 RMD160 8861a25ea1512945ae51067b1085a4f56086828b SHA1 bad455ef349e637cae4a2c8159d8d05bb178b5ef SHA256 832386f813158e96378866f99a7dd62b4cf4270ce5e6b44f29d58da53ffbb28d
-MISC ChangeLog 3476 RMD160 2319942c0e42a21e322bf4a4fb829ad936809c9b SHA1 f125964465c637e906fd5585ecbaa768ff4d3c84 SHA256 7f4b4e445b858439954cd33dd747e4fd6119c6f013fe59a8149dd53f0263b4ae
+EBUILD kgtk-0.10.1.ebuild 2059 RMD160 376af0412cd4ae8750579290db0205fc17bb3477 SHA1 43a638558e75822abef0f993f116cf44ed6e5c95 SHA256 3fcfb83ccc8c14ce30efe704e2fd7d89ff2a38d6d6abecbe7ad14aa73c54fc5f
+MISC ChangeLog 3635 RMD160 4c729c9e2b3b6b2c913b8ca2a55f01f704e4a96e SHA1 530c8dc00510a835b600332269c5316a1c2c2bdd SHA256 67da540791a2e37c8e119984ec5308fcfa25c758cb9d8a9c358efd40d3465212
 MISC metadata.xml 227 RMD160 8f1a760375a8e55689e5bc336684eb2a0a1359ed SHA1 dc84bfe01b6e845c77d5f26b9bc588904315b161 SHA256 e082e24d9d4d2f8a5a431ae131f9521749796f3888329160e106c456f257bc36
diff --git a/kde-misc/kgtk/files/kgtk-0.10.1-glibc-2.10.patch b/kde-misc/kgtk/files/kgtk-0.10.1-glibc-2.10.patch
new file mode 100644
index 000000000000..5ea95b943f69
--- /dev/null
+++ b/kde-misc/kgtk/files/kgtk-0.10.1-glibc-2.10.patch
@@ -0,0 +1,12 @@
+diff -ur KGtk-0.10.1.orig/qt4/kqt4.cpp KGtk-0.10.1/qt4/kqt4.cpp
+--- KGtk-0.10.1.orig/qt4/kqt4.cpp	2009-03-12 02:19:40.000000000 +0200
++++ KGtk-0.10.1/qt4/kqt4.cpp	2009-08-09 00:57:37.000000000 +0300
+@@ -99,7 +99,7 @@
+     {
+         const char *a=useQt && QCoreApplication::arguments().count()
+                         ? QCoreApplication::arguments()[0].toLatin1().constData() : getAppNameFromPid(getpid());
+-        char       *slash;
++        const char *slash;
+ 
+         // Was the cmdline app java? if so, try to use its parent name - just in case
+         //   its run from a shell script, etc. - e.g. as eclipse does
diff --git a/kde-misc/kgtk/kgtk-0.10.1.ebuild b/kde-misc/kgtk/kgtk-0.10.1.ebuild
index 5535bf9c6bd0..003746163c60 100644
--- a/kde-misc/kgtk/kgtk-0.10.1.ebuild
+++ b/kde-misc/kgtk/kgtk-0.10.1.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-misc/kgtk/kgtk-0.10.1.ebuild,v 1.1 2009/03/12 15:15:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kgtk/kgtk-0.10.1.ebuild,v 1.2 2009/08/08 21:57:48 ssuominen Exp $
 
 EAPI="2"
 
@@ -33,7 +33,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/KGtk-${PV}"
+PATCHES=( "${FILESDIR}/${P}-glibc-2.10.patch" )
+
+S=${WORKDIR}/KGtk-${PV}
 
 src_configure() {
 	if use qt3 && use qt4 ; then