[oe-commits] Andreas Müller : xfce4-session: remove unconditional consolekit RDEPENDS and use PACKAGECONFIG

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: cfbdfd6b1da4325de3b0cf195d6f860621ee3c13
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=cfbdfd6b1da4325de3b0cf195d6f860621ee3c13

Author: Andreas Müller <schnitzeltony at googlemail.com>
Date:   Sat Apr 27 18:34:00 2013 +0000

xfce4-session: remove unconditional consolekit RDEPENDS and use PACKAGECONFIG

Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../xfce4-session/xfce4-session_4.10.0.bb          |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
index 8de95ee..bbe92e8 100644
--- a/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
+++ b/meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb
@@ -3,9 +3,8 @@ SECTION = "x11"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=9ac2e7cff1ddaf48b6eab6028f23ef88"
 DEPENDS = "virtual/libx11 libsm libxfce4util libxfce4ui gtk+ libwnck dbus dbus-glib xfconf"
-DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
-RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth consolekit upower"
-PR = "r6"
+RDEPENDS_${PN} = "netbase xinit dbus-x11 iceauth upower"
+PR = "r7"
 
 inherit xfce update-alternatives
 
@@ -25,6 +24,10 @@ pkg_postinst_${PN} () {
     echo 127.0.0.1    ${MACHINE} >> /etc/hosts
 }
 
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"
+PACKAGECONFIG[systemd] = "--enable-systemd, --disable-systemd, polkit, systemd"
+PACKAGECONFIG[consolekit] = ",,,consolekit"
+
 FILES_${PN} += "${libdir}/xfce4/*/*/*.so \
                 ${libdir}/xfce4/session/*-*-* \
                 ${datadir}/xsessions \