summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb7
2 files changed, 4 insertions, 5 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index beeceda31..029d4dac6 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -94,7 +94,7 @@ SRCREV_pn-matchbox-desktop ?= "1902"
SRCREV_pn-matchbox-keyboard ?= "1910"
SRCREV_pn-matchbox-panel ?= "1364"
SRCDATE_matchbox-panel-manager ?= "20060612"
-SRCREV_pn-matchbox-panel-2 ?= "1911"
+SRCREV_pn-matchbox-panel-2 ?= "1930"
SRCREV_pn-matchbox-stroke ?= "1524"
SRCREV_pn-matchbox-themes-extra ?= "1524"
SRCREV_pn-matchbox-terminal ?= "1612"
diff --git a/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb b/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb
index 97e5980ff..03504143d 100644
--- a/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb
+++ b/meta/packages/matchbox-panel-2/matchbox-panel-2_svn.bb
@@ -1,8 +1,8 @@
LICENSE = "GPLv2"
PRIORITY = "optional"
-DEPENDS = "gtk+ startup-notification apmd"
+DEPENDS = "gtk+ startup-notification apmd dbus"
PV = "0.0+svnr${SRCREV}"
-PR = "r2"
+PR = "r3"
RPROVIDES_${PN} = "matchbox-panel"
RREPLACES_${PN} = "matchbox-panel"
@@ -10,12 +10,11 @@ RCONFLICTS_${PN} = "matchbox-panel"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
-EXTRA_OECONF = "--enable-startup-notification --disable-libnotify"
+EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
S = "${WORKDIR}/${PN}"
FILES_${PN} += "${libdir}/matchbox-panel/*.so \
- ${datadir}/matchbox-panel/battery/*.png \
${datadir}/matchbox-panel/brightness/*.png \
${datadir}/matchbox-panel/startup/*.png "
FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug"