gconf-dbus: don't start in the X session, gconf can be autostarted

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3584 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 2 insertions, 11 deletions

diff --git a/meta/packages/gnome/gconf-dbus/69gconfd-dbus b/meta/packages/gnome/gconf-dbus/69gconfd-dbus
deleted file mode 100755
index c2add042f6..0000000000
--- a/meta/packages/gnome/gconf-dbus/69gconfd-dbus
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/libexec/gconfd-2 &
diff --git a/meta/packages/gnome/gconf-dbus_svn.bb b/meta/packages/gnome/gconf-dbus_svn.bb
index cc69079c3a..0159aaa573 100644
--- a/meta/packages/gnome/gconf-dbus_svn.bb
+++ b/meta/packages/gnome/gconf-dbus_svn.bb
@@ -9,8 +9,7 @@ RPROVIDES_${PN}-dev = "gconf-dev"
 PV = "2.16.0+svnr${SRCREV}"
 PR = "r4"
 
-SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
-           file://69gconfd-dbus"
+SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http"
 
 inherit pkgconfig autotools 
 S = "${WORKDIR}/trunk"
@@ -20,7 +19,7 @@ PARALLEL_MAKE = ""
 FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
 FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
 
-EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
+EXTRA_OECONF = "--disable-gtk-doc --disable-gtk --enable-shared --disable-static --enable-debug=yes"
 
 
 do_configure_prepend() {
@@ -31,8 +30,3 @@ do_stage() {
         autotools_stage_all
         install -m 0644 gconf-2.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/
-}