kde-plasma: let all recipes depend on kwayland unconditionally

* instead of following several warnings, add DEPENDS globally
* kwayland builds fine without wayland in DISTRO_FEATURE

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>

classes/kde-plasma.bbclass

@@ -3,3 +3,7 @@ inherit kde-base
 PLASMA_VERSION = "5.7.3"
 
 SRC_URI = "${KDE_MIRROR}/stable/plasma/${PV}/${BPN}-${PV}.tar.xz"
+
+DEPENDS += " \
+    kwayland \
+"

recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb

@@ -35,7 +35,6 @@ DEPENDS += " \
     libksysguard \
     libkscreen \
     libdbusmenu-qt5 \
-    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver libsm libxcb kwin", "", d)} \
     zlib \
 "

recipes-kde/plasma/untier/breeze/breeze.bb

@@ -19,7 +19,6 @@ DEPENDS += " \
     kdecoration \
     frameworkintegration \
     kcmutils \
-    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "",d)} \
 "
 

recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb

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

recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb

@@ -18,7 +18,6 @@ DEPENDS += " \
     kglobalaccel \
     libxcb \
     qtx11extras \
-    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
 "
 
 PV = "${PLASMA_VERSION}"

recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb

@@ -10,7 +10,6 @@ inherit kde-plasma
 DEPENDS += " \
     kidletime \
     kwindowsystem \
-    kwayland \
 "
 
 PV = "${PLASMA_VERSION}"

recipes-kde/plasma/untier/libkscreen/files/0001-make-kwayland-support-optional.patch

@@ -1,48 +0,0 @@
-From c8f9d29e0f63e2973ee1ad2c4b0696e0a2d13882 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
-Date: Fri, 25 Mar 2016 15:44:08 +0100
-Subject: [PATCH] make kwayland support optional
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
----
- CMakeLists.txt          | 2 +-
- backends/CMakeLists.txt | 5 +++++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 711f9da..891a4b8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -20,7 +20,7 @@ set(REQUIRED_QT_VERSION 5.2.0)
- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Gui Test X11Extras)
- 
- # Wayland backend
--find_package(KF5Wayland CONFIG REQUIRED)
-+find_package(KF5Wayland CONFIG QUIET)
- add_feature_info("KF5Wayland" KF5Wayland_FOUND "Required for building libkscreen's KWayland backend")
- 
- # xrandr backend
-diff --git a/backends/CMakeLists.txt b/backends/CMakeLists.txt
-index 3563e13..195aaa9 100644
---- a/backends/CMakeLists.txt
-+++ b/backends/CMakeLists.txt
-@@ -1,6 +1,11 @@
- add_subdirectory(fake)
- add_subdirectory(qscreen)
-+
-+if(${KF5Wayland_FOUND})
- add_subdirectory(kwayland)
-+else()
-+    message(STATUS "Not building kwayland backend, no KF5Wayland_FOUND set.")
-+endif()
- 
- if(${XCB_RANDR_FOUND})
-     message(STATUS "Will build xrandr backend.")
--- 
-2.5.0
-

recipes-kde/plasma/untier/libkscreen/libkscreen.bb

@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = " \
 inherit kde-plasma
 
 DEPENDS += " \
-    kwayland \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
 "
 
@@ -17,9 +16,8 @@ SRC_URI[md5sum] = "f40f3015e4c0cbadba893ea9aec37ec2"
 SRC_URI[sha256sum] = "b1c7003126c3b83ababe031a003a038e714c9d7db07b8769ecd52c271686bffe"
 
 SRC_URI += " \
-    file://0001-make-kwayland-support-optional.patch \
-    file://0002-fix-configuration-build-on-x-less-systems.patch \
-    file://0003-avoid-autotests.patch \
+    file://0001-fix-configuration-build-on-x-less-systems.patch \
+    file://0002-avoid-autotests.patch \
 "
 
 

recipes-kde/plasma/untier/oxygen/oxygen.bb

@@ -17,7 +17,6 @@ DEPENDS += " \
     frameworkintegration \
     kwindowsystem \
     kdecoration \
-    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libxcb qtx11extras", "", d)} \
 "
 

recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb

@@ -15,7 +15,6 @@ DEPENDS += " \
     kio \
     knotifications \
     kwidgetsaddons \
-    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
 "
 
 PV = "${PLASMA_VERSION}"