Fix building with glibc-2.10 again, bug #287633.

(Portage version: 2.2_rc43/cvs/Linux x86_64)

3 files changed, 66 insertions, 2 deletions

diff --git a/dev-util/kdbg/ChangeLog b/dev-util/kdbg/ChangeLog
index af0207c16cb3..252c92f30975 100644
--- a/dev-util/kdbg/ChangeLog
+++ b/dev-util/kdbg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/kdbg
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/ChangeLog,v 1.64 2009/10/03 20:04:44 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/ChangeLog,v 1.65 2009/10/05 02:41:45 dirtyepic Exp $
+
+  05 Oct 2009; Ryan Hill <dirtyepic@gentoo.org> kdbg-2.2.0.ebuild,
+  +files/kdbg-2.2.0-glibc-2.10.patch:
+  Fix building with glibc-2.10 again, bug #287633.
 
   03 Oct 2009; Sebastian Pipping <sping@gentoo.org> kdbg-2.1.0.ebuild,
   +files/kdbg-2.1.0-move-kde-ldflags-up-front.patch:
diff --git a/dev-util/kdbg/files/kdbg-2.2.0-glibc-2.10.patch b/dev-util/kdbg/files/kdbg-2.2.0-glibc-2.10.patch
new file mode 100644
index 000000000000..3f056edc4e5d
--- /dev/null
+++ b/dev-util/kdbg/files/kdbg-2.2.0-glibc-2.10.patch
@@ -0,0 +1,55 @@
+diff -rupN kdbg-2.2.0/kdbg/gdbdriver.cpp kdbg-2.2.0.new/kdbg/gdbdriver.cpp
+--- kdbg-2.2.0/kdbg/gdbdriver.cpp	2009-05-20 15:24:10.000000000 -0400
++++ kdbg-2.2.0.new/kdbg/gdbdriver.cpp	2009-10-04 01:18:28.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
+@@ -1856,8 +1856,10 @@ std::list<ThreadInfo> GdbDriver::parseTh
+ 	    p++;
+ 	    // there follows only whitespace
+ 	}
+-	char* end;
+-	thr.id = strtol(p, &end, 10);
++	const char* end;
++	char *temp_end = NULL; /* we need a non-const 'end' for strtol to use...*/
++	thr.id = strtol(p, &temp_end, 10);
++	end = temp_end;
+ 	if (p == end) {
+ 	    // syntax error: no number found; bail out
+ 	    return threads;
+diff -rupN kdbg-2.2.0/kdbg/xsldbgdriver.cpp kdbg-2.2.0.new/kdbg/xsldbgdriver.cpp
+--- kdbg-2.2.0/kdbg/xsldbgdriver.cpp	2009-05-20 15:24:10.000000000 -0400
++++ kdbg-2.2.0.new/kdbg/xsldbgdriver.cpp	2009-10-04 01:18:56.000000000 -0400
+@@ -115,7 +115,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
+@@ -771,7 +771,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.2.0.ebuild b/dev-util/kdbg/kdbg-2.2.0.ebuild
index cedc335003f0..a16193c00372 100644
--- a/dev-util/kdbg/kdbg-2.2.0.ebuild
+++ b/dev-util/kdbg/kdbg-2.2.0.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/dev-util/kdbg/kdbg-2.2.0.ebuild,v 1.1 2009/10/03 19:19:38 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/kdbg/kdbg-2.2.0.ebuild,v 1.2 2009/10/05 02:41:45 dirtyepic Exp $
 
 ARTS_REQUIRED="never"
 
@@ -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
+}