rpms/dbus-glib/F-8 dbus-glib-0.73-ignore-namespaces.patch, NONE, 1.1 dbus-glib.spec, 1.19, 1.20
Daniel Williams (dcbw)
fedora-extras-commits at redhat.com
Wed Feb 13 03:16:36 UTC 2008
- Previous message (by thread): rpms/evince/devel .cvsignore, 1.42, 1.43 evince.spec, 1.112, 1.113 sources, 1.41, 1.42
- Next message (by thread): rpms/scim-chewing/devel scim-chewing-0.3.1-13.gcc.patch, NONE, 1.1 scim-chewing.spec, 1.35, 1.36
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: dcbw
Update of /cvs/extras/rpms/dbus-glib/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6888
Modified Files:
dbus-glib.spec
Added Files:
dbus-glib-0.73-ignore-namespaces.patch
Log Message:
* Tue Feb 12 2008 Dan Williams <dcbw at redhat.com> - 0.73-6
- Ignore namespaces in introspection XML
dbus-glib-0.73-ignore-namespaces.patch:
--- NEW FILE dbus-glib-0.73-ignore-namespaces.patch ---
diff --git a/dbus/dbus-gparser.c b/dbus/dbus-gparser.c
index f296f96..cdd4e53 100644
--- a/dbus/dbus-gparser.c
+++ b/dbus/dbus-gparser.c
@@ -128,13 +128,17 @@ locate_attributes (const char *element_name,
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 *parser,
}
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
+ g_set_error (error, G_MARKUP_ERROR,
+ G_MARKUP_ERROR_PARSE,
+ _("Element <%s> not recognized"),
+ element_name);
}
return TRUE;
@@ -844,6 +853,11 @@ 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
g_assert_not_reached (); /* should have had an error on start_element */
Index: dbus-glib.spec
===================================================================
RCS file: /cvs/extras/rpms/dbus-glib/F-8/dbus-glib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dbus-glib.spec 18 Nov 2007 16:40:24 -0000 1.19
+++ dbus-glib.spec 13 Feb 2008 03:15:59 -0000 1.20
@@ -8,12 +8,14 @@
Summary: GLib bindings for D-Bus
Name: dbus-glib
Version: 0.73
-Release: 5%{?dist}
+Release: 6%{?dist}
URL: http://www.freedesktop.org/software/dbus/
Source0: http://dbus.freedesktop.org/releases/dbus-glib/%{name}-%{version}.tar.gz
Source1: dbus-bus-introspect.xml
Patch0: broken-xml.patch
Patch1: dbus-glib-proxy-signals-once.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=14429
+Patch2: dbus-glib-0.73-ignore-namespaces.patch
License: AFL/GPL
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -61,6 +63,7 @@
%setup -q
%patch0 -p1 -b .broken-xml
%patch1 -p1 -b .proxy-signals-once
+%patch2 -p1 -b .ignore-namespaces
%build
@@ -116,6 +119,9 @@
%endif
%changelog
+* Tue Feb 12 2008 Dan Williams <dcbw at redhat.com> - 0.73-6
+- Ignore namespaces in introspection XML
+
* Sun Nov 18 2007 Dan Williams <dcbw at redhat.com> - 0.73-5
- Actually apply the patch for fdo #12505
- Previous message (by thread): rpms/evince/devel .cvsignore, 1.42, 1.43 evince.spec, 1.112, 1.113 sources, 1.41, 1.42
- Next message (by thread): rpms/scim-chewing/devel scim-chewing-0.3.1-13.gcc.patch, NONE, 1.1 scim-chewing.spec, 1.35, 1.36
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list