add dbus-glib
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@465 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
81
dev-libs/dbus-glib/files/dbus-glib-0.73-namespaces.patch
Normal file
81
dev-libs/dbus-glib/files/dbus-glib-0.73-namespaces.patch
Normal file
@@ -0,0 +1,81 @@
|
||||
--- dbus/dbus-gparser.c 2006-09-27 08:27:24.000000000 -0400
|
||||
+++ dbus/dbus-gparser.c 2008-03-13 08:54:14.000000000 -0400
|
||||
@@ -128,13 +128,17 @@ locate_attributes (const char *element_
|
||||
|
||||
if (!found)
|
||||
{
|
||||
- g_set_error (error,
|
||||
- G_MARKUP_ERROR,
|
||||
- G_MARKUP_ERROR_PARSE,
|
||||
- _("Attribute \"%s\" is invalid on <%s> element in this context"),
|
||||
- attribute_names[i], element_name);
|
||||
- retval = FALSE;
|
||||
- goto out;
|
||||
+ /* We want to passthrough namespaced XML nodes that we don't know anything about. */
|
||||
+ if (strchr (attribute_names[i], ':') == NULL)
|
||||
+ {
|
||||
+ g_set_error (error,
|
||||
+ G_MARKUP_ERROR,
|
||||
+ G_MARKUP_ERROR_PARSE,
|
||||
+ _("Attribute \"%s\" is invalid on <%s> element in this context"),
|
||||
+ attribute_names[i], element_name);
|
||||
+ retval = FALSE;
|
||||
+ goto out;
|
||||
+ }
|
||||
}
|
||||
|
||||
++i;
|
||||
@@ -177,6 +181,7 @@ struct Parser
|
||||
PropertyInfo *property;
|
||||
ArgInfo *arg;
|
||||
gboolean in_annotation;
|
||||
+ guint unknown_namespaced_depth;
|
||||
};
|
||||
|
||||
Parser*
|
||||
@@ -791,10 +796,14 @@ parser_start_element (Parser *parse
|
||||
}
|
||||
else
|
||||
{
|
||||
- g_set_error (error, G_MARKUP_ERROR,
|
||||
- G_MARKUP_ERROR_PARSE,
|
||||
- _("Element <%s> not recognized"),
|
||||
- element_name);
|
||||
+ if (strchr (element_name, ':') != NULL)
|
||||
+ /* Passthrough XML-namespaced nodes */
|
||||
+ parser->unknown_namespaced_depth += 1;
|
||||
+ else if (parser->unknown_namespaced_depth == 0)
|
||||
+ g_set_error (error, G_MARKUP_ERROR,
|
||||
+ G_MARKUP_ERROR_PARSE,
|
||||
+ _("Element <%s> not recognized"),
|
||||
+ element_name);
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
@@ -844,6 +853,15 @@ parser_end_element (Parser *parser,
|
||||
if (parser->node_stack == NULL)
|
||||
parser->result = top; /* We are done, store the result */
|
||||
}
|
||||
+ else if (strchr (element_name, ':') != NULL)
|
||||
+ {
|
||||
+ /* Passthrough XML-namespaced nodes */
|
||||
+ parser->unknown_namespaced_depth -= 1;
|
||||
+ }
|
||||
+ else if (parser->unknown_namespaced_depth > 0)
|
||||
+ {
|
||||
+ /* pass through unknown elements underneath a namespace */
|
||||
+ }
|
||||
else
|
||||
g_assert_not_reached (); /* should have had an error on start_element */
|
||||
|
||||
--- dbus/dbus-glib-tool.c 2008-03-13 08:31:21.000000000 -0400
|
||||
+++ dbus/dbus-glib-tool.c 2008-03-13 08:32:15.000000000 -0400
|
||||
@@ -414,7 +414,7 @@ main (int argc, char **argv)
|
||||
&error);
|
||||
if (node == NULL)
|
||||
{
|
||||
- lose_gerror (_("Unable to load \"%s\""), error);
|
||||
+ lose (_("Unable to load \"%s\": %s"), filename, error->message);
|
||||
}
|
||||
else
|
||||
{
|
||||
78
dev-libs/dbus-glib/files/dbus-glib-introspection.patch
Normal file
78
dev-libs/dbus-glib/files/dbus-glib-introspection.patch
Normal file
@@ -0,0 +1,78 @@
|
||||
diff -Npru dbus-glib-0.71-orig/tools/dbus-bus-introspect.xml dbus-glib-0.71/tools/dbus-bus-introspect.xml
|
||||
--- tools/dbus-bus-introspect.xml 1969-12-31 17:00:00.000000000 -0700
|
||||
+++ tools/dbus-bus-introspect.xml 2006-07-24 14:32:01.000000000 -0600
|
||||
@@ -0,0 +1,74 @@
|
||||
+ <!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN"
|
||||
+"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
|
||||
+<node>
|
||||
+ <interface name="org.freedesktop.DBus.Introspectable">
|
||||
+ <method name="Introspect">
|
||||
+ <arg name="data" direction="out" type="s"/>
|
||||
+ </method>
|
||||
+ </interface>
|
||||
+ <interface name="org.freedesktop.DBus">
|
||||
+ <method name="RequestName">
|
||||
+ <arg direction="in" type="s"/>
|
||||
+ <arg direction="in" type="u"/>
|
||||
+ <arg direction="out" type="u"/>
|
||||
+ </method>
|
||||
+ <method name="ReleaseName">
|
||||
+ <arg direction="in" type="s"/>
|
||||
+ <arg direction="out" type="u"/>
|
||||
+ </method>
|
||||
+ <method name="StartServiceByName">
|
||||
+ <arg direction="in" type="s"/>
|
||||
+ <arg direction="in" type="u"/>
|
||||
+ <arg direction="out" type="u"/>
|
||||
+ </method>
|
||||
+ <method name="Hello">
|
||||
+ <arg direction="out" type="s"/>
|
||||
+ </method>
|
||||
+ <method name="NameHasOwner">
|
||||
+ <arg direction="in" type="s"/>
|
||||
+ <arg direction="out" type="b"/>
|
||||
+ </method>
|
||||
+ <method name="ListNames">
|
||||
+ <arg direction="out" type="as"/>
|
||||
+ </method>
|
||||
+ <method name="AddMatch">
|
||||
+ <arg direction="in" type="s"/>
|
||||
+ </method>
|
||||
+ <method name="RemoveMatch">
|
||||
+ <arg direction="in" type="s"/>
|
||||
+ </method>
|
||||
+ <method name="GetNameOwner">
|
||||
+ <arg direction="in" type="s"/>
|
||||
+ <arg direction="out" type="s"/>
|
||||
+ </method>
|
||||
+ <method name="ListQueuedOwners">
|
||||
+ <arg direction="in" type="s"/>
|
||||
+ <arg direction="out" type="as"/>
|
||||
+ </method>
|
||||
+ <method name="GetConnectionUnixUser">
|
||||
+ <arg direction="in" type="s"/>
|
||||
+ <arg direction="out" type="u"/>
|
||||
+ </method>
|
||||
+ <method name="GetConnectionUnixProcessID">
|
||||
+ <arg direction="in" type="s"/>
|
||||
+ <arg direction="out" type="u"/>
|
||||
+ </method>
|
||||
+ <method name="GetConnectionSELinuxSecurityContext">
|
||||
+ <arg direction="in" type="s"/>
|
||||
+ <arg direction="out" type="ay"/>
|
||||
+ </method>
|
||||
+ <method name="ReloadConfig">
|
||||
+ </method>
|
||||
+ <signal name="NameOwnerChanged">
|
||||
+ <arg type="s"/>
|
||||
+ <arg type="s"/>
|
||||
+ <arg type="s"/>
|
||||
+ </signal>
|
||||
+ <signal name="NameLost">
|
||||
+ <arg type="s"/>
|
||||
+ </signal>
|
||||
+ <signal name="NameAcquired">
|
||||
+ <arg type="s"/>
|
||||
+ </signal>
|
||||
+ </interface>
|
||||
+</node>
|
||||
Reference in New Issue
Block a user