Attachment 23179 Details for Bug 20253 – launch-helper.patch

[patch] launch-helper.patch

dbus-1.2.12-launch-helper-xml-fix.patch (text/plain), 1.03 KB, created by Peter Korsgaard on 2009-02-22 12:05:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Peter Korsgaard

Created: 2009-02-22 12:05:47 UTC

Size: 1.03 KB

patch

obsolete

>dbus-daemon-launch-helper: fix build with libxml
>
>dbus-daemon-launch-helper links with the trival config parser, which
>doesn't provide bus_config_parser_check_doctype(), like the big parser does.
>The libxml loader unfortunately wants to call it, so this breaks the build.
>
>Fix it by including a dummy bus_config_parser_check_doctype() in the trivial
>config parser.
>
>Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
>---
> bus/config-parser-trivial.c |    8 ++++++++
> 1 file changed, 8 insertions(+)
>
>Index: dbus-1.2.12/bus/config-parser-trivial.c
>===================================================================
>--- dbus-1.2.12.orig/bus/config-parser-trivial.c
>+++ dbus-1.2.12/bus/config-parser-trivial.c
>@@ -310,6 +310,14 @@
>   return &parser->service_dirs;
> }
> 
>+dbus_bool_t
>+bus_config_parser_check_doctype (BusConfigParser   *parser,
>+                                 const char        *doctype,
>+                                 DBusError         *error)
>+{
>+    return TRUE;
>+}
>+
> #ifdef DBUS_BUILD_TESTS
> #include <stdio.h>
> #include "test.h"

Actions: View | Splinter Review

Attachments on bug 20253: 23179 | 80384

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.