* [gentoo-commits] repo/gentoo:master commit in: kde-misc/wacomtablet/files/, kde-misc/wacomtablet/
@ 2016-04-20 15:48 Andreas Hüttel
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Hüttel @ 2016-04-20 15:48 UTC (permalink / raw
To: gentoo-commits
commit: 5ea1dd7e97866f4915ab6120275a8ae08fd4c0fe
Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 20 15:46:24 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 15:47:25 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ea1dd7e
kde-misc/wacomtablet: Add Plasma:5 version. Does it build? It builds!
Package-Manager: portage-2.2.28
kde-misc/wacomtablet/Manifest | 1 +
.../files/wacomtablet-3.0.0_beta1-ecm.patch | 11 ++++
.../wacomtablet/wacomtablet-3.0.0_beta1.ebuild | 58 ++++++++++++++++++++++
3 files changed, 70 insertions(+)
diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index d9caebb..c2d7385 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1 +1,2 @@
DIST 114856-wacomtablet-2.1.0.tar.xz 657868 SHA256 1c4d0e9bf593b9ac99f0c2f1efae81b665cb07f5778486273ca1742f76b9c19e SHA512 fe8060120d63209bbe2adcb1c3f746086326f893ef1eaa879e0d0f843e9ba27fbbd3df5f9bf008dfc6e2dac0f1347ecc0b2bb46931646c82aaec9bfc6bc62a96 WHIRLPOOL f705be2dfe64a410f83e9acd1ec9b4f4cb58e24fbea2c3bbeadcae17dfb9bf58ce579b8040b002c2d4eb42b89e65a52f54c3c6a3fa77e8b29897a024bf7ade1b
+DIST 114856-wacomtablet-3.0.0~beta1.tar.xz 655684 SHA256 0bdb5c3f8dbd77010b4b6b37044aee33a8e026a5f31c8b6071b83ac4811cb9d6 SHA512 cf95cbd8f3489bf0d18acfec72ca964685060ae7c7a554b118f5086a46a1e97be67f674f1bf1db6ce15638fcdcfca5043e7438af09ced8acd9fb601c44f433fb WHIRLPOOL 13d5f72b307e6a154127912289af47d2eec077aa6f4602095b0a62eddb31a20991877312d6ed085e6047b1d491c655de3a9ace215ce23591666ca463045b5a84
diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.0.0_beta1-ecm.patch b/kde-misc/wacomtablet/files/wacomtablet-3.0.0_beta1-ecm.patch
new file mode 100644
index 0000000..dabb903
--- /dev/null
+++ b/kde-misc/wacomtablet/files/wacomtablet-3.0.0_beta1-ecm.patch
@@ -0,0 +1,11 @@
+diff -ruN wacomtablet-3.0.0~beta1.orig/CMakeLists.txt wacomtablet-3.0.0~beta1/CMakeLists.txt
+--- wacomtablet-3.0.0~beta1.orig/CMakeLists.txt 2015-10-28 18:53:01.000000000 +0100
++++ wacomtablet-3.0.0~beta1/CMakeLists.txt 2016-04-20 17:41:06.087315610 +0200
+@@ -66,5 +66,5 @@
+
+ feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+
+-include(MacroOptionalAddSubdirectory)
+-macro_optional_add_subdirectory( po )
++include(ECMOptionalAddSubdirectory)
++ecm_optional_add_subdirectory( po )
diff --git a/kde-misc/wacomtablet/wacomtablet-3.0.0_beta1.ebuild b/kde-misc/wacomtablet/wacomtablet-3.0.0_beta1.ebuild
new file mode 100644
index 0000000..62f4014
--- /dev/null
+++ b/kde-misc/wacomtablet/wacomtablet-3.0.0_beta1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+#EGIT_BRANCH="releng3.0"
+KDE_DOC_DIR="doc/user"
+KDE_HANDBOOK="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KControl module for Wacom tablets"
+HOMEPAGE="http://kde-apps.org/content/show.php?action=content&content=114856"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+MY_PV=${PV/_/\~}
+MY_P=${PN}-${MY_PV}
+SRC_URI="http://kde-apps.org/CONTENT/content-files/114856-${MY_P}.tar.xz"
+
+S=${WORKDIR}/${MY_P}
+
+CDEPEND="
+ $(add_frameworks_dep extra-cmake-modules)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep plasma)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ >=x11-drivers/xf86-input-wacom-0.20.0
+ x11-libs/libX11
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-libs/libxcb
+"
+DEPEND="${CDEPEND}
+ sys-devel/gettext
+ x11-proto/xproto
+"
+RDEPEND="${CDEPEND}
+ !kde-misc/wacomtablet:4
+"
+
+PATCHES=( "${FILESDIR}/${P}-ecm.patch" )
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/wacomtablet/files/, kde-misc/wacomtablet/
@ 2019-03-24 17:49 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2019-03-24 17:49 UTC (permalink / raw
To: gentoo-commits
commit: cfa45f40b5292dfc7b4d22220ec9a26e1145ff4a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 17:48:40 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 17:49:17 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfa45f40
kde-misc/wacomtablet: Fix build without XLIB
Closes: https://bugs.gentoo.org/681674
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/wacomtablet-3.1.1-xlib-optional.patch | 19 +++++++++++++++++++
kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild | 3 ++-
2 files changed, 21 insertions(+), 1 deletion(-)
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 00000000000..ae40d90a64b
--- /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 296d3c16027..733552086e0 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=(
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/wacomtablet/files/, kde-misc/wacomtablet/
@ 2019-05-27 18:35 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2019-05-27 18:35 UTC (permalink / raw
To: gentoo-commits
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@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 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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/wacomtablet/files/, kde-misc/wacomtablet/
@ 2019-07-15 20:52 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2019-07-15 20:52 UTC (permalink / raw
To: gentoo-commits
commit: 7cee66328f8e9db5bfdb66eb0ed12fb23ad860de
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 19:24:51 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 20:51:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cee6632
kde-misc/wacomtablet: EAPI-7 bump, HOMEPAGE, DESCRIPTION
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...mtablet-3.1.1-correct-width-height-values.patch | 52 +++++++++++++++++++
kde-misc/wacomtablet/wacomtablet-3.1.1-r1.ebuild | 59 ++++++++++++++++++++++
2 files changed, 111 insertions(+)
diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-correct-width-height-values.patch b/kde-misc/wacomtablet/files/wacomtablet-3.1.1-correct-width-height-values.patch
new file mode 100644
index 00000000000..80553972887
--- /dev/null
+++ b/kde-misc/wacomtablet/files/wacomtablet-3.1.1-correct-width-height-values.patch
@@ -0,0 +1,52 @@
+From fd099f89c5ded7e20c3a852d5539e9a0b269e11d Mon Sep 17 00:00:00 2001
+From: Jason Gerecke <jason.gerecke@wacom.com>
+Date: Thu, 13 Jun 2019 23:49:12 +0300
+Subject: Correct width/height values from X11Wacom::getMaximumTabletArea
+
+Summary:
+The "Wacom Tablet Area" property contains four values that define the
+top-left and bottom-right tablet coordinates of the tablet's input
+area. The driver will scale input coordinates according to the input
+area such that the border of the input area matches up with the border
+of the desktop or mapped monitor.
+
+Crucially, these coordinates are *NOT* necessarily equal to (0,0) and
+(SENSOR_MAX_X, SENSOR_MAX_Y) after a reset. In particular, many display
+tablet have sensors that are slightly larger than the display itself
+and so have their reset areas equal to something like (400, 400) and
+(SENSOR_MAX_X - 400, SENSOR_MAX_Y - 400) so that the pen is correctly
+mapped.
+
+This commit updates X11Wacom::getMaximumTabletArea to properly set the
+width and height properties by calculating the difference between the
+min and max values of X and Y. This is particularly important to ensure
+that the calibration routines work correctly.
+
+Ref: https://bugs.kde.org/show_bug.cgi?id=407712
+
+Reviewers: valeriymalov
+
+Reviewed By: valeriymalov
+
+Differential Revision: https://phabricator.kde.org/D21775
+---
+ src/common/x11wacom.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/common/x11wacom.cpp b/src/common/x11wacom.cpp
+index e269480..a4d95c8 100644
+--- a/src/common/x11wacom.cpp
++++ b/src/common/x11wacom.cpp
+@@ -70,8 +70,8 @@ const TabletArea X11Wacom::getMaximumTabletArea(const QString& deviceName)
+ if (x11Device.getLongProperty(areaProperty, maximumArea, 4) && maximumArea.size() == 4) {
+ maximumAreaRect.setX(maximumArea.at(0));
+ maximumAreaRect.setY(maximumArea.at(1));
+- maximumAreaRect.setWidth(maximumArea.at(2));
+- maximumAreaRect.setHeight(maximumArea.at(3));
++ maximumAreaRect.setWidth(maximumArea.at(2) - maximumArea.at(0));
++ maximumAreaRect.setHeight(maximumArea.at(3) - maximumArea.at(1));
+ }
+
+ // reset the area back to the previous value
+--
+cgit v1.1
diff --git a/kde-misc/wacomtablet/wacomtablet-3.1.1-r1.ebuild b/kde-misc/wacomtablet/wacomtablet-3.1.1-r1.ebuild
new file mode 100644
index 00000000000..87b034ac93a
--- /dev/null
+++ b/kde-misc/wacomtablet/wacomtablet-3.1.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="System settings module for Wacom tablets"
+HOMEPAGE="https://userbase.kde.org/Wacomtablet https://store.kde.org/p/1127862"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+BDEPEND="sys-devel/gettext"
+RDEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kdbusaddons)
+ $(add_frameworks_dep kglobalaccel)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep knotifications)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kwindowsystem)
+ $(add_frameworks_dep kxmlgui)
+ $(add_frameworks_dep plasma)
+ $(add_qt_dep qtdbus)
+ $(add_qt_dep qtdeclarative)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ $(add_qt_dep qtx11extras)
+ >=dev-libs/libwacom-0.30
+ >=x11-drivers/xf86-input-wacom-0.20.0
+ x11-libs/libXi
+ x11-libs/libxcb
+"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+ x11-libs/libX11
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-xlib-optional.patch" # bug 681674
+ "${FILESDIR}/${P}-gcc9.patch" # bug 686822
+ "${FILESDIR}/${P}-correct-width-height-values.patch" # KDE-Bug 407712
+)
+
+src_test() {
+ # test needs DBus, bug 675548
+ local myctestargs=(
+ -E "(Test.KDED.DBusTabletService)"
+ )
+
+ kde5_src_test
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/wacomtablet/files/, kde-misc/wacomtablet/
@ 2019-08-17 10:48 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2019-08-17 10:48 UTC (permalink / raw
To: gentoo-commits
commit: 3e153cc5ee338b47cf2cc335dfd2fd075f64d0cc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 17 10:43:20 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 17 10:48:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e153cc5
kde-misc/wacomtablet: Drop 3.1.1-r1
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/wacomtablet/Manifest | 1 -
...mtablet-3.1.1-correct-width-height-values.patch | 52 -------------------
.../wacomtablet/files/wacomtablet-3.1.1-gcc9.patch | 29 -----------
.../files/wacomtablet-3.1.1-xlib-optional.patch | 19 -------
kde-misc/wacomtablet/wacomtablet-3.1.1-r1.ebuild | 59 ----------------------
5 files changed, 160 deletions(-)
diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index 0ad12a31430..d848982dd35 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1,2 +1 @@
-DIST wacomtablet-3.1.1.tar.xz 724176 BLAKE2B 062f05067b9ca423527f1fbbc498d3228fba9333f96e918493a00c3ceb669a23c3ab9297bf6c2d3d161559f1d9cf6ccff8f502971718e71a360f3db2e7d9bd67 SHA512 91f8ab9326b8307d63e09c7d75d613553f16c6cb93837cc404cb251aeda93078011b0c5aa0fc20ca4613d82421d73804cc55fa71a688bf4dd0f1d616733ade97
DIST wacomtablet-3.2.0.tar.xz 728468 BLAKE2B f741c8989f94cdc5b4839df5d91a6728c48308880c489e031d4615a58e82dddda75dcd1cd04b941035c1aece3ed4f7889508629100852cbcaafc063d7e0f8d1e SHA512 acbabd6d6546bc85f0ed4e245668dc89b1c2ecaedd3754bf7ad8027b90f3ae81e5312395376de272dcbd416a9a1115bff2481351bd3f418bef7fa06d0db0c5a6
diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-correct-width-height-values.patch b/kde-misc/wacomtablet/files/wacomtablet-3.1.1-correct-width-height-values.patch
deleted file mode 100644
index 80553972887..00000000000
--- a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-correct-width-height-values.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From fd099f89c5ded7e20c3a852d5539e9a0b269e11d Mon Sep 17 00:00:00 2001
-From: Jason Gerecke <jason.gerecke@wacom.com>
-Date: Thu, 13 Jun 2019 23:49:12 +0300
-Subject: Correct width/height values from X11Wacom::getMaximumTabletArea
-
-Summary:
-The "Wacom Tablet Area" property contains four values that define the
-top-left and bottom-right tablet coordinates of the tablet's input
-area. The driver will scale input coordinates according to the input
-area such that the border of the input area matches up with the border
-of the desktop or mapped monitor.
-
-Crucially, these coordinates are *NOT* necessarily equal to (0,0) and
-(SENSOR_MAX_X, SENSOR_MAX_Y) after a reset. In particular, many display
-tablet have sensors that are slightly larger than the display itself
-and so have their reset areas equal to something like (400, 400) and
-(SENSOR_MAX_X - 400, SENSOR_MAX_Y - 400) so that the pen is correctly
-mapped.
-
-This commit updates X11Wacom::getMaximumTabletArea to properly set the
-width and height properties by calculating the difference between the
-min and max values of X and Y. This is particularly important to ensure
-that the calibration routines work correctly.
-
-Ref: https://bugs.kde.org/show_bug.cgi?id=407712
-
-Reviewers: valeriymalov
-
-Reviewed By: valeriymalov
-
-Differential Revision: https://phabricator.kde.org/D21775
----
- src/common/x11wacom.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/common/x11wacom.cpp b/src/common/x11wacom.cpp
-index e269480..a4d95c8 100644
---- a/src/common/x11wacom.cpp
-+++ b/src/common/x11wacom.cpp
-@@ -70,8 +70,8 @@ const TabletArea X11Wacom::getMaximumTabletArea(const QString& deviceName)
- if (x11Device.getLongProperty(areaProperty, maximumArea, 4) && maximumArea.size() == 4) {
- maximumAreaRect.setX(maximumArea.at(0));
- maximumAreaRect.setY(maximumArea.at(1));
-- maximumAreaRect.setWidth(maximumArea.at(2));
-- maximumAreaRect.setHeight(maximumArea.at(3));
-+ maximumAreaRect.setWidth(maximumArea.at(2) - maximumArea.at(0));
-+ maximumAreaRect.setHeight(maximumArea.at(3) - maximumArea.at(1));
- }
-
- // reset the area back to the previous value
---
-cgit v1.1
diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch b/kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch
deleted file mode 100644
index 6b0cc5dec63..00000000000
--- a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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/files/wacomtablet-3.1.1-xlib-optional.patch b/kde-misc/wacomtablet/files/wacomtablet-3.1.1-xlib-optional.patch
deleted file mode 100644
index ae40d90a64b..00000000000
--- a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-xlib-optional.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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-r1.ebuild b/kde-misc/wacomtablet/wacomtablet-3.1.1-r1.ebuild
deleted file mode 100644
index 87b034ac93a..00000000000
--- a/kde-misc/wacomtablet/wacomtablet-3.1.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="System settings module for Wacom tablets"
-HOMEPAGE="https://userbase.kde.org/Wacomtablet https://store.kde.org/p/1127862"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="sys-devel/gettext"
-RDEPEND="
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdbusaddons)
- $(add_frameworks_dep kglobalaccel)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kwindowsystem)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep plasma)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtx11extras)
- >=dev-libs/libwacom-0.30
- >=x11-drivers/xf86-input-wacom-0.20.0
- x11-libs/libXi
- x11-libs/libxcb
-"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
- x11-libs/libX11
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-xlib-optional.patch" # bug 681674
- "${FILESDIR}/${P}-gcc9.patch" # bug 686822
- "${FILESDIR}/${P}-correct-width-height-values.patch" # KDE-Bug 407712
-)
-
-src_test() {
- # test needs DBus, bug 675548
- local myctestargs=(
- -E "(Test.KDED.DBusTabletService)"
- )
-
- kde5_src_test
-}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/wacomtablet/files/, kde-misc/wacomtablet/
@ 2022-02-21 16:48 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2022-02-21 16:48 UTC (permalink / raw
To: gentoo-commits
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@krop.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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/wacomtablet/files/, kde-misc/wacomtablet/
@ 2022-11-27 15:12 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2022-11-27 15:12 UTC (permalink / raw
To: gentoo-commits
commit: faad1df7c8ed2a690c3d4e32dc12b00f2f06775e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 15:08:13 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 15:12:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faad1df7
kde-misc/wacomtablet: Fix incorrect xsetwacom call
Tested-by: Tomasz Lemiech <szpajder <AT> gmail.com>
Closes: https://bugs.gentoo.org/850652
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...tablet-3.2.0-fix-incorrect-xsetwacom-call.patch | 41 ++++++
...omtablet-3.2.0-port-to-QRegularExpression.patch | 143 +++++++++++++++++++++
kde-misc/wacomtablet/wacomtablet-3.2.0-r3.ebuild | 72 +++++++++++
3 files changed, 256 insertions(+)
diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch b/kde-misc/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch
new file mode 100644
index 000000000000..9434b0082569
--- /dev/null
+++ b/kde-misc/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch
@@ -0,0 +1,41 @@
+From 32c78782b3061bab2a3b1457133faf77b6d9ed2a Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 14 Nov 2022 02:57:07 +0100
+Subject: [PATCH] Fix incorrect xsetwacom call
+
+When param is e.g. 'Button 1' the 'Button' and '1' need to be passed as separate arguments
+
+BUG: 454947
+---
+ src/kded/xsetwacomadaptor.cpp | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/src/kded/xsetwacomadaptor.cpp b/src/kded/xsetwacomadaptor.cpp
+index 934fa8b..fc1bcac 100644
+--- a/src/kded/xsetwacomadaptor.cpp
++++ b/src/kded/xsetwacomadaptor.cpp
+@@ -245,10 +245,18 @@ bool XsetwacomAdaptor::setRotation(const QString& value)
+ bool XsetwacomAdaptor::setParameter(const QString &device, const QString ¶m, const QString &value) const
+ {
+ QProcess setConf;
+- if (!value.isEmpty()) {
+- setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param << value);
++
++ // https://bugs.kde.org/show_bug.cgi?id=454947
++ static const QRegularExpression buttonWithNumber(QStringLiteral("^Button \\d+$"));
++ if (param.contains(buttonWithNumber)) {
++ const QStringList splitted = param.split(QLatin1Char(' '));
++ setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << splitted[0] << splitted[1] << value);
+ } else {
+- setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param);
++ if (!value.isEmpty()) {
++ setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param << value);
++ } else {
++ setConf.start(QString::fromLatin1("xsetwacom"), QStringList() << QString::fromLatin1("set") << device << param);
++ }
+ }
+
+ if (!setConf.waitForStarted() || !setConf.waitForFinished()) {
+--
+GitLab
+
diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch b/kde-misc/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch
new file mode 100644
index 000000000000..e86f97cfaef4
--- /dev/null
+++ b/kde-misc/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch
@@ -0,0 +1,143 @@
+From 9c2f133ee400562ca9813e329f6e2bdae24a5ac5 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Thu, 4 Aug 2022 22:43:07 +0200
+Subject: [PATCH] Port from QRegExp to QRegularExpression
+
+---
+ src/common/buttonshortcut.cpp | 33 ++++++++++++++++++++-------------
+ src/kded/xsetwacomadaptor.cpp | 17 +++++++++++------
+ 2 files changed, 31 insertions(+), 19 deletions(-)
+
+diff --git a/src/common/buttonshortcut.cpp b/src/common/buttonshortcut.cpp
+index e11784f..32bf842 100644
+--- a/src/common/buttonshortcut.cpp
++++ b/src/common/buttonshortcut.cpp
+@@ -19,7 +19,7 @@
+
+ #include "buttonshortcut.h"
+
+-#include <QRegExp>
++#include <QRegularExpression>
+ #include <QKeySequence>
+
+ #include <KLocalizedString>
+@@ -266,8 +266,8 @@ bool ButtonShortcut::set(const QString& sequence)
+ return true;
+ }
+
+- QRegExp modifierRx (QLatin1String("^(?:key )?(?:\\s*\\+?(?:alt|ctrl|meta|shift|super))+$"), Qt::CaseInsensitive);
+- QRegExp buttonRx (QLatin1String ("^(?:button\\s+)?\\+?\\d+$"), Qt::CaseInsensitive);
++ static const QRegularExpression modifierRx (QLatin1String("^(?:key )?(?:\\s*\\+?(?:alt|ctrl|meta|shift|super))+$"), QRegularExpression::CaseInsensitiveOption);
++ static const QRegularExpression buttonRx (QLatin1String ("^(?:button\\s+)?\\+?\\d+$"), QRegularExpression::CaseInsensitiveOption);
+
+ if (seq.contains(buttonRx)) {
+ // this is a button
+@@ -388,7 +388,8 @@ void ButtonShortcut::convertToNormalizedKeySequence(QString& sequence, bool from
+ {
+ normalizeKeySequence(sequence);
+
+- QStringList keyList = sequence.split (QRegExp (QLatin1String ("\\s+")), Qt::SkipEmptyParts);
++ static const QRegularExpression rx(QStringLiteral("\\s+"));
++ QStringList keyList = sequence.split (rx, Qt::SkipEmptyParts);
+ bool isFirstKey = true;
+
+ sequence.clear();
+@@ -460,28 +461,33 @@ void ButtonShortcut::normalizeKeySequence(QString& sequence) const
+ {
+ // When setting a shortcut like "ctrl+x", xsetwacom will convert it to "key +ctrl +x -x"
+ // therefore we just truncate the string on the first "-key" we find.
+- QRegExp minusKeyRx (QLatin1String ("(^|\\s)-\\S"));
+- int pos = 0;
++ static const QRegularExpression minusKeyRx (QLatin1String ("(^|\\s)-\\S"));
+
+- if ((pos = minusKeyRx.indexIn(sequence, 0)) != -1) {
+- sequence = sequence.left(pos);
++ const QRegularExpressionMatch minusKeyRxMatch = minusKeyRx.match(sequence);
++
++ if (minusKeyRxMatch.hasMatch()) {
++ sequence = sequence.left(minusKeyRxMatch.capturedStart());
+ }
+
+ // cleanup leading "key " identifier from xsetwacom sequences
+- sequence.remove(QRegExp (QLatin1String ("^\\s*key\\s+"), Qt::CaseInsensitive));
++ static const QRegularExpression leadingKey(QStringLiteral("^\\s*key\\s+"), QRegularExpression::CaseInsensitiveOption);
++ sequence.remove(leadingKey);
+
+ // Remove all '+' prefixes from keys.
+ // This will convert shortcuts like "+ctrl +alt" to "ctrl alt", but not
+ // shortcuts like "ctrl +" which is required to keep compatibility to older
+ // (buggy) configuration files.
+- sequence.replace(QRegExp (QLatin1String ("(^|\\s)\\+(\\S)")), QLatin1String ("\\1\\2"));
++ static const QRegularExpression plusPrefixes(QStringLiteral("(^|\\s)\\+(\\S)"), QRegularExpression::CaseInsensitiveOption);
++ sequence.replace(plusPrefixes, QLatin1String ("\\1\\2"));
+
+ // Cleanup plus signs between keys.
+ // This will convert shortcuts like "ctrl+alt+shift" or "Ctrl++" to "ctrl alt shift" or "Ctrl +".
+- sequence.replace (QRegExp (QLatin1String ("(\\S)\\+(\\S)")), QLatin1String ("\\1 \\2"));
++ static const QRegularExpression cleanupPlus(QStringLiteral("(\\S)\\+(\\S)"), QRegularExpression::CaseInsensitiveOption);
++ sequence.replace (cleanupPlus, QLatin1String ("\\1 \\2"));
+
+ // replace multiple whitespaces with one
+- sequence.replace (QRegExp (QLatin1String ("\\s{2,}")), QLatin1String (" "));
++ static const QRegularExpression whitespaces(QStringLiteral("\\s{2,}"), QRegularExpression::CaseInsensitiveOption);
++ sequence.replace (whitespaces, QLatin1String (" "));
+
+ // trim the string
+ sequence = sequence.trimmed();
+@@ -500,7 +506,8 @@ void ButtonShortcut::prettifyKey(QString& key) const
+ bool ButtonShortcut::setButtonSequence(const QString& buttonSequence)
+ {
+ QString buttonNumber = buttonSequence;
+- buttonNumber.remove(QRegExp (QLatin1String ("^\\s*button\\s+"), Qt::CaseInsensitive));
++ static const QRegularExpression rx(QStringLiteral("^\\s*button\\s+"), QRegularExpression::CaseInsensitiveOption);
++ buttonNumber.remove(rx);
+
+ bool ok = false;
+ int button = buttonNumber.toInt(&ok);
+diff --git a/src/kded/xsetwacomadaptor.cpp b/src/kded/xsetwacomadaptor.cpp
+index a39f307..934fa8b 100644
+--- a/src/kded/xsetwacomadaptor.cpp
++++ b/src/kded/xsetwacomadaptor.cpp
+@@ -27,7 +27,7 @@
+ #include "tabletarea.h"
+
+ #include <QProcess>
+-#include <QRegExp>
++#include <QRegularExpression>
+
+ using namespace Wacom;
+
+@@ -142,10 +142,13 @@ const QString XsetwacomAdaptor::convertParameter(const XsetwacomProperty& param)
+ QString modifiedParam = param.key();
+
+ // convert tablet button number to hardware button number
+- QRegExp rx(QLatin1String("^Button\\s*([0-9]+)$"), Qt::CaseInsensitive);
++ static const QRegularExpression rx(QLatin1String("^Button\\s*([0-9]+)$"), QRegularExpression::CaseInsensitiveOption);
++
++ const QRegularExpressionMatch match = rx.match(modifiedParam);
++
++ if (match.hasMatch()) {
++ QString hwButtonNumber = match.captured(1);
+
+- if (rx.indexIn(modifiedParam, 0) != -1) {
+- QString hwButtonNumber = rx.cap(1);
+ QString kernelButtonNumber;
+
+ if (!d->buttonMap.isEmpty()) {
+@@ -167,9 +170,11 @@ const QString XsetwacomAdaptor::convertParameter(const XsetwacomProperty& param)
+
+ void XsetwacomAdaptor::convertButtonShortcut (const XsetwacomProperty& property, QString& value) const
+ {
+- QRegExp rx (QLatin1String("^Button\\s*[0-9]+$"), Qt::CaseInsensitive);
++ static const QRegularExpression rx(QLatin1String("^Button\\s*[0-9]+$"), QRegularExpression::CaseInsensitiveOption);
++
++ const QRegularExpressionMatch match = rx.match(property.key());
+
+- if (rx.indexIn(property.key(), 0) != -1) {
++ if (match.hasMatch()) {
+ ButtonShortcut buttonshortcut(value);
+ value = buttonshortcut.toString();
+ }
+--
+GitLab
+
diff --git a/kde-misc/wacomtablet/wacomtablet-3.2.0-r3.ebuild b/kde-misc/wacomtablet/wacomtablet-3.2.0-r3.ebuild
new file mode 100644
index 000000000000..61cad0cb4037
--- /dev/null
+++ b/kde-misc/wacomtablet/wacomtablet-3.2.0-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+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"
+
+RDEPEND="
+ >=dev-libs/libwacom-0.30:=
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtdeclarative-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ >=kde-frameworks/plasma-${KFMIN}:5
+ >=x11-drivers/xf86-input-wacom-0.20.0
+ x11-libs/libXi
+ x11-libs/libxcb
+"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+ x11-libs/libX11
+"
+BDEPEND="sys-devel/gettext"
+
+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"
+ "${FILESDIR}/${P}-port-to-QRegularExpression.patch" # pre-requisite for below:
+ "${FILESDIR}/${P}-fix-incorrect-xsetwacom-call.patch" # bug 850652, KDE-bug 454947
+)
+
+src_test() {
+ # test needs DBus, bug 675548
+ local myctestargs=(
+ -E "(Test.KDED.DBusTabletService)"
+ )
+
+ ecm_src_test
+}
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-11-27 15:12 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-27 15:12 [gentoo-commits] repo/gentoo:master commit in: kde-misc/wacomtablet/files/, kde-misc/wacomtablet/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2022-02-21 16:48 Andreas Sturmlechner
2019-08-17 10:48 Andreas Sturmlechner
2019-07-15 20:52 Andreas Sturmlechner
2019-05-27 18:35 Andreas Sturmlechner
2019-03-24 17:49 Andreas Sturmlechner
2016-04-20 15:48 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox