[gentoo-commits] repo/gentoo:master commit in: kde-misc/wacomtablet/files/, kde-misc/wacomtablet/

[Andreas Sturmlechner]

commit:     b578daaf6deb59291ed8aeef60a069c184a6ba83
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 27 18:12:26 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 27 18:35:13 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b578daaf

kde-misc/wacomtablet: Fix build with gcc-9

Reported-by: Chris Smith <chris <AT> realcomputerguy.com>
Closes: https://bugs.gentoo.org/686822
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../wacomtablet/files/wacomtablet-3.1.1-gcc9.patch | 29 ++++++++++++++++++++++
 kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild      |  5 +++-
 2 files changed, 33 insertions(+), 1 deletion(-)

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 00000000000..6b0cc5dec63
--- /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@×××××.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 733552086e0..382e2fbe52a 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