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

[Andreas Sturmlechner]

commit:     0805a4ea8e90b0b2b966952e70cb7ba660c4327d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 13:57:22 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 16:45:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0805a4ea

kde-misc/wacomtablet: EAPI-8 bump, several upstream fixes

KDE-bug: https://bugs.kde.org/show_bug.cgi?id=418827
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=419392
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=440556

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-misc/wacomtablet/Manifest                      |  1 +
 .../files/wacomtablet-3.2.0-qt-5.15.patch          | 24 -------------------
 ...et-3.2.0.ebuild => wacomtablet-3.2.0-r1.ebuild} | 27 ++++++++++++++++------
 kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild      |  4 +++-
 4 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index d848982dd35e..b1170c608238 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1 +1,2 @@
+DIST wacomtablet-3.2.0-patchset-1.tar.xz 7796 BLAKE2B 4fa998a0f4376579d1e0d06a8aa9edababedca22d579dbdae651eee3699decc880a7a1d277f04c2bc24adba87908c07ab711989a5985b68af5b295d3b3260d33 SHA512 ff96f05831e4760ce99920061f0dc927aa6a2d5ef4b7443c3129bb1431262cb4bc1434097595976672393e3b611438014ccb528fc948e7c0407fc9a2d52ade8d
 DIST wacomtablet-3.2.0.tar.xz 728468 BLAKE2B f741c8989f94cdc5b4839df5d91a6728c48308880c489e031d4615a58e82dddda75dcd1cd04b941035c1aece3ed4f7889508629100852cbcaafc063d7e0f8d1e SHA512 acbabd6d6546bc85f0ed4e245668dc89b1c2ecaedd3754bf7ad8027b90f3ae81e5312395376de272dcbd416a9a1115bff2481351bd3f418bef7fa06d0db0c5a6

diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.2.0-qt-5.15.patch b/kde-misc/wacomtablet/files/wacomtablet-3.2.0-qt-5.15.patch
deleted file mode 100644
index 572450b0b113..000000000000
--- a/kde-misc/wacomtablet/files/wacomtablet-3.2.0-qt-5.15.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4f73ff02b3efd5e8728b18fcf1067eca166704ee Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@××××.fr>
-Date: Thu, 4 Jun 2020 16:00:38 +0200
-Subject: Fix build with Qt 5.15
-
----
- src/kcmodule/pressurecurvewidget.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/kcmodule/pressurecurvewidget.cpp b/src/kcmodule/pressurecurvewidget.cpp
-index 0c943b3..f047a6c 100644
---- a/src/kcmodule/pressurecurvewidget.cpp
-+++ b/src/kcmodule/pressurecurvewidget.cpp
-@@ -22,6 +22,7 @@
- //Qt includes
- #include <QDebug>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QMouseEvent>
- #include <QResizeEvent>
- #include <QTabletEvent>
--- 
-cgit v1.1
-

diff --git a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild b/kde-misc/wacomtablet/wacomtablet-3.2.0-r1.ebuild
similarity index 61%
copy from kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
copy to kde-misc/wacomtablet/wacomtablet-3.2.0-r1.ebuild
index 01eecd353f26..9a4c1ff47f25 100644
--- a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
+++ b/kde-misc/wacomtablet/wacomtablet-3.2.0-r1.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
+KFMIN=5.82.0
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="System settings module for Wacom tablets"
 HOMEPAGE="https://apps.kde.org/wacomtablet/
 https://userbase.kde.org/Wacomtablet"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
+https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
-BDEPEND="sys-devel/gettext"
 RDEPEND="
 	>=dev-libs/libwacom-0.30
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -44,8 +45,20 @@ DEPEND="${RDEPEND}
 	x11-base/xorg-proto
 	x11-libs/libX11
 "
+BDEPEND="sys-devel/gettext"
 
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
+PATCHES=(
+	"${WORKDIR}/${P}-qt-5.15.patch"
+	"${WORKDIR}/${P}-qt-5.15-obsoletions.patch"
+	"${WORKDIR}/${P}-no-override-screenspace-w-missing-screen.patch" # KDE-bug 419392
+	"${WORKDIR}/${P}-fix-xsetwacom-adapter.patch"
+	"${WORKDIR}/${P}-Intuos-M-bluetooth.patch" # KDE-bug 418827
+	"${WORKDIR}/${P}-correct-icons.patch"
+	"${WORKDIR}/${P}-drop-empty-X-KDE-PluginInfo-Depends.patch"
+	"${WORKDIR}/${P}-fix-QProcess-invocation.patch"
+	"${WORKDIR}/${P}-turn-off-gesture-support-by-default.patch" # KDE-bug 440556
+	"${WORKDIR}/${P}-only-show-on-X11.patch"
+)
 
 src_test() {
 	# test needs DBus, bug 675548

diff --git a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild b/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
index 01eecd353f26..f75a218f027c 100644
--- a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
+++ b/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
@@ -12,6 +12,8 @@ inherit ecm kde.org
 DESCRIPTION="System settings module for Wacom tablets"
 HOMEPAGE="https://apps.kde.org/wacomtablet/
 https://userbase.kde.org/Wacomtablet"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
+https://dev.gentoo.org/~asturm/distfiles/${P}-patchset-1.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="5"
@@ -45,7 +47,7 @@ DEPEND="${RDEPEND}
 	x11-libs/libX11
 "
 
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
+PATCHES=( "${WORKDIR}/${P}-qt-5.15.patch" )
 
 src_test() {
 	# test needs DBus, bug 675548