From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 738911382C5 for ; Tue, 10 Apr 2018 18:43:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 98F64E0A5B; Tue, 10 Apr 2018 18:43:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 74E7AE0A5B for ; Tue, 10 Apr 2018 18:43:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7B659335C5C for ; Tue, 10 Apr 2018 18:43:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 04FCC27C for ; Tue, 10 Apr 2018 18:43:43 +0000 (UTC) From: "Johannes Huber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" Message-ID: <1523385813.403144c366b8149bf3f3dfbc3919adcbf44ae56a.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/kdeconnect/, kde-misc/kdeconnect/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-misc/kdeconnect/files/kdeconnect-1.3.0-no-wayland.patch kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild X-VCS-Directories: kde-misc/kdeconnect/ kde-misc/kdeconnect/files/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: 403144c366b8149bf3f3dfbc3919adcbf44ae56a X-VCS-Branch: master Date: Tue, 10 Apr 2018 18:43:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d765247e-d847-4f1b-8990-c60ae3c1e4e7 X-Archives-Hash: 9872ce0476e566d43e90eb319476d34e commit: 403144c366b8149bf3f3dfbc3919adcbf44ae56a Author: Johannes Huber gentoo org> AuthorDate: Tue Apr 10 18:43:21 2018 +0000 Commit: Johannes Huber gentoo org> CommitDate: Tue Apr 10 18:43:33 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=403144c3 kde-misc/kdeconnect: Fix build w/o wayland/handbook Reported-by: email200202 yahoo.com Thanks-to: Andreas Sturmlechner 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 | 13 +++++++++++++ kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild | 8 +++++--- 2 files changed, 18 insertions(+), 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 new file mode 100644 index 00000000000..a46c284a017 --- /dev/null +++ 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 index 824a32a6085..b826ef6e3ba 100644 --- 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() {