diff --git a/recipes-kf5/tier1/kidletime.inc b/recipes-kf5/tier1/kidletime.inc index 9881707..7dd9b33 100644 --- a/recipes-kf5/tier1/kidletime.inc +++ b/recipes-kf5/tier1/kidletime.inc @@ -5,9 +5,15 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \ " PR = "r0" -DEPENDS = "qtbase qtx11extras" +DEPENDS = " \ + qtbase \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)} \ +" -SRC_URI = "git://anongit.kde.org/kidletime" +SRC_URI = " \ + git://anongit.kde.org/kidletime \ + file://0001-no-x11.patch \ +" S = "${WORKDIR}/git" inherit cmake_kf5 diff --git a/recipes-kf5/tier1/kidletime/0001-no-x11.patch b/recipes-kf5/tier1/kidletime/0001-no-x11.patch new file mode 100644 index 0000000..baf592c --- /dev/null +++ b/recipes-kf5/tier1/kidletime/0001-no-x11.patch @@ -0,0 +1,33 @@ +commit 8dbea8f26466f605961b66e8c3ae2da5f88a50a9 +Author: Volker Krause +Date: Sat Aug 5 18:35:10 2017 +0200 + + Only require Qt5X11Extras when we actually need it + + Reviewers: #frameworks + + Tags: #frameworks + + Differential Revision: https://phabricator.kde.org/D7154 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111d73..e3c89d8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -33,7 +33,7 @@ set(REQUIRED_QT_VERSION 5.6.0) + find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Widgets) + + if(NOT WIN32 AND NOT APPLE) +- find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras DBus) ++ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED DBus) + endif() + + if(APPLE) +@@ -46,6 +46,7 @@ if(NOT APPLE) + endif() + + if(X11_FOUND) ++ find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED X11Extras) + find_package(XCB COMPONENTS XCB SYNC) + find_package(X11_XCB) + set(HAVE_X11 TRUE)