summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-06-16 16:34:33 +0000
committerRoss Burton <ross@openedhand.com>2008-06-16 16:34:33 +0000
commitafe20e409112a244212c2820c8bb2960085c9c25 (patch)
tree43a271ed93bce7d213202dab122062f4c5e5ac36
parent51948abc945bc7a6b7f7211398783d1bc1ce0e56 (diff)
downloadpoky-afe20e409112a244212c2820c8bb2960085c9c25.tar.gz
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
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc2
-rw-r--r--meta/packages/settings-daemon/settings-daemon_svn.bb4
2 files changed, 2 insertions, 4 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index 99d317442f..dd38b727ea 100644
--- 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}"
68SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}" 68SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
69SRCREV_pn-qemu ?= "${QEMUSRCREV}" 69SRCREV_pn-qemu ?= "${QEMUSRCREV}"
70SRCREV_pn-screenshot ?= "288" 70SRCREV_pn-screenshot ?= "288"
71SRCREV_pn-settings-daemon ?= "1825" 71SRCREV_pn-settings-daemon ?= "2059"
72SRCREV_pn-vincent ?= "246" 72SRCREV_pn-vincent ?= "246"
73SRCREV_pn-webkit-gtk ?= "31859" 73SRCREV_pn-webkit-gtk ?= "31859"
74SRCREV_pn-web-webkit ?= "107" 74SRCREV_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 eaffbfebb4..fd9f856770 100644
--- a/meta/packages/settings-daemon/settings-daemon_svn.bb
+++ b/meta/packages/settings-daemon/settings-daemon_svn.bb
@@ -1,7 +1,6 @@
1DESCRIPTION = "Settings-daemon provides a bridge between gconf and xsettings" 1DESCRIPTION = "Settings-daemon provides a bridge between gconf and xsettings"
2LICENSE = "GPL" 2LICENSE = "GPL"
3DEPENDS = "gconf glib-2.0 gtk+" 3DEPENDS = "gconf glib-2.0 gtk+"
4RDEPENDS = "xrdb"
5SECTION = "x11" 4SECTION = "x11"
6PV = "0.0+svnr${SRCREV}" 5PV = "0.0+svnr${SRCREV}"
7 6
@@ -12,7 +11,7 @@ SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
12 11
13S = "${WORKDIR}/${PN}" 12S = "${WORKDIR}/${PN}"
14 13
15inherit autotools pkgconfig gettext gconf 14inherit autotools pkgconfig gconf
16 15
17FILES_${PN} = "${bindir}/* ${sysconfdir}" 16FILES_${PN} = "${bindir}/* ${sysconfdir}"
18 17
@@ -20,4 +19,3 @@ do_install_append () {
20 install -d ${D}/${sysconfdir}/X11/Xsession.d 19 install -d ${D}/${sysconfdir}/X11/Xsession.d
21 install -m 755 ${WORKDIR}/70settings-daemon ${D}/${sysconfdir}/X11/Xsession.d/ 20 install -m 755 ${WORKDIR}/70settings-daemon ${D}/${sysconfdir}/X11/Xsession.d/
22} 21}
23