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 3250A138334 for ; Mon, 27 May 2019 18:35:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5873BE0843; Mon, 27 May 2019 18:35:29 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 2591DE0843 for ; Mon, 27 May 2019 18:35:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 1DC11344E2D for ; Mon, 27 May 2019 18:35:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1BAF75FE for ; Mon, 27 May 2019 18:35:26 +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: <1558982113.b578daaf6deb59291ed8aeef60a069c184a6ba83.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-gcc9.patch kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild X-VCS-Directories: kde-misc/wacomtablet/ kde-misc/wacomtablet/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b578daaf6deb59291ed8aeef60a069c184a6ba83 X-VCS-Branch: master Date: Mon, 27 May 2019 18:35:26 +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: 280c6cbd-f7c8-49e1-b764-1fefa1214a1c X-Archives-Hash: a17b6eef46cba53e0656884fef67e1fa commit: b578daaf6deb59291ed8aeef60a069c184a6ba83 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon May 27 18:12:26 2019 +0000 Commit: Andreas Sturmlechner gentoo 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 realcomputerguy.com> Closes: https://bugs.gentoo.org/686822 Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Andreas Sturmlechner 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 +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 + error(libwacom_error_new(), errorDeleter); + std::unique_ptr +-- +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