[oe-commits] org.oe.oz354x gconf-dbus: add missing xml-backend patches from dev

[dirk commit]

gconf-dbus: add missing xml-backend patches from dev

Author: dirk at openembedded.org
Branch: org.openembedded.oz354x
Revision: 01f1f0318dd3daec90078a7c8341350a6278c19f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=01f1f0318dd3daec90078a7c8341350a6278c19f
Files:
1
packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch
packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch
Diffs:

#
# mt diff -rc593a6215a4b04152cdebd72abc9591ee8718da7 -r01f1f0318dd3daec90078a7c8341350a6278c19f
#
# 
# 
# add_file "packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch"
#  content [d9689185eeaefadca6f2e32fc3f3e3713524a228]
# 
# add_file "packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch"
#  content [9531c7494e0dd88adff018b8245a324a10a0adea]
# 
============================================================
--- packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch	d9689185eeaefadca6f2e32fc3f3e3713524a228
+++ packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch	d9689185eeaefadca6f2e32fc3f3e3713524a228
@@ -0,0 +1,16 @@
+--- trunk/backends/xml-backend.c~	2006-01-18 09:57:39.000000000 -0800
++++ trunk/backends/xml-backend.c	2006-01-19 11:38:37.000000000 -0800
+@@ -115,6 +115,13 @@
+ 
+ typedef struct _XMLSource XMLSource;
+ 
++extern GConfLock*
++gconf_get_lock (const gchar *lock_directory,
++                GError     **err);
++extern gboolean
++gconf_release_lock (GConfLock *lock,
++                    GError   **err);
++
+ /* XMLSource **/
+ 
+ struct _XMLSource {
============================================================
--- packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch	9531c7494e0dd88adff018b8245a324a10a0adea
+++ packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch	9531c7494e0dd88adff018b8245a324a10a0adea
@@ -0,0 +1,11 @@
+--- trunk/backends/Makefile~	2006-01-19 09:52:22.000000000 -0800
++++ trunk/backends/Makefile	2006-01-19 13:13:23.000000000 -0800
+@@ -84,7 +84,7 @@
+ xml_test_OBJECTS = $(am_xml_test_OBJECTS)
+ xml_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
+-	$(top_builddir)/backends/libgconfbackend-oldxml.la
++	libgconfbackend-oldxml.la
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles