summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-03-24 18:48:40 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2019-03-24 18:49:17 +0100
commitcfa45f40b5292dfc7b4d22220ec9a26e1145ff4a (patch)
treee55ada120ab0f6de6f77ad8f9946ed9f364c1c61 /kde-misc
parentx11-themes/kvantum: Version bump, tidy old (diff)
downloadgentoo-cfa45f40b5292dfc7b4d22220ec9a26e1145ff4a.tar.gz
gentoo-cfa45f40b5292dfc7b4d22220ec9a26e1145ff4a.tar.bz2
gentoo-cfa45f40b5292dfc7b4d22220ec9a26e1145ff4a.zip
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 <asturm@gentoo.org>
Diffstat (limited to 'kde-misc')
-rw-r--r--kde-misc/wacomtablet/files/wacomtablet-3.1.1-xlib-optional.patch19
-rw-r--r--kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild3
2 files changed, 21 insertions, 1 deletions
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=(