From 2018227e9344edb9da15fc6a4a8298086cc2aa77 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 2 Jun 2019 21:45:28 +0100
Subject: gentoo resync : 02.06.2019

---
 kde-misc/wacomtablet/Manifest                      |  3 ++-
 .../wacomtablet/files/wacomtablet-3.1.1-gcc9.patch | 29 ++++++++++++++++++++++
 kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild      |  5 +++-
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch

(limited to 'kde-misc/wacomtablet')

diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index 5d668c17481c..529b9f4c1eea 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1,4 +1,5 @@
+AUX wacomtablet-3.1.1-gcc9.patch 1196 BLAKE2B 2e8b7d2f3808b09caa1ed733a6d0876172324809ecc0567a8fffbf962bdcd03fee8399fdc5fbb1b5196530538c04513965ec2df0540c58eb8fd5ecd577ad6409 SHA512 600725f86e5b4eaa654731c14c4c7c4d4d5c8980634faadd5697a866667ca27356213d25c07918fee70ee056cd7d890d612e80c6bd7c0f4e4058be39dddba263
 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 1324 BLAKE2B ad8cf2da6207cd093e0b740a61106c3b00782721a30a71dc8622dadb6d54e29f5fc528aa82406a2669936929a96e4983df9d762a5441df4aecdcfc405c4e6e72 SHA512 0dde63f12d9beef44947ca1639e2722fd806afbe1539f7b8a5d8aaf0e033325cdad88821c9b8ca3cf98f8906225460b40b53424e3b429e9c083d231468658c41
+EBUILD wacomtablet-3.1.1.ebuild 1369 BLAKE2B 7e255af0154d8bac2d38b6607b00527f009ca126373b9d8a69c6153cc4e52f73b53d472efd47347ae5d10c97dadc6db556b7da0753fb6f7bfc3be628168fc95a SHA512 0b9d7e39aa3f827e457cec0eb2e8f4634e5490579c844dbc924e1246ae6d6efc44aa8950f33347917a9c80a68b6609140ca817330c25d6e3779075067940c083
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch b/kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch
new file mode 100644
index 000000000000..6b0cc5dec637
--- /dev/null
+++ b/kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch
@@ -0,0 +1,29 @@
+From 810487c4fa240f6de598b04929bb08de8937feb5 Mon Sep 17 00:00:00 2001
+From: Valerii Malov <jazzvoid@gmail.com>
+Date: Sun, 28 Apr 2019 19:10:43 +0300
+Subject: (Supposedly) fix building with gcc9
+
+I don't really have access to gcc9 right now to test, but this should
+fix "static assertion failed: unique_ptr's deleter must be invocable
+with a pointer"
+
+CCBUG: 407015
+---
+ src/common/libwacomwrapper.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/libwacomwrapper.cpp b/src/common/libwacomwrapper.cpp
+index 1d11fc3..92a559a 100644
+--- a/src/common/libwacomwrapper.cpp
++++ b/src/common/libwacomwrapper.cpp
+@@ -60,7 +60,7 @@ libWacomWrapper::~libWacomWrapper()
+ bool libWacomWrapper::lookupTabletInfo(int tabletId, int vendorId, TabletInformation &tabletInfo)
+ {
+     qCDebug(COMMON) << "LibWacom lookup for" << tabletId << vendorId;
+-    auto errorDeleter = [](WacomError *&e){libwacom_error_free(&e);};
++    auto errorDeleter = [](WacomError *e){libwacom_error_free(&e);};
+     std::unique_ptr<WacomError, decltype(errorDeleter)>
+             error(libwacom_error_new(), errorDeleter);
+     std::unique_ptr<WacomDevice, decltype(&libwacom_destroy)>
+-- 
+cgit v1.1
diff --git a/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild b/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
index 733552086e0d..382e2fbe52a7 100644
--- a/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
+++ b/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
@@ -45,7 +45,10 @@ RDEPEND="${CDEPEND}
 	!kde-misc/wacomtablet:4
 "
 
-PATCHES=( "${FILESDIR}/${P}-xlib-optional.patch" ) # bug 681674
+PATCHES=(
+	"${FILESDIR}/${P}-xlib-optional.patch" # bug 681674
+	"${FILESDIR}/${P}-gcc9.patch" # bug 686822
+)
 
 src_test() {
 	# test needs DBus, bug 675548
-- 
cgit v1.2.3