recipes-kde: make kwayland dependency conditional to wayland DISTRO_FEATURES

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
2016-08-07 13:12:35 +02:00
parent 76fa8fa0ec
commit 8c68b69bed
8 changed files with 8 additions and 9 deletions
--- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
+++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
@@ -34,8 +34,8 @@ DEPENDS += " \
    networkmanager-qt \
    libksysguard \
    libkscreen \
-    kwayland \
    libdbusmenu-qt5 \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver libsm libxcb kwin", "", d)} \
    zlib \
 "
--- a/recipes-kde/plasma/untier/breeze/breeze.bb
+++ b/recipes-kde/plasma/untier/breeze/breeze.bb
@@ -19,6 +19,7 @@ DEPENDS += " \
    kdecoration \
    frameworkintegration \
    kcmutils \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "",d)} \
 "

--- a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
+++ b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
@@ -29,7 +29,7 @@ DEPENDS += " \

 # REVISIT optionals
 DEPENDS += " \
-    kwayland \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \
 "

--- a/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb
+++ b/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb
@@ -18,8 +18,7 @@ DEPENDS += " \
    kglobalaccel \
    libxcb \
    qtx11extras \
-    kwayland \
-    wayland \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
 "

 PV = "${PLASMA_VERSION}"
--- a/recipes-kde/plasma/untier/kwin/kwin.bb
+++ b/recipes-kde/plasma/untier/kwin/kwin.bb
@@ -34,7 +34,6 @@ DEPENDS += " \
    knewstuff \
    kxmlgui \
    kdecoration \
-	kwayland \
    kscreenlocker \
 "

--- a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
+++ b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
@@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 "

-DEPENDS += "kwayland"
-
 inherit kde-plasma cmake-lib

 DEPENDS += " \
-	${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
 "

 PV = "${PLASMA_VERSION}"
--- a/recipes-kde/plasma/untier/oxygen/oxygen.bb
+++ b/recipes-kde/plasma/untier/oxygen/oxygen.bb
@@ -17,6 +17,7 @@ DEPENDS += " \
    frameworkintegration \
    kwindowsystem \
    kdecoration \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libxcb qtx11extras", "", d)} \
 "

--- a/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb
+++ b/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb
@@ -15,7 +15,7 @@ DEPENDS += " \
    kio \
    knotifications \
    kwidgetsaddons \
-    kwayland \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
 "

 PV = "${PLASMA_VERSION}"