[oe-commits] org.oe.oz354x gconf-dbus: Fix dependencies to dbus-glib. Add more recent svn package.

[florian commit]

gconf-dbus: Fix dependencies to dbus-glib. Add more recent svn package.

Author: florian at openembedded.org
Branch: org.openembedded.oz354x
Revision: 65c9d170cf99b3543639bbd3b4af7c9826a9c63d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=65c9d170cf99b3543639bbd3b4af7c9826a9c63d
Files:
1
packages/gnome/gconf-dbus_svn.bb
packages/gnome/gconf-dbus_cvs.bb
Diffs:

#
# mt diff -r7c2dd5e8e1985403a587513e398d88f3c44cf9bf -r65c9d170cf99b3543639bbd3b4af7c9826a9c63d
#
# 
# 
# add_file "packages/gnome/gconf-dbus_svn.bb"
#  content [cc58c03d9b1f907a0302d69e67ae98badc6db8e9]
# 
# patch "packages/gnome/gconf-dbus_cvs.bb"
#  from [f273f33495a62cb0a03acef6e4b014326f0d5c89]
#    to [eade1ec66db80e8eb92a02f8e830f897872d771a]
# 
============================================================
--- packages/gnome/gconf-dbus_svn.bb	cc58c03d9b1f907a0302d69e67ae98badc6db8e9
+++ packages/gnome/gconf-dbus_svn.bb	cc58c03d9b1f907a0302d69e67ae98badc6db8e9
@@ -0,0 +1,48 @@
+SECTION = "x11/utils"
+DEPENDS = "gtk+ glib-2.0 dbus-glib libxml2 popt"
+DESCRIPTION = "Settings daemon using DBUS for communication."
+LICENSE = "GPL"
+MAINTAINER = "Florian Boor <florian at kernelconcepts.de>"
+PROVIDES = "gconf"
+RPROVIDES_${PN} = "gconf"
+RPROVIDES_${PN}-dev = "gconf-dev"
+CVSDATE = "20060801"
+
+PV = "2.10.0+svn${CVSDATE}"
+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
+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/
+        ( 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
+}
+
+do_install_append () {
+	install -d ${D}/${sysconfdir}/X11/Xsession.d
+	install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
+	install -d ${D}/${datadir}/dbus-1.0/services/
+	install -m 644  gconf/gconf.service ${D}${datadir}/dbus-1.0/services/ 
+}
============================================================
--- packages/gnome/gconf-dbus_cvs.bb	f273f33495a62cb0a03acef6e4b014326f0d5c89
+++ packages/gnome/gconf-dbus_cvs.bb	eade1ec66db80e8eb92a02f8e830f897872d771a
@@ -1,5 +1,5 @@ SECTION = "x11/utils"
 SECTION = "x11/utils"
-DEPENDS = "gtk+ glib-2.0 dbus libxml2 popt"
+DEPENDS = "gtk+ glib-2.0 dbus-glib libxml2 popt"
 DESCRIPTION = "Settings daemon using DBUS for communication."
 LICENSE = "GPL"
 MAINTAINER = "Florian Boor <florian at kernelconcepts.de>"