8 files changed, 193 insertions, 66 deletions
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 1f10488a17e2..d4e952de89c1 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/colord-kde/Manifest b/kde-misc/colord-kde/Manifest
index b1c1491a5bdb..32e3347c4118 100644
--- a/kde-misc/colord-kde/Manifest
+++ b/kde-misc/colord-kde/Manifest
@@ -1,3 +1,3 @@
-DIST colord-kde-0.5.0_p20220907-077644b5.tar.gz 64138 BLAKE2B 2bf2b705da0264f74568b69ef5f2ed4b90d38fa3457d870a806ca3b5db436f813232baa0901c73ed759b0b7409e9d44a427b1dfd764b7f14a7640d93b8c9f3dd SHA512 338e15b62ba46afb670ce7ee7ce24923e0485de09bdc4e33638696a962fc6773296e556d77d77bd1df22d0e7657c1e112836773f759225dd40cac29fb97fe262
-EBUILD colord-kde-0.5.0_p20220907.ebuild 1387 BLAKE2B 4a58d80d0ef786930b43bfc8d77d793ec2b130d9daa2e55fbead2edd5cea6ccd4a0afbd884975a0aa3a96c8b4118adcf6a8f07669deeda3b381dda10c9f9617e SHA512 70c63dc4fb8b1645d4f6adbd708ba6c08a150c5932bb21b87ea6c3f4c8d69708a92e20bb61607175c81b360087c7e4cb5470c4d69299837912be5c791f3aac75
+DIST colord-kde-22.11.90.tar.xz 110724 BLAKE2B 6a60c566b2782a519fdfffc5871a81f54b16f91351feb5a66ef50ffe6869fe5b611a3bff42b6f2e80bf44556d7e2603353ad6263664f96cc3de22163d662b577 SHA512 04f717f0621ac1b907e8ef270c3ffab0fc9eb5cf50204e83e3c04e1eed7e5b8e41f0c4d2ab1e6868a0ae442f4a94dbcac5ad2366d810e828073d16cec119974d
+EBUILD colord-kde-22.11.90.ebuild 1336 BLAKE2B bd1ecd3abe5afc8bdd53a42e2d875b25bb7b3a9ea710335764864da5e9eb62843972643997390a5ef97dc3403261ed39d9e7b75a842f1a39a7694fd7fc35b1d9 SHA512 fabf9f416351c011bf4add36849861fb799a38776d4a39eb52a647537d3f849cfd484a1ec9912155b46270e04bcb5757f97f8273487488da1c195a334da50786
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-misc/colord-kde/colord-kde-0.5.0_p20220907.ebuild b/kde-misc/colord-kde/colord-kde-22.11.90.ebuild
index 6a37a9153b4f..da1281f177c7 100644
--- a/kde-misc/colord-kde/colord-kde-0.5.0_p20220907.ebuild
+++ b/kde-misc/colord-kde/colord-kde-22.11.90.ebuild
@@ -4,10 +4,9 @@
 EAPI=8
 
 KDE_ORG_CATEGORY=graphics
-KDE_ORG_COMMIT=077644b5abf2992828bcc37c2598bc8810a24e9c
-KFMIN=5.96.0
+KFMIN=5.99.0
 QTMIN=5.15.5
-inherit ecm kde.org
+inherit ecm gear.kde.org
 
 DESCRIPTION="Provides interfaces and session daemon to colord"
 HOMEPAGE="https://invent.kde.org/graphics/colord-kde"
diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index a4246fcf4643..2c3a94f1e294 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1,5 +1,6 @@
+AUX wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch 1917 BLAKE2B be46610081082f1106803ab619be82ed2433913199e8507cd15284a7bd83bfc202bdcc3dad4a5d3a94d7268439189be02c1db838652b3ed2bf23340ca585bb68 SHA512 a465880d880cf8db0e889e0b605dccc689fa7c8e5f05970458265320764b725b3470e8e63d600c769145632d7917985567571d23af44dc1728738b75544fa9cf
+AUX wacomtablet-3.2.0-port-to-QRegularExpression.patch 6430 BLAKE2B bd2cd551009972942af339726b568a4cc9d1bcc60825a5c1fd6075c5ce155f8a0d47e78981a98412908244f0d31a9db3343009156854e147869531c70abaf53c SHA512 927dbaa487d891e5ab73f6b83cd4d5fa492b6c62a1aa847dbfcb2f268deabd99687f4b377c0cfcf48efd38536ce0d34b478756b658c2a0e1f84d1ca03e56fe75
 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
-EBUILD wacomtablet-3.2.0-r2.ebuild 1988 BLAKE2B 2798b4a6592946b5ca9b61bdf8c9e5c5c8f1bce20f3608dbc4303efda9282b04875d3bdfe585a96b085b64bc52b1d87ff751d46df039382001c0b54114f2c5a8 SHA512 5f1cb31d8bf45060505556c529ac3aafa83da479287fdf3347291a12e8cf2029e204e4ce738b560a547f4505d5d4ab96087dc354c0fbfcc174d8b050d4c7ad29
-EBUILD wacomtablet-3.2.0.ebuild 1482 BLAKE2B 318e8cc7b4ccef74fdb8480f5bef0407fea71d6071f01891a5a484c82afc12cc1a46f4b044ff74f6d441c2e606362e2597ff46ea71f4fc55fa5eb921256bb1a2 SHA512 e0e727a35d88374b7aed13515f722a671f13d5e52a57cd7570b8b1d4e6edd4996cf0e86bd4cd604d3c68fea5c94a985789f246e4ed125e3ed954aa75033ba636
+EBUILD wacomtablet-3.2.0-r3.ebuild 2152 BLAKE2B f3b3ebbc813f1621cbb4a0fae0aa9499e0cc3b3e577d921cff44d7f8d33e09b1a17af5acf4d52bd6911525c6f861481c9c9694e84686f6ce476afc8d47a957f2 SHA512 6143ab8407174afd2c2d4245b37108d438d3cfb86fb97a9e5ced7d0a0614c02386671fdd73ea528b8b80a727e754ef06c33a80bb221b4e2550a598b1d3714303
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
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 &param, 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-r2.ebuild b/kde-misc/wacomtablet/wacomtablet-3.2.0-r3.ebuild
index 733a1d4001c9..61cad0cb4037 100644
--- a/kde-misc/wacomtablet/wacomtablet-3.2.0-r2.ebuild
+++ b/kde-misc/wacomtablet/wacomtablet-3.2.0-r3.ebuild
@@ -58,6 +58,8 @@ PATCHES=(
 	"${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() {
diff --git a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild b/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
deleted file mode 100644
index 2c3d6a622b77..000000000000
--- a/kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-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" )
-
-src_test() {
-	# test needs DBus, bug 675548
-	local myctestargs=(
-		-E "(Test.KDED.DBusTabletService)"
-	)
-
-	ecm_src_test
-}