From dc7cbdfa65fd814b3b9aa3c56257da201109e807 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Apr 2019 21:17:31 +0100 Subject: gentoo resync : 05.04.2019 --- kde-misc/wacomtablet/Manifest | 3 ++- .../files/wacomtablet-3.1.1-xlib-optional.patch | 19 +++++++++++++++++++ kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild | 3 ++- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 kde-misc/wacomtablet/files/wacomtablet-3.1.1-xlib-optional.patch (limited to 'kde-misc/wacomtablet') diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest index 36b6be83d0a1..5d668c17481c 100644 --- a/kde-misc/wacomtablet/Manifest +++ b/kde-misc/wacomtablet/Manifest @@ -1,3 +1,4 @@ +AUX wacomtablet-3.1.1-xlib-optional.patch 838 BLAKE2B 997d42737c593c5074b6541ca91a1976afc36c7f43041ecd90a32d309c856a9b9b7fb203b135cf997a9a944e9a47febefdc196b36fde94975677ba16b2f17be4 SHA512 b7b8e3c1a2ad97788d6a1bbebc3183b4b1e13ab6295bfc716d5e083a0a317fcd6ba75b49051706c9d776a028a40d3f7cc8edec9b1186b67cdd727ef3e2019990 DIST wacomtablet-3.1.1.tar.xz 724176 BLAKE2B 062f05067b9ca423527f1fbbc498d3228fba9333f96e918493a00c3ceb669a23c3ab9297bf6c2d3d161559f1d9cf6ccff8f502971718e71a360f3db2e7d9bd67 SHA512 91f8ab9326b8307d63e09c7d75d613553f16c6cb93837cc404cb251aeda93078011b0c5aa0fc20ca4613d82421d73804cc55fa71a688bf4dd0f1d616733ade97 -EBUILD wacomtablet-3.1.1.ebuild 1276 BLAKE2B 18ff83bbc4cc3fd8bb8b8c9debe44670a05c8933fe1deac788f1987631bd2f6af033d926e6928636840f40f3b727b2c3ebd738b1959c3536fe51413af3d173ab SHA512 3c69db91261f68739aaf79a23ed985dabc19fba8a3b2aee757dd50bf335d98e792ed0c4645b67519bece7b7869c3cc982adcdfcedf0a6ebdefdc5c0d25cbda51 +EBUILD wacomtablet-3.1.1.ebuild 1324 BLAKE2B ad8cf2da6207cd093e0b740a61106c3b00782721a30a71dc8622dadb6d54e29f5fc528aa82406a2669936929a96e4983df9d762a5441df4aecdcfc405c4e6e72 SHA512 0dde63f12d9beef44947ca1639e2722fd806afbe1539f7b8a5d8aaf0e033325cdad88821c9b8ca3cf98f8906225460b40b53424e3b429e9c083d231468658c41 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 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 000000000000..ae40d90a64b0 --- /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 296d3c160272..733552086e0d 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=( -- cgit v1.2.3