diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
| commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
| tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /kde-misc/wacomtablet | |
| parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) | |
gentoo resync : 20.03.2022
Diffstat (limited to 'kde-misc/wacomtablet')
| -rw-r--r-- | kde-misc/wacomtablet/Manifest | 4 | ||||
| -rw-r--r-- | kde-misc/wacomtablet/files/wacomtablet-3.2.0-qt-5.15.patch | 24 | ||||
| -rw-r--r-- | kde-misc/wacomtablet/wacomtablet-3.2.0-r1.ebuild (renamed from kde-misc/wacomtablet/wacomtablet-3.2.0.ebuild) | 25 |
3 files changed, 21 insertions, 32 deletions
diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest index 8a2af50ab76b..d2ecdbfdfbd8 100644 --- a/kde-misc/wacomtablet/Manifest +++ b/kde-misc/wacomtablet/Manifest @@ -1,4 +1,4 @@ -AUX wacomtablet-3.2.0-qt-5.15.patch 663 BLAKE2B e47fcda757a55ad13c5a0089084c7dd10ba7472e49d9703f000096f336f47208d648539c240afd2083221c8084864940194f5487812eb2890ada6226b0bf8f5e SHA512 120b2e3b57159d0bcfbee707d4f328c2dbeef846d449f5fde7b452da99bcd2de79463bd63e88dc26d7c9071e6fbd112dd528d5c05817bc16c16276004ab4b78f +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.ebuild 1363 BLAKE2B 40c6c9d21a1fa01c47ad5cd5573d7927472b842bb4570e7835dd725f284acccc9fdc648e33c6f0621d0a0130869ef75f9312ef29f6a5c49c5fba1f7744d8c2ab SHA512 66a7f11b8094f48ca3242a70672f3f6b8fd64261e6b74ab91a2297531ec18ba5b35b209aba14a1783557d3639fac9478d7f1ce9aaa566e58ec77c4040e756aa8 +EBUILD wacomtablet-3.2.0-r1.ebuild 1986 BLAKE2B e829d519ae319444b76265759bea9ca03f426c159e2c141a6fe78d41c96014120d98b32aa2ea37990d1c3e649effe67e78da7c13ff5b819f55f99c4d5e200953 SHA512 e37b3e6b8e57a9248011fa2744c8aa0b85e09b7250af330c0c768c3d0f93bad13156b393d134148b6dd4ee7026ac1cc50406995c44dbff05bfb9ea387b369648 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6 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 index 01eecd353f26..190d20089e2b 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" -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 |