diff options
| author | Richard Purdie <richard@openedhand.com> | 2006-02-10 14:33:55 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-02-10 14:33:55 +0000 |
| commit | 5fb35ca11147ed30c619cf93e19331fd835f3da9 (patch) | |
| tree | 45f05442e8a91453bfea03a29fb3cb96f49d80e5 /openembedded/packages/gnome | |
| parent | 42dfbb2a0223ba5d091f053ad5401ecce6446e41 (diff) | |
| download | openembedded-core-5fb35ca11147ed30c619cf93e19331fd835f3da9.tar.gz openembedded-core-5fb35ca11147ed30c619cf93e19331fd835f3da9.tar.bz2 openembedded-core-5fb35ca11147ed30c619cf93e19331fd835f3da9.tar.xz openembedded-core-5fb35ca11147ed30c619cf93e19331fd835f3da9.zip | |
Apply more chanegs from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@272 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/gnome')
4 files changed, 39 insertions, 6 deletions
diff --git a/openembedded/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch b/openembedded/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch new file mode 100644 index 000000000..c195aad63 --- /dev/null +++ b/openembedded/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/openembedded/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch b/openembedded/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch new file mode 100644 index 000000000..312a356c8 --- /dev/null +++ b/openembedded/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/openembedded/packages/gnome/gconf-dbus_svn.bb b/openembedded/packages/gnome/gconf-dbus_svn.bb index b71d5179c..d6b79494b 100644 --- a/openembedded/packages/gnome/gconf-dbus_svn.bb +++ b/openembedded/packages/gnome/gconf-dbus_svn.bb @@ -12,19 +12,26 @@ 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" -PARALLEL_MAKE = "" - inherit pkgconfig autotools S = "${WORKDIR}/trunk" +PARALLEL_MAKE = "" + FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*" EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static" 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/ diff --git a/openembedded/packages/gnome/gnome-mime-data_2.4.2.bb b/openembedded/packages/gnome/gnome-mime-data_2.4.2.bb index bf98e1441..c71f21c9d 100644 --- a/openembedded/packages/gnome/gnome-mime-data_2.4.2.bb +++ b/openembedded/packages/gnome/gnome-mime-data_2.4.2.bb @@ -1,8 +1,7 @@ LICENSE = "GPL" - -inherit pkgconfig autotools - -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${PN}/2.4/${PN}-${PV}.tar.bz2" +inherit gnome DEPENDS += "shared-mime-info intltool-native" RDEPENDS = "shared-mime-info" + +PR = "r2" |