summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2018-04-10 20:38:33 +0200
committerJohannes Huber <johu@gentoo.org>2018-04-10 20:41:14 +0200
commit2e7baea700bac009a9cc0887c0fd596473517604 (patch)
tree09c136f733304ad6c169a9aec5b002605d073803
parenta9cbd643165f08070a0fe026a3ff88f6cd55d5c6 (diff)
downloadkde-2e7baea700bac009a9cc0887c0fd596473517604.tar.gz
kde-2e7baea700bac009a9cc0887c0fd596473517604.tar.bz2
kde-2e7baea700bac009a9cc0887c0fd596473517604.zip
kde-misc/kdeconnect: Fix build w/o wayland/handbook
Reported-by: email200202@yahoo.com Thanks-to: Andreas Sturmlechner <asturm@gentoo.org> Bug: https://bugs.gentoo.org/652888 Package-Manager: Portage-2.3.28, Repoman-2.3.9
-rw-r--r--kde-misc/kdeconnect/files/kdeconnect-1.3.1-no-wayland.patch11
-rw-r--r--kde-misc/kdeconnect/kdeconnect-9999.ebuild8
2 files changed, 16 insertions, 3 deletions
diff --git a/kde-misc/kdeconnect/files/kdeconnect-1.3.1-no-wayland.patch b/kde-misc/kdeconnect/files/kdeconnect-1.3.1-no-wayland.patch
new file mode 100644
index 00000000000..7b34659502e
--- /dev/null
+++ b/kde-misc/kdeconnect/files/kdeconnect-1.3.1-no-wayland.patch
@@ -0,0 +1,11 @@
+diff --git a/plugins/mousepad/CMakeLists.txt b/plugins/mousepad/CMakeLists.txt
+index 7f14139e..a1daaa16 100644
+--- a/plugins/mousepad/CMakeLists.txt
++++ b/plugins/mousepad/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ if(UNIX)
+- find_package(KF5 ${KF5_MIN_VERSION} QUIET COMPONENTS Wayland)
++ find_package(KF5Wayland ${KF5_MIN_VERSION} QUIET)
+
+ find_package(LibFakeKey QUIET)
+ set_package_properties(LibFakeKey PROPERTIES DESCRIPTION "fake key events"
diff --git a/kde-misc/kdeconnect/kdeconnect-9999.ebuild b/kde-misc/kdeconnect/kdeconnect-9999.ebuild
index bfb57f864ed..fb8b9ec9470 100644
--- a/kde-misc/kdeconnect/kdeconnect-9999.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-KDE_HANDBOOK="optional"
+KDE_HANDBOOK="forceoptional"
KDE_TEST="true"
KMNAME="${PN}-kde"
KDE_SELINUX_MODULE="${PN}"
@@ -54,12 +54,14 @@ RDEPEND="${DEPEND}
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${PN}-1.3.1-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() {