From cfbdfd6b1da4325de3b0cf195d6f860621ee3c13 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Sat, 27 Apr 2013 18:34:00 +0000 Subject: xfce4-session: remove unconditional consolekit RDEPENDS and use PACKAGECONFIG MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- meta-xfce/recipes-xfce/xfce4-session/xfce4-session_4.10.0.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'meta-xfce') 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 8de95ee02b..bbe92e8cb5 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 \ -- cgit 1.2.3-korg