summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-08-08 21:57:48 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-08-08 21:57:48 +0000
commitb33c3d3dba5045096faf7a99d669c82c70b73c4b (patch)
tree8660e715c292cdc8a91bf41c895b1b966ed57552 /kde-misc
parentVersion bump. Clean up old revision. (diff)
downloadgentoo-2-b33c3d3dba5045096faf7a99d669c82c70b73c4b.tar.gz
gentoo-2-b33c3d3dba5045096faf7a99d669c82c70b73c4b.tar.bz2
gentoo-2-b33c3d3dba5045096faf7a99d669c82c70b73c4b.zip
Fix building with GLIBC 2.10+ wrt #276500.
(Portage version: 2.2_rc36/cvs/Linux x86_64)
Diffstat (limited to 'kde-misc')
-rw-r--r--kde-misc/kgtk/ChangeLog6
-rw-r--r--kde-misc/kgtk/files/kgtk-0.10.1-glibc-2.10.patch12
-rw-r--r--kde-misc/kgtk/kgtk-0.10.1.ebuild6
3 files changed, 21 insertions, 3 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/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