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 B6A86138334 for ; Sun, 24 Mar 2019 17:49:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1B81E09C2; Sun, 24 Mar 2019 17:49:44 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B6DF2E09C2 for ; Sun, 24 Mar 2019 17:49:44 +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 6393F335C86 for ; Sun, 24 Mar 2019 17:49:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D0F844B for ; Sun, 24 Mar 2019 17:49:41 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1553449757.cfa45f40b5292dfc7b4d22220ec9a26e1145ff4a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-misc/wacomtablet/files/, kde-misc/wacomtablet/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-misc/wacomtablet/files/wacomtablet-3.1.1-xlib-optional.patch kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild X-VCS-Directories: kde-misc/wacomtablet/files/ kde-misc/wacomtablet/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: cfa45f40b5292dfc7b4d22220ec9a26e1145ff4a X-VCS-Branch: master Date: Sun, 24 Mar 2019 17:49:41 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3b1daa66-b900-48bc-a9c7-550ba4acfd68 X-Archives-Hash: 74b03cde39458ff8190307fbae50637f commit: cfa45f40b5292dfc7b4d22220ec9a26e1145ff4a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 24 17:48:40 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Mar 24 17:49:17 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfa45f40 kde-misc/wacomtablet: Fix build without XLIB Closes: https://bugs.gentoo.org/681674 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/wacomtablet-3.1.1-xlib-optional.patch | 19 +++++++++++++++++++ kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild | 3 ++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-xlib-optional.patch b/kde-misc/wacomtablet/files/wacomtablet-3.1.1-xlib-optional.patch new file mode 100644 index 00000000000..ae40d90a64b --- /dev/null +++ b/kde-misc/wacomtablet/files/wacomtablet-3.1.1-xlib-optional.patch @@ -0,0 +1,19 @@ +--- a/CMakeLists.txt 2019-03-24 18:34:44.642298259 +0100 ++++ b/CMakeLists.txt 2019-03-24 18:38:45.593440974 +0100 +@@ -24,7 +24,7 @@ + find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets DBus X11Extras Qml) + find_package(KF5 REQUIRED COMPONENTS CoreAddons I18n GlobalAccel Config XmlGui WidgetsAddons WindowSystem Notifications DBusAddons Plasma DocTools) + find_package(XCB OPTIONAL_COMPONENTS XINPUT) +-find_package(X11 REQUIRED COMPONENTS XLIB) ++find_package(X11 REQUIRED) + find_package(XorgWacom REQUIRED) + find_package(LibWacom REQUIRED) + +@@ -41,6 +41,7 @@ + set(USING_X_LIBRARIES XCB::XINPUT ${X11_Xinput_LIB}) + add_definitions(-DHAVE_XCB_XINPUT) + else() ++ find_package(X11 REQUIRED COMPONENTS XLIB) + message(STATUS "Falling back to X11_XINPUT.") + set(USING_X_LIBRARIES ${X11_LIBRARIES} ${X11_Xinput_LIB}) + endif() diff --git a/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild b/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild index 296d3c16027..733552086e0 100644 --- a/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild +++ b/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild @@ -40,12 +40,13 @@ CDEPEND=" DEPEND="${CDEPEND} sys-devel/gettext x11-base/xorg-proto - x11-libs/libX11 " RDEPEND="${CDEPEND} !kde-misc/wacomtablet:4 " +PATCHES=( "${FILESDIR}/${P}-xlib-optional.patch" ) # bug 681674 + src_test() { # test needs DBus, bug 675548 local myctestargs=(