diff options
Diffstat (limited to 'kde-plasma/wacomtablet')
-rw-r--r-- | kde-plasma/wacomtablet/Manifest | 12 | ||||
-rw-r--r-- | kde-plasma/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch | 41 | ||||
-rw-r--r-- | kde-plasma/wacomtablet/files/wacomtablet-3.2.0-missing-include.patch | 24 | ||||
-rw-r--r-- | kde-plasma/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch | 143 | ||||
-rw-r--r-- | kde-plasma/wacomtablet/wacomtablet-3.2.0-r3.ebuild | 71 | ||||
-rw-r--r-- | kde-plasma/wacomtablet/wacomtablet-6.1.5.ebuild | 56 | ||||
-rw-r--r-- | kde-plasma/wacomtablet/wacomtablet-6.2.2.ebuild (renamed from kde-plasma/wacomtablet/wacomtablet-6.1.4.ebuild) | 4 |
7 files changed, 62 insertions, 289 deletions
diff --git a/kde-plasma/wacomtablet/Manifest b/kde-plasma/wacomtablet/Manifest index 6cf4e5f04c8c..cdd019a3b8d7 100644 --- a/kde-plasma/wacomtablet/Manifest +++ b/kde-plasma/wacomtablet/Manifest @@ -1,9 +1,5 @@ -AUX wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch 1917 BLAKE2B be46610081082f1106803ab619be82ed2433913199e8507cd15284a7bd83bfc202bdcc3dad4a5d3a94d7268439189be02c1db838652b3ed2bf23340ca585bb68 SHA512 a465880d880cf8db0e889e0b605dccc689fa7c8e5f05970458265320764b725b3470e8e63d600c769145632d7917985567571d23af44dc1728738b75544fa9cf -AUX wacomtablet-3.2.0-missing-include.patch 643 BLAKE2B 29e0991458acf87affaf6994fb9fa5191dc3212853af0082eee704f745d60ed208acb72127e5ed1c40cd67e42521d21794094e588f4cf45a74211a4f94cf81c8 SHA512 e1ab6720ea2261622d648c3ad770025e0f99b94ab060f673a2d7c6630b7b0574ac6910408a03df802c8894747e318c62d1e70a2dbd4623a478619eaa1f1b322c -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 -DIST wacomtablet-6.1.4.tar.xz 829624 BLAKE2B 1bf333ef012e65dcedf62a211eaab479caa73fafd73b46d89984582fc0aa8a469d2269b695d2cf74cef23010d010a1fbb66f86e5e82ab2cef86d820076270fab SHA512 c9e9d1dac0d44b6db9ce847908cfda9351fcf023b9f2f787d8c39b32ae74b805348c1e3dd35d7ac4432421ba5269ee6a6686ea46a2769df4a625034a4daba673 -EBUILD wacomtablet-3.2.0-r3.ebuild 2279 BLAKE2B 0e0bbccfb1d5bfcb1402fa36c94effac1e16afc41abe7bde129f6cd4df827bcd5f413fd419aa5f7e403a81724f7e5d06f9408cdb84d1cae7eca5e62242de3d26 SHA512 0bc5673f08afe6f0c2cad6deb45d450d57a57c10645edf9940870493ef316fbc03649eff7c7d06ff258c0c0908522bac7e673b374275c88594e3c7607b4d2620 -EBUILD wacomtablet-6.1.4.ebuild 1446 BLAKE2B f18f4dd6dcb38b3a50aa8e2b80de7d459d26f626331bc16b892c6551e672946ef968fa0d258220bef199aea9222626849f2a061e13a21a429fd23ef84eadedd3 SHA512 0d5c57b375feafb12a716a718f58e5460cd5ea4fc0a6dc6cce83ecf92fb69d60f1897e844088fc64aaaba07a37b609c936f0a31ff57413ab50ccda470d9ac073 +DIST wacomtablet-6.1.5.tar.xz 829876 BLAKE2B 5a028b05ce7360a655a98fc351c3e472a8cdaaef605045f2bab1b7e9b1cf806c488bf629f161001c5885bf64a4eba1ba4a29e66ae757939bc2cf8457b82c640b SHA512 592a0188cfa72026cc501afeed8c3e54edd99acddd0c4932e2e88889fb78d190576dbc4c662d73abe768b307e6490063bdab330efaa85959e982a55afd292f99 +DIST wacomtablet-6.2.2.tar.xz 834384 BLAKE2B b3eb48fdeef5e79e30d30dddcea4e303052ae79542446c93e78bef364377f5717ed71d754171af9320f6e7c6e12c3d870e33c61631edd8f980a7990764ad4813 SHA512 f3ad56407be12f434a4860d6a54cac4464450aa472a836c51ec81b8e0e6cb357ac2dccd1b582ff8dd64041776ee594bc12d947f5f8665a031de365a59935292f +EBUILD wacomtablet-6.1.5.ebuild 1444 BLAKE2B cfbb83afee20556d4c6b6d5c9cd72e8c0360aa059ed32764ae14d3a17c0b6558835b232875981d450f606216ab6452e056dd01ae36d265351b057cc9803db780 SHA512 b6ed9bd31c8acce9357fad52c141fb46b70572fb35654c968445d196fb3bfebe66d2e40b62e7b6056a7c0a41b2ce6e65c2c2a2aec4af586a0f0c6a94f66410cc +EBUILD wacomtablet-6.2.2.ebuild 1446 BLAKE2B a8422edb7eb73dc93fd982e7d2a06241737e96639b2a8030b5a7257d097707a0f55ee48b60f2eb39867ec7f3341e7b02b1ca79cec7c4bd2e490da1030902c522 SHA512 eda68e3bd987422880f4ca1fbc935fd0bf80950ac958d753685bf9f159b9844f5ed9d238d70308daf2cc947bee2d3419a508cbe38d89cadc77b4d043f69cc754 MISC metadata.xml 380 BLAKE2B 683aba479ac043f8d6c5e3ece7db3c73dd64c7ecf36038e480c4f6e50cbf13fc503e8ad64b219346454bc113b1f8fdb43a731f092c1e536e39bd0b0e14459b39 SHA512 3ba6bcf82d48997a530f58c2c6f9988771fd4d8a5c815bded87a13ab385b85580467fee67f1f5c9caf73702a6dc69e6a128124fc084faee768566d3f8721412d diff --git a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch b/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch deleted file mode 100644 index 9434b0082569..000000000000 --- a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-fix-incorrect-xsetwacom-call.patch +++ /dev/null @@ -1,41 +0,0 @@ -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-plasma/wacomtablet/files/wacomtablet-3.2.0-missing-include.patch b/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-missing-include.patch deleted file mode 100644 index 4ab144beabd4..000000000000 --- a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-missing-include.patch +++ /dev/null @@ -1,24 +0,0 @@ -From c6bdd5a15c2e200aae6a7fe3597bbf11691e7e5f Mon Sep 17 00:00:00 2001 -From: Nicolas Fella <nicolas.fella@gmx.de> -Date: Tue, 6 Jun 2023 23:24:07 +0200 -Subject: [PATCH] Add missing include - ---- - autotests/faketablet/faketablet.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/autotests/faketablet/faketablet.cpp b/autotests/faketablet/faketablet.cpp -index 076a8d18..bf9e4904 100644 ---- a/autotests/faketablet/faketablet.cpp -+++ b/autotests/faketablet/faketablet.cpp -@@ -20,6 +20,7 @@ - #include <iostream> - #include <cstring> - #include <cstdio> -+#include <cstdint> - #include <cstdlib> - #include <csignal> - #include <unistd.h> --- -GitLab - diff --git a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch b/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch deleted file mode 100644 index e86f97cfaef4..000000000000 --- a/kde-plasma/wacomtablet/files/wacomtablet-3.2.0-port-to-QRegularExpression.patch +++ /dev/null @@ -1,143 +0,0 @@ -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-plasma/wacomtablet/wacomtablet-3.2.0-r3.ebuild b/kde-plasma/wacomtablet/wacomtablet-3.2.0-r3.ebuild deleted file mode 100644 index 7fd90c74d4a8..000000000000 --- a/kde-plasma/wacomtablet/wacomtablet-3.2.0-r3.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2024 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="Wacom system settings module that supports different button/pen layout profiles" -HOMEPAGE="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-plasma/libplasma-${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 - "${FILESDIR}/${P}-missing-include.patch" # bug 920043 -) - -CMAKE_SKIP_TESTS=( - # test needs DBus, bugs 675548, 920558 - Test.KDED.DBusTabletService - Test.KDED.TabletHandler - Test.KDED.XInputAdaptor # SEGFAULT - Test.KDED.XsetWacomAdaptor # SEGFAULT -) diff --git a/kde-plasma/wacomtablet/wacomtablet-6.1.5.ebuild b/kde-plasma/wacomtablet/wacomtablet-6.1.5.ebuild new file mode 100644 index 000000000000..838e79241d5e --- /dev/null +++ b/kde-plasma/wacomtablet/wacomtablet-6.1.5.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="forceoptional" +KFMIN=6.5.0 +PVCUT=$(ver_cut 1-3) +QTMIN=6.7.2 +inherit ecm plasma.kde.org + +DESCRIPTION="Wacom system settings module that supports different button/pen layout profiles" +HOMEPAGE="https://userbase.kde.org/Wacomtablet" + +LICENSE="GPL-2" +SLOT="6" +KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" +IUSE="" + +# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h +RDEPEND=" + >=dev-libs/libwacom-0.30:= + >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/kglobalaccel-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/plasma5support-${PVCUT}:6 + >=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" + +src_test() { + # test needs DBus, bug 675548 + local myctestargs=( + -E "(Test.KDED.DBusTabletService)" + ) + + ecm_src_test +} diff --git a/kde-plasma/wacomtablet/wacomtablet-6.1.4.ebuild b/kde-plasma/wacomtablet/wacomtablet-6.2.2.ebuild index 8be99ffadc4b..92338e47d756 100644 --- a/kde-plasma/wacomtablet/wacomtablet-6.1.4.ebuild +++ b/kde-plasma/wacomtablet/wacomtablet-6.2.2.ebuild @@ -4,9 +4,9 @@ EAPI=8 ECM_HANDBOOK="forceoptional" -KFMIN=6.3.0 +KFMIN=6.6.0 PVCUT=$(ver_cut 1-3) -QTMIN=6.7.1 +QTMIN=6.7.2 inherit ecm plasma.kde.org DESCRIPTION="Wacom system settings module that supports different button/pen layout profiles" |