Fix building with GLIBC 2.10+ wrt #277774, thanks to Evan Teran for patch.

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

4 files changed, 71 insertions, 6 deletions

diff --git a/dev-util/kdbg/ChangeLog b/dev-util/kdbg/ChangeLog
index 7ca44f374bce..ccd2a4272c25 100644
--- a/dev-util/kdbg/ChangeLog
+++ b/dev-util/kdbg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/kdbg
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/ChangeLog,v 1.61 2009/04/25 22:12:22 patrick Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/ChangeLog,v 1.62 2009/08/08 22:09:56 ssuominen Exp $
+
+  08 Aug 2009; Samuli Suominen <ssuominen@gentoo.org> kdbg-2.1.1.ebuild,
+  +files/kdbg-2.1.1-glibc-2.10.patch:
+  Fix building with GLIBC 2.10+ wrt #277774, thanks to Evan Teran for patch.
 
 *kdbg-2.1.1 (25 Apr 2009)
 
diff --git a/dev-util/kdbg/Manifest b/dev-util/kdbg/Manifest
index 614585cb88f2..5dc828a3b153 100644
--- a/dev-util/kdbg/Manifest
+++ b/dev-util/kdbg/Manifest
@@ -1,9 +1,10 @@
 AUX kdbg-2.1.0-desktop-entry.diff 339 RMD160 8e27d4d7eabaa509460b0043c19bd3bd152017c7 SHA1 1ced684aee76ec62bb36f02396ac7ec3b31c308d SHA256 5148129e915579220f841c58715d0323ef46b1b4258fd01245948a329a23bdab
+AUX kdbg-2.1.1-glibc-2.10.patch 2014 RMD160 e2f5ebe58f7525c360e3aac7a1d73e948962b293 SHA1 b5ee858ad746bcd3f341b1d5e3d4761ae63fffc1 SHA256 14a6d9f330deb0f91db24d27cdb4fa0a7b65e38b766eeba8c84284faec47e3dd
 DIST kdbg-2.0.5.tar.gz 860205 RMD160 276a80a3c9d6f685d6269086aa933546acd9bf5d SHA1 3578723c340109bd5532aac5f694e64a65453689 SHA256 7a2f01efa94c6fc0b80fd652f6e673136abf986657146e89dd25095072da4cdc
 DIST kdbg-2.1.0.tar.gz 847480 RMD160 51e8be3cdb86ecfa8140c9534d205d493c574580 SHA1 93cb318e643f9317dec296de8627273a3aab5f19 SHA256 22bdf37840fbdb8b0237f2cf6b89c8afa24d9a1e2575ba53f227e24240cce682
 DIST kdbg-2.1.1.tar.gz 887666 RMD160 1e41100859b3efba05851c7eae72a59bc522bbd9 SHA1 e37bde85194bc0b61e193c5ee3af5a46e5d4fed7 SHA256 6f44c8d33548c564c9155055d5c4e79305c460033149cb2a4684ee6058f5ca5e
 EBUILD kdbg-2.0.5.ebuild 475 RMD160 b0479264f73ff4f30465f1562f52a5b40da22e79 SHA1 a8c719487357d838e81b8f28a7624c983963c113 SHA256 7207494bd94842d5cc9d957481fe0899af245b971686032e98521dbf21a55014
 EBUILD kdbg-2.1.0.ebuild 552 RMD160 4df608e293fc493a29b94b4db4489f87e6e43eb2 SHA1 9a5dbae1a538b23193ff1d973d70f2412de398ac SHA256 8973b91a53c8360919c84261589709f1cc994c2f50c3dbd253c230e5412d2935
