kde-misc/kdeconnect: Fix build w/o wayland/handbook
authorJohannes Huber <johu@gentoo.org>
Tue, 10 Apr 2018 18:43:21 +0000 (20:43 +0200)
committerJohannes Huber <johu@gentoo.org>
Tue, 10 Apr 2018 18:43:33 +0000 (20:43 +0200)
Reported-by: email200202@yahoo.com
Thanks-to: Andreas Sturmlechner <asturm@gentoo.org>
Closes: https://bugs.gentoo.org/652888
Package-Manager: Portage-2.3.28, Repoman-2.3.9

kde-misc/kdeconnect/files/kdeconnect-1.3.0-no-wayland.patch [new file with mode: 0644]
kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild

diff --git a/kde-misc/kdeconnect/files/kdeconnect-1.3.0-no-wayland.patch b/kde-misc/kdeconnect/files/kdeconnect-1.3.0-no-wayland.patch
new file mode 100644 (file)
index 0000000..a46c284
--- /dev/null
@@ -0,0 +1,13 @@
+diff --git a/plugins/mousepad/CMakeLists.txt b/plugins/mousepad/CMakeLists.txt
+index ab9913ff..bfd52cd7 100644
+--- a/plugins/mousepad/CMakeLists.txt
++++ b/plugins/mousepad/CMakeLists.txt
+@@ -10,7 +10,7 @@ if (LibFakeKey_FOUND)
+     find_package(X11 REQUIRED)
+     find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras)
+ endif()
+-find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Wayland)
++find_package(KF5Wayland ${KF5_MIN_VERSION} QUIET)
+ set(HAVE_X11 ${LibFakeKey_FOUND})
+ set(HAVE_WAYLAND ${KF5Wayland_FOUND})
index 824a32a6085e8df873be2f59ab6e8b53e6b10a6a..b826ef6e3ba187639f3d9b35dd4b6c61526167ee 100644 (file)
@@ -4,7 +4,7 @@
 EAPI=6
 
 FRAMEWORKS_MINIMAL="5.42.0"
-KDE_HANDBOOK="optional"
+KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 KMNAME="${PN}-kde"
 KDE_SELINUX_MODULE="${PN}"
@@ -55,12 +55,14 @@ RDEPEND="${DEPEND}
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-no-wayland.patch" )
+
 src_prepare() {
+       kde5_src_prepare
+
        sed \
                -e 's#${LIBEXEC_INSTALL_DIR}#@KDE_INSTALL_FULL_LIBEXECDIR@#' \
                -i daemon/kdeconnectd.desktop.cmake || die
-
-       kde5_src_prepare
 }
 
 src_configure() {