diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-01-21 00:22:57 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-21 00:22:57 +0000 |
| commit | 3fc4e7483657130b7c4fbc596bcfe0572d60b877 (patch) | |
| tree | a3e35d41611dbfa41b58c05a90b938132c8d0a7a /packages/gnome | |
| parent | 0c751c19a7e2899fb7e5ef19a05fda53b91fb899 (diff) | |
| parent | 72a69325e8f9989ad0efc7b42f232e2f7baa6e6b (diff) | |
merge of 8ae00e8423679ec41790b01db397b47b07473927
and 90cfec2b058d549c4919f09e6d58e09c7dabca84
Diffstat (limited to 'packages/gnome')
| -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 dcd5209989..d6b79494be 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 @@ -25,6 +27,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/ |