diff options
| author | Justin Patrin <papercrane@gmail.com> | 2006-01-20 06:00:30 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-20 06:00:30 +0000 |
| commit | 9993d1748f9ef5c52aa0d6e3d3e0295248b921c6 (patch) | |
| tree | fa503878d712ef3f49aeff30de96a9141140f609 /packages | |
| parent | 2dc9ee48f37e5ccbf2b7220911c270baa7bcd170 (diff) | |
gconf-dbus: fix compile error with gconf lock functions in XML backend and fix oldxml in Makefile
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch | 16 | ||||
| -rw-r--r-- | packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch | 11 | ||||
| -rw-r--r-- | packages/gnome/gconf-dbus_svn.bb | 7 |
3 files changed, 34 insertions, 0 deletions
diff --git a/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch b/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch new file mode 100644 index 0000000000..c195aad639 --- /dev/null +++ b/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch @@ -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 { diff --git a/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch b/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch new file mode 100644 index 0000000000..312a356c84 --- /dev/null +++ b/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch @@ -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 diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb index 194ca00263..39437ac33f 100644 --- a/packages/gnome/gconf-dbus_svn.bb +++ b/packages/gnome/gconf-dbus_svn.bb @@ -12,6 +12,8 @@ PR = "r0" SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ file://gconf-dbus-update.patch;patch=1;pnum=0 \ + file://xml-backend-locks-compile-fix.patch;patch=1 \ + file://xml-backend-oldxml-Makefile.patch \ file://69gconfd-dbus" inherit pkgconfig autotools @@ -23,6 +25,11 @@ EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SY HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h" +do_compile_prepend() { + cd ${S} + patch -p1 < ../xml-backend-oldxml-Makefile.patch +} + do_stage() { oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR} install -d ${STAGING_INCDIR}/gconf/2/gconf/ |