[Pkg-utopia-maintainers] Bug#701220: libdbus-1-dev: c++11 syntax error, trivial fix, add whitespace

[David Fries]

Package: libdbus-1-dev
Version: 1.2.24-4+squeeze1
Severity: important
Tags: patch


There is a syntax error when including dbus-protocol.h when compiling
with a c++11 compiler such as gcc 4.7 or newer.

see "User-defined literals and whitespace"
http://gcc.gnu.org/gcc-4.7/porting_to.html
"To fix, just add some whitespace between the string literal and the
macro name."  I made the following patch and now it works.

--- /root/tmp/dbus-protocol.h	2013-02-22 19:16:30.267044120 -0600
+++ dbus-protocol.h	2013-02-22 19:17:33.276643990 -0600
@@ -425,7 +425,7 @@ extern "C" {
 /** XML system identifier of the introspection format version 1.0 */
 #define DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd"
 /** XML document type declaration of the introspection format version 1.0 */
-#define DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "<!DOCTYPE node PUBLIC \""DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER"\"\n\""DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER"\">\n"
+#define DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE "<!DOCTYPE node PUBLIC \"" DBUS_INTROSPECT_1_0_XML_PUBLIC_IDENTIFIER "\"\n\"" DBUS_INTROSPECT_1_0_XML_SYSTEM_IDENTIFIER "\">\n"
 
 /** @} */
 


-- System Information:
Debian Release: 6.0.6
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: i386 (x86_64)

Kernel: Linux 3.8.0+ (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=en_US.ISO-8859-15 (charmap=ISO-8859-15)
Shell: /bin/sh linked to /bin/dash

Versions of packages libdbus-1-dev depends on:
ii  libdbus-1-3            1.2.24-4+squeeze1 simple interprocess messaging syst
ii  pkg-config             0.25-1.1          manage compile and link flags for 

libdbus-1-dev recommends no packages.

libdbus-1-dev suggests no packages.

-- no debconf information