--- Begin Message ---
Package: kdbg
Version: 2.2.0-1
Severity: important
Tags: patch
Justification: fails to build from source
User: [email protected]
Usertags: origin-ubuntu karmic ubuntu-patch
*** /tmp/tmpJWNnxV
In Ubuntu, we've applied the attached patch to achieve the following:
* debian/patches/10_fix-ftbfs-gcc44-eglibc210.diff:
Fix FTBFS with GCC 4.4 and eglibc 2.10 (LP: #461338).
We thought you might be interested in doing the same.
-- System Information:
Debian Release: squeeze/sid
APT prefers karmic-updates
APT policy: (500, 'karmic-updates'), (500, 'karmic-security'), (500,
'karmic-proposed'), (500, 'karmic-backports'), (500, 'karmic')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.31-14-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru kdbg-2.2.0/debian/patches/10_fix-ftbfs-gcc44-eglibc210.diff kdbg-2.1.1/debian/patches/10_fix-ftbfs-gcc44-eglibc210.diff
--- kdbg-2.2.0/debian/patches/10_fix-ftbfs-gcc44-eglibc210.diff 1970-01-01 01:00:00.000000000 +0100
+++ kdbg-2.1.1/debian/patches/10_fix-ftbfs-gcc44-eglibc210.diff 2009-10-27 19:39:33.000000000 +0100
@@ -0,0 +1,141 @@
+#
+# Ubuntu: https://bugs.launchpad.net/ubuntu/+source/kdbg/+bug/461338
+# Description: Fix FTBFS with GCC 4.4 and eglibc 2.10.
+#
+Index: kdbg/kdbg/gdbdriver.cpp
+===================================================================
+--- kdbg.orig/kdbg/gdbdriver.cpp 2009-10-26 19:40:15.339030946 +0100
++++ kdbg/kdbg/gdbdriver.cpp 2009-10-26 19:40:25.831227480 +0100
+@@ -146,40 +146,40 @@
+ assert(strchr(cmds[i].fmt, '%') == 0);
+ break;
+ case GdbCmdInfo::argString:
+- perc = strchr(cmds[i].fmt, '%');
++ perc = (char *) strchr(cmds[i].fmt, '%');
+ assert(perc != 0 && perc[1] == 's');
+ assert(strchr(perc+2, '%') == 0);
+ break;
+ case GdbCmdInfo::argNum:
+- perc = strchr(cmds[i].fmt, '%');
++ perc = (char *) strchr(cmds[i].fmt, '%');
+ assert(perc != 0 && perc[1] == 'd');
+ assert(strchr(perc+2, '%') == 0);
+ break;
+ case GdbCmdInfo::argStringNum:
+- perc = strchr(cmds[i].fmt, '%');
++ perc = (char *) strchr(cmds[i].fmt, '%');
+ assert(perc != 0 && perc[1] == 's');
+- perc = strchr(perc+2, '%');
++ perc = (char *) strchr(perc+2, '%');
+ assert(perc != 0 && perc[1] == 'd');
+ assert(strchr(perc+2, '%') == 0);
+ break;
+ case GdbCmdInfo::argNumString:
+- perc = strchr(cmds[i].fmt, '%');
++ perc = (char *) strchr(cmds[i].fmt, '%');
+ assert(perc != 0 && perc[1] == 'd');
+- perc = strchr(perc+2, '%');
++ perc = (char *) strchr(perc+2, '%');
+ assert(perc != 0 && perc[1] == 's');
+ assert(strchr(perc+2, '%') == 0);
+ break;
+ case GdbCmdInfo::argString2:
+- perc = strchr(cmds[i].fmt, '%');
++ perc = (char *) strchr(cmds[i].fmt, '%');
+ assert(perc != 0 && perc[1] == 's');
+- perc = strchr(perc+2, '%');
++ perc = (char *) strchr(perc+2, '%');
+ assert(perc != 0 && perc[1] == 's');
+ assert(strchr(perc+2, '%') == 0);
+ break;
+ case GdbCmdInfo::argNum2:
+- perc = strchr(cmds[i].fmt, '%');
++ perc = (char *) strchr(cmds[i].fmt, '%');
+ assert(perc != 0 && perc[1] == 'd');
+- perc = strchr(perc+2, '%');
++ perc = (char *) strchr(perc+2, '%');
+ assert(perc != 0 && perc[1] == 'd');
+ assert(strchr(perc+2, '%') == 0);
+ break;
+@@ -669,7 +669,7 @@
+ // 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
+@@ -1895,7 +1895,7 @@
+ /*
+ * Now follows the thread's SYSTAG. It is terminated by two blanks.
+ */
+- end = strstr(p, " ");
++ end = (char *) strstr(p, " ");
+ if (end == 0) {
+ // syntax error; bail out
+ return true;
+Index: kdbg/kdbg/xsldbgdriver.cpp
+===================================================================
+--- kdbg.orig/kdbg/xsldbgdriver.cpp 2009-10-26 19:40:43.048959873 +0100
++++ kdbg/kdbg/xsldbgdriver.cpp 2009-10-26 19:40:52.191798688 +0100
+@@ -128,40 +128,40 @@
+ assert(strchr(cmds[i].fmt, '%') == 0);
+ break;
+ case XsldbgCmdInfo::argString:
+- perc = strchr(cmds[i].fmt, '%');
++ perc = (char *) strchr(cmds[i].fmt, '%');
+ assert(perc != 0 && perc[1] == 's');
+ assert(strchr(perc + 2, '%') == 0);
+ break;
+ case XsldbgCmdInfo::argNum:
+- perc = strchr(cmds[i].fmt, '%');
++ perc = (char *) strchr(cmds[i].fmt, '%');
+ assert(perc != 0 && perc[1] == 'd');
+ assert(strchr(perc + 2, '%') == 0);
+ break;
+ case XsldbgCmdInfo::argStringNum:
+- perc = strchr(cmds[i].fmt, '%');
++ perc = (char *) strchr(cmds[i].fmt, '%');
+ assert(perc != 0 && perc[1] == 's');
+- perc = strchr(perc + 2, '%');
++ perc = (char *) strchr(perc + 2, '%');
+ assert(perc != 0 && perc[1] == 'd');
+ assert(strchr(perc + 2, '%') == 0);
+ break;
+ case XsldbgCmdInfo::argNumString:
+- perc = strchr(cmds[i].fmt, '%');
++ perc = (char *) strchr(cmds[i].fmt, '%');
+ assert(perc != 0 && perc[1] == 'd');
+- perc = strchr(perc + 2, '%');
++ perc = (char *) strchr(perc + 2, '%');
+ assert(perc != 0 && perc[1] == 's');
+ assert(strchr(perc + 2, '%') == 0);
+ break;
+ case XsldbgCmdInfo::argString2:
+- perc = strchr(cmds[i].fmt, '%');
++ perc = (char *) strchr(cmds[i].fmt, '%');
+ assert(perc != 0 && perc[1] == 's');
+- perc = strchr(perc + 2, '%');
++ perc = (char *) strchr(perc + 2, '%');
+ assert(perc != 0 && perc[1] == 's');
+ assert(strchr(perc + 2, '%') == 0);
+ break;
+ case XsldbgCmdInfo::argNum2:
+- perc = strchr(cmds[i].fmt, '%');
++ perc = (char *) strchr(cmds[i].fmt, '%');
+ assert(perc != 0 && perc[1] == 'd');
+- perc = strchr(perc + 2, '%');
++ perc = (char *) strchr(perc + 2, '%');
+ assert(perc != 0 && perc[1] == 'd');
+ assert(strchr(perc + 2, '%') == 0);
+ break;
+@@ -768,7 +768,7 @@
+ } 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 -Nru kdbg-2.2.0/debian/patches/series kdbg-2.1.1/debian/patches/series
--- kdbg-2.2.0/debian/patches/series 2009-10-27 19:39:32.000000000 +0100
+++ kdbg-2.1.1/debian/patches/series 2009-10-27 19:39:33.000000000 +0100
@@ -1,2 +1,3 @@
02_libtool_update.diff
buildprep.diff
+10_fix-ftbfs-gcc44-eglibc210.diff
--- End Message ---