settings-daemon: drop the use of xrdb as its old school

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

diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 99d317442f389ab5949567ba800385192d2760d3..dd38b727eaaa5703aa76eee53c8d199a7c211d38 100644 (file)
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -68,7 +68,7 @@ SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu ?= "${QEMUSRCREV}"
 SRCREV_pn-screenshot ?= "288"
-SRCREV_pn-settings-daemon ?= "1825"
+SRCREV_pn-settings-daemon ?= "2059"
 SRCREV_pn-vincent ?= "246"
 SRCREV_pn-webkit-gtk ?= "31859"
 SRCREV_pn-web-webkit ?= "107"

diff --git a/meta/packages/settings-daemon/settings-daemon_svn.bb b/meta/packages/settings-daemon/settings-daemon_svn.bb
index eaffbfebb466be076081361478103de31a561325..fd9f856770df193fa99dec4e948c657bdb099174 100644 (file)
--- a/meta/packages/settings-daemon/settings-daemon_svn.bb
+++ b/meta/packages/settings-daemon/settings-daemon_svn.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Settings-daemon provides a bridge between gconf and xsettings"
 LICENSE = "GPL"
 DEPENDS = "gconf glib-2.0 gtk+"
-RDEPENDS = "xrdb"
 SECTION = "x11"
 PV = "0.0+svnr${SRCREV}"
 
@@ -12,7 +11,7 @@ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
 
 S = "${WORKDIR}/${PN}"
 
-inherit autotools pkgconfig gettext gconf
+inherit autotools pkgconfig gconf
 
 FILES_${PN} =  "${bindir}/* ${sysconfdir}"
 
@@ -20,4 +19,3 @@ do_install_append () {
        install -d ${D}/${sysconfdir}/X11/Xsession.d
        install -m 755 ${WORKDIR}/70settings-daemon ${D}/${sysconfdir}/X11/Xsession.d/
 }
-