kde-misc/kdeconnect: Fix build w/o wayland/handbook

Reported-by: [email protected] Thanks-to: Andreas Sturmlechner <[email protected]> Closes: https://bugs.gentoo.org/652888 Package-Manager: Portage-2.3.28, Repoman-2.3.9
hanetzer · Apr 10, 2018 · 403144c · 403144c
1 parent 109aa13
commit 403144c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
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
@@ -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})
diff --git a/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild b/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild
@@ -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() {