Merge bk://openembedded@openembedded.bkbits.net/packages

into gandalf.tm.informatik.uni-frankfurt.de:/home/pb_/packages

2004/05/15 20:13:26+02:00 uni-frankfurt.de!pb_
gconf build fixes

BKrev: 40a65dca8wcwkOPc2vx4O3RRgOP1oQ

diff --git a/gnome/gconf-2.6.1/backends.patch b/gnome/gconf-2.6.1/backends.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/gnome/gconf_2.6.1.oe b/gnome/gconf_2.6.1.oe
index 04f906d..116918d 100644 (file)
--- a/gnome/gconf_2.6.1.oe
+++ b/gnome/gconf_2.6.1.oe
@@ -1,7 +1,8 @@
 SECTION = "gnome/base"
 DESCRIPTION = "GNOME configuration database system"
-SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2"
-DEPENDS = "orbit2 glib-2.0"
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \
+          file://${FILESDIR}/backends.patch;patch=1"
+DEPENDS = "orbit2 glib-2.0 gettext"
 
 S = "${WORKDIR}/GConf-${PV}"
 
@@ -15,4 +16,5 @@ do_stage() {
        oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
        install -d ${STAGING_INCDIR}/gconf/2/gconf/
        ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done )
+       install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
 }