khotkeys: exclude from X11-less build

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2015-02-05 20:26:57 +01:00
parent 5933d2a7c8
commit 0c4d7d63a8
3 changed files with 8 additions and 3 deletions
--- a/recipes-kde/packagegroups/kde-world.bb
+++ b/recipes-kde/packagegroups/kde-world.bb
@@ -77,7 +77,6 @@ RDEPENDS_${PN} = "         \
    kdeplasma-addons \
    khtml \
    khelpcenter \
-    khotkeys \
    kinfocenter \
    kio-extras \
    kmenuedit \
@@ -90,7 +89,7 @@ RDEPENDS_${PN} = "         \
    muon \
    \
    kwayland \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "kwin", "",d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "kwin khotkeys", "",d)} \
 "


--- a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
+++ b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
@@ -5,6 +5,8 @@ LIC_FILES_CHKSUM = " \
    file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \
 "

+REQUIRED_DISTRO_FEATURES = "x11"
+
 inherit kde-plasma

 DEPENDS += " \
--- a/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb
+++ b/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb
@@ -15,7 +15,11 @@ DEPENDS += " \
    kio \
    sonnet \
    kdelibs4support \
-    khotkeys \
+"
+
+# REVISIT optionals
+DEPENDS += " \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "khotkeys", "",d)} \
 "

 PV = "${PLASMA_VERSION}"