-EBUILD kdbg-2.1.1.ebuild 505 RMD160 2addb62a7493b849b5a6f34af208a5b754cab474 SHA1 d8781853a19f6b319846a1a88d3337c2ca524c3f SHA256 b9d5d5fda565d5324cbfc40e7298f5ef1d5e529f1f623703653c9e203d6de5ae
-MISC ChangeLog 7018 RMD160 9b4968667b01f2b92d0b63ae3797541961ca8b28 SHA1 1d3b7a7e604849cbef386fb43ffaa056946ddfca SHA256 659813a8981195af3092426c2834f778f8d50470b973887dc9e57eb28f69ec20
+EBUILD kdbg-2.1.1.ebuild 592 RMD160 c847197d58ec5e5b335db03cb90ac4f8f8286eb8 SHA1 d61ec68a5f8ce5825a4b1f11699dcfc82fe93503 SHA256 a441d1cd514b407da7fa2aa3875d9cd102df70671518d743fef605920c0fa412
+MISC ChangeLog 7209 RMD160 8640dcd1c7b468b29479c326b23e88f35213e685 SHA1 fd43b0a62da886654d0b6f5641f10c2cd29e9797 SHA256 e5a0faffcfbbaf78df3a71f6f58eaf004214fa10fbded64ad4d248353dec6a53
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
diff --git a/dev-util/kdbg/files/kdbg-2.1.1-glibc-2.10.patch b/dev-util/kdbg/files/kdbg-2.1.1-glibc-2.10.patch
new file mode 100644
index 000000000000..fb340d284ae8
--- /dev/null
+++ b/dev-util/kdbg/files/kdbg-2.1.1-glibc-2.10.patch
@@ -0,0 +1,55 @@
+diff -rupN kdbg-2.1.1.old/kdbg/gdbdriver.cpp kdbg-2.1.1.new/kdbg/gdbdriver.cpp
+--- kdbg-2.1.1.old/kdbg/gdbdriver.cpp	2008-11-17 17:17:55.000000000 -0500
++++ kdbg-2.1.1.new/kdbg/gdbdriver.cpp	2009-08-01 22:08:53.000000000 -0400
+@@ -133,7 +133,7 @@ GdbDriver::GdbDriver() :
+ 
+ #ifndef NDEBUG
+     // check command info array
+-    char* perc;
++    const char* perc;
+     for (int i = 0; i < NUM_CMDS; i++) {
+ 	// must be indexable by DbgCommand values, i.e. sorted by DbgCommand values
+ 	assert(i == cmds[i].cmd);
+@@ -669,7 +669,7 @@ static bool parseErrorMessage(const char
+     // skip warnings
+     while (strncmp(output, "warning:", 8) == 0)
+     {
+-	char* end = strchr(output+8, '\n');
++	const char* end = strchr(output+8, '\n');
+ 	if (end == 0)
+ 	    output += strlen(output);
+ 	else
+@@ -1880,8 +1880,10 @@ bool GdbDriver::parseThreadList(const ch
+ 	    p++;
+ 	    // there follows only whitespace
+ 	}
+-	char* end;
+-	id = strtol(p, &end, 10);
++	const char* end;
++	char *end_p; /* we need a non-const version to pass to strtol */
++	id = strtol(p, &end_p, 10);
++	end = end_p;
+ 	if (p == end) {
+ 	    // syntax error: no number found; bail out
+ 	    return true;
+diff -rupN kdbg-2.1.1.old/kdbg/xsldbgdriver.cpp kdbg-2.1.1.new/kdbg/xsldbgdriver.cpp
+--- kdbg-2.1.1.old/kdbg/xsldbgdriver.cpp	2008-12-18 16:01:58.000000000 -0500
++++ kdbg-2.1.1.new/kdbg/xsldbgdriver.cpp	2009-08-01 22:09:19.000000000 -0400
+@@ -114,7 +114,7 @@ DebuggerDriver(), m_gdbMajor(2), m_gdbMi
+ 
+ #ifndef NDEBUG
+     // check command info array
+-    char *perc;
++    const char *perc;
+ 
+     for (int i = 0; i < NUM_CMDS; i++) {
+         // must be indexable by DbgCommand values, i.e. sorted by DbgCommand values
+@@ -768,7 +768,7 @@ parseVar(const char *&s)
+     } else if (strncmp(p, "= ", 2) == 0) {
+         /* we're processing the result of a "print command" */
+         /* find next line */
+-        char *nextLine = strchr(p, '\n');
++        const char *nextLine = strchr(p, '\n');
+ 
+ 	TRACE("Found print expr");
+         if (nextLine) {
diff --git a/dev-util/kdbg/kdbg-2.1.1.ebuild b/dev-util/kdbg/kdbg-2.1.1.ebuild
index ee0c8951cf9f..b5aad1c59ec5 100644
--- a/dev-util/kdbg/kdbg-2.1.1.ebuild
+++ b/dev-util/kdbg/kdbg-2.1.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/kdbg-2.1.1.ebuild,v 1.1 2009/04/25 22:12:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/kdbg-2.1.1.ebuild,v 1.2 2009/08/08 22:09:56 ssuominen Exp $
 
 ARTS_REQUIRED="never"
 
-inherit kde
+inherit eutils kde
 
 DESCRIPTION="A Graphical Debugger Interface to gdb."
 HOMEPAGE="http://www.kdbg.org/"
@@ -18,3 +18,8 @@ IUSE=""
 RDEPEND=">=sys-devel/gdb-5.0"
 
 need-kde 3.5
+
+src_unpack() {
+	kde_src_unpack
+	epatch "${FILESDIR}"/${P}-glibc-2.10.patch
+}