| 1 |
commit: 3e153cc5ee338b47cf2cc335dfd2fd075f64d0cc |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 17 10:43:20 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 17 10:48:36 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e153cc5 |
| 7 |
|
| 8 |
kde-misc/wacomtablet: Drop 3.1.1-r1 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.71, Repoman-2.3.17 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
kde-misc/wacomtablet/Manifest | 1 - |
| 14 |
...mtablet-3.1.1-correct-width-height-values.patch | 52 ------------------- |
| 15 |
.../wacomtablet/files/wacomtablet-3.1.1-gcc9.patch | 29 ----------- |
| 16 |
.../files/wacomtablet-3.1.1-xlib-optional.patch | 19 ------- |
| 17 |
kde-misc/wacomtablet/wacomtablet-3.1.1-r1.ebuild | 59 ---------------------- |
| 18 |
5 files changed, 160 deletions(-) |
| 19 |
|
| 20 |
diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest |
| 21 |
index 0ad12a31430..d848982dd35 100644 |
| 22 |
--- a/kde-misc/wacomtablet/Manifest |
| 23 |
+++ b/kde-misc/wacomtablet/Manifest |
| 24 |
@@ -1,2 +1 @@ |
| 25 |
-DIST wacomtablet-3.1.1.tar.xz 724176 BLAKE2B 062f05067b9ca423527f1fbbc498d3228fba9333f96e918493a00c3ceb669a23c3ab9297bf6c2d3d161559f1d9cf6ccff8f502971718e71a360f3db2e7d9bd67 SHA512 91f8ab9326b8307d63e09c7d75d613553f16c6cb93837cc404cb251aeda93078011b0c5aa0fc20ca4613d82421d73804cc55fa71a688bf4dd0f1d616733ade97 |
| 26 |
DIST wacomtablet-3.2.0.tar.xz 728468 BLAKE2B f741c8989f94cdc5b4839df5d91a6728c48308880c489e031d4615a58e82dddda75dcd1cd04b941035c1aece3ed4f7889508629100852cbcaafc063d7e0f8d1e SHA512 acbabd6d6546bc85f0ed4e245668dc89b1c2ecaedd3754bf7ad8027b90f3ae81e5312395376de272dcbd416a9a1115bff2481351bd3f418bef7fa06d0db0c5a6 |
| 27 |
|
| 28 |
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 |
| 29 |
deleted file mode 100644 |
| 30 |
index 80553972887..00000000000 |
| 31 |
--- a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-correct-width-height-values.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,52 +0,0 @@ |
| 34 |
-From fd099f89c5ded7e20c3a852d5539e9a0b269e11d Mon Sep 17 00:00:00 2001 |
| 35 |
-From: Jason Gerecke <jason.gerecke@×××××.com> |
| 36 |
-Date: Thu, 13 Jun 2019 23:49:12 +0300 |
| 37 |
-Subject: Correct width/height values from X11Wacom::getMaximumTabletArea |
| 38 |
- |
| 39 |
-Summary: |
| 40 |
-The "Wacom Tablet Area" property contains four values that define the |
| 41 |
-top-left and bottom-right tablet coordinates of the tablet's input |
| 42 |
-area. The driver will scale input coordinates according to the input |
| 43 |
-area such that the border of the input area matches up with the border |
| 44 |
-of the desktop or mapped monitor. |
| 45 |
- |
| 46 |
-Crucially, these coordinates are *NOT* necessarily equal to (0,0) and |
| 47 |
-(SENSOR_MAX_X, SENSOR_MAX_Y) after a reset. In particular, many display |
| 48 |
-tablet have sensors that are slightly larger than the display itself |
| 49 |
-and so have their reset areas equal to something like (400, 400) and |
| 50 |
-(SENSOR_MAX_X - 400, SENSOR_MAX_Y - 400) so that the pen is correctly |
| 51 |
-mapped. |
| 52 |
- |
| 53 |
-This commit updates X11Wacom::getMaximumTabletArea to properly set the |
| 54 |
-width and height properties by calculating the difference between the |
| 55 |
-min and max values of X and Y. This is particularly important to ensure |
| 56 |
-that the calibration routines work correctly. |
| 57 |
- |
| 58 |
-Ref: https://bugs.kde.org/show_bug.cgi?id=407712 |
| 59 |
- |
| 60 |
-Reviewers: valeriymalov |
| 61 |
- |
| 62 |
-Reviewed By: valeriymalov |
| 63 |
- |
| 64 |
-Differential Revision: https://phabricator.kde.org/D21775 |
| 65 |
---- |
| 66 |
- src/common/x11wacom.cpp | 4 ++-- |
| 67 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
| 68 |
- |
| 69 |
-diff --git a/src/common/x11wacom.cpp b/src/common/x11wacom.cpp |
| 70 |
-index e269480..a4d95c8 100644 |
| 71 |
---- a/src/common/x11wacom.cpp |
| 72 |
-+++ b/src/common/x11wacom.cpp |
| 73 |
-@@ -70,8 +70,8 @@ const TabletArea X11Wacom::getMaximumTabletArea(const QString& deviceName) |
| 74 |
- if (x11Device.getLongProperty(areaProperty, maximumArea, 4) && maximumArea.size() == 4) { |
| 75 |
- maximumAreaRect.setX(maximumArea.at(0)); |
| 76 |
- maximumAreaRect.setY(maximumArea.at(1)); |
| 77 |
-- maximumAreaRect.setWidth(maximumArea.at(2)); |
| 78 |
-- maximumAreaRect.setHeight(maximumArea.at(3)); |
| 79 |
-+ maximumAreaRect.setWidth(maximumArea.at(2) - maximumArea.at(0)); |
| 80 |
-+ maximumAreaRect.setHeight(maximumArea.at(3) - maximumArea.at(1)); |
| 81 |
- } |
| 82 |
- |
| 83 |
- // reset the area back to the previous value |
| 84 |
--- |
| 85 |
-cgit v1.1 |
| 86 |
|
| 87 |
diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch b/kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch |
| 88 |
deleted file mode 100644 |
| 89 |
index 6b0cc5dec63..00000000000 |
| 90 |
--- a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch |
| 91 |
+++ /dev/null |
| 92 |
@@ -1,29 +0,0 @@ |
| 93 |
-From 810487c4fa240f6de598b04929bb08de8937feb5 Mon Sep 17 00:00:00 2001 |
| 94 |
-From: Valerii Malov <jazzvoid@×××××.com> |
| 95 |
-Date: Sun, 28 Apr 2019 19:10:43 +0300 |
| 96 |
-Subject: (Supposedly) fix building with gcc9 |
| 97 |
- |
| 98 |
-I don't really have access to gcc9 right now to test, but this should |
| 99 |
-fix "static assertion failed: unique_ptr's deleter must be invocable |
| 100 |
-with a pointer" |
| 101 |
- |
| 102 |
-CCBUG: 407015 |
| 103 |
---- |
| 104 |
- src/common/libwacomwrapper.cpp | 2 +- |
| 105 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 106 |
- |
| 107 |
-diff --git a/src/common/libwacomwrapper.cpp b/src/common/libwacomwrapper.cpp |
| 108 |
-index 1d11fc3..92a559a 100644 |
| 109 |
---- a/src/common/libwacomwrapper.cpp |
| 110 |
-+++ b/src/common/libwacomwrapper.cpp |
| 111 |
-@@ -60,7 +60,7 @@ libWacomWrapper::~libWacomWrapper() |
| 112 |
- bool libWacomWrapper::lookupTabletInfo(int tabletId, int vendorId, TabletInformation &tabletInfo) |
| 113 |
- { |
| 114 |
- qCDebug(COMMON) << "LibWacom lookup for" << tabletId << vendorId; |
| 115 |
-- auto errorDeleter = [](WacomError *&e){libwacom_error_free(&e);}; |
| 116 |
-+ auto errorDeleter = [](WacomError *e){libwacom_error_free(&e);}; |
| 117 |
- std::unique_ptr<WacomError, decltype(errorDeleter)> |
| 118 |
- error(libwacom_error_new(), errorDeleter); |
| 119 |
- std::unique_ptr<WacomDevice, decltype(&libwacom_destroy)> |
| 120 |
--- |
| 121 |
-cgit v1.1 |
| 122 |
|
| 123 |
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 |
| 124 |
deleted file mode 100644 |
| 125 |
index ae40d90a64b..00000000000 |
| 126 |
--- a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-xlib-optional.patch |
| 127 |
+++ /dev/null |
| 128 |
@@ -1,19 +0,0 @@ |
| 129 |
---- a/CMakeLists.txt 2019-03-24 18:34:44.642298259 +0100 |
| 130 |
-+++ b/CMakeLists.txt 2019-03-24 18:38:45.593440974 +0100 |
| 131 |
-@@ -24,7 +24,7 @@ |
| 132 |
- find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets DBus X11Extras Qml) |
| 133 |
- find_package(KF5 REQUIRED COMPONENTS CoreAddons I18n GlobalAccel Config XmlGui WidgetsAddons WindowSystem Notifications DBusAddons Plasma DocTools) |
| 134 |
- find_package(XCB OPTIONAL_COMPONENTS XINPUT) |
| 135 |
--find_package(X11 REQUIRED COMPONENTS XLIB) |
| 136 |
-+find_package(X11 REQUIRED) |
| 137 |
- find_package(XorgWacom REQUIRED) |
| 138 |
- find_package(LibWacom REQUIRED) |
| 139 |
- |
| 140 |
-@@ -41,6 +41,7 @@ |
| 141 |
- set(USING_X_LIBRARIES XCB::XINPUT ${X11_Xinput_LIB}) |
| 142 |
- add_definitions(-DHAVE_XCB_XINPUT) |
| 143 |
- else() |
| 144 |
-+ find_package(X11 REQUIRED COMPONENTS XLIB) |
| 145 |
- message(STATUS "Falling back to X11_XINPUT.") |
| 146 |
- set(USING_X_LIBRARIES ${X11_LIBRARIES} ${X11_Xinput_LIB}) |
| 147 |
- endif() |
| 148 |
|
| 149 |
diff --git a/kde-misc/wacomtablet/wacomtablet-3.1.1-r1.ebuild b/kde-misc/wacomtablet/wacomtablet-3.1.1-r1.ebuild |
| 150 |
deleted file mode 100644 |
| 151 |
index 87b034ac93a..00000000000 |
| 152 |
--- a/kde-misc/wacomtablet/wacomtablet-3.1.1-r1.ebuild |
| 153 |
+++ /dev/null |
| 154 |
@@ -1,59 +0,0 @@ |
| 155 |
-# Copyright 1999-2019 Gentoo Authors |
| 156 |
-# Distributed under the terms of the GNU General Public License v2 |
| 157 |
- |
| 158 |
-EAPI=7 |
| 159 |
- |
| 160 |
-KDE_HANDBOOK="forceoptional" |
| 161 |
-VIRTUALX_REQUIRED="test" |
| 162 |
-inherit kde5 |
| 163 |
- |
| 164 |
-DESCRIPTION="System settings module for Wacom tablets" |
| 165 |
-HOMEPAGE="https://userbase.kde.org/Wacomtablet https://store.kde.org/p/1127862" |
| 166 |
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" |
| 167 |
- |
| 168 |
-LICENSE="GPL-2" |
| 169 |
-KEYWORDS="amd64 x86" |
| 170 |
-IUSE="" |
| 171 |
- |
| 172 |
-BDEPEND="sys-devel/gettext" |
| 173 |
-RDEPEND=" |
| 174 |
- $(add_frameworks_dep kconfig) |
| 175 |
- $(add_frameworks_dep kconfigwidgets) |
| 176 |
- $(add_frameworks_dep kcoreaddons) |
| 177 |
- $(add_frameworks_dep kdbusaddons) |
| 178 |
- $(add_frameworks_dep kglobalaccel) |
| 179 |
- $(add_frameworks_dep ki18n) |
| 180 |
- $(add_frameworks_dep knotifications) |
| 181 |
- $(add_frameworks_dep kwidgetsaddons) |
| 182 |
- $(add_frameworks_dep kwindowsystem) |
| 183 |
- $(add_frameworks_dep kxmlgui) |
| 184 |
- $(add_frameworks_dep plasma) |
| 185 |
- $(add_qt_dep qtdbus) |
| 186 |
- $(add_qt_dep qtdeclarative) |
| 187 |
- $(add_qt_dep qtgui) |
| 188 |
- $(add_qt_dep qtwidgets) |
| 189 |
- $(add_qt_dep qtx11extras) |
| 190 |
- >=dev-libs/libwacom-0.30 |
| 191 |
- >=x11-drivers/xf86-input-wacom-0.20.0 |
| 192 |
- x11-libs/libXi |
| 193 |
- x11-libs/libxcb |
| 194 |
-" |
| 195 |
-DEPEND="${RDEPEND} |
| 196 |
- x11-base/xorg-proto |
| 197 |
- x11-libs/libX11 |
| 198 |
-" |
| 199 |
- |
| 200 |
-PATCHES=( |
| 201 |
- "${FILESDIR}/${P}-xlib-optional.patch" # bug 681674 |
| 202 |
- "${FILESDIR}/${P}-gcc9.patch" # bug 686822 |
| 203 |
- "${FILESDIR}/${P}-correct-width-height-values.patch" # KDE-Bug 407712 |
| 204 |
-) |
| 205 |
- |
| 206 |
-src_test() { |
| 207 |
- # test needs DBus, bug 675548 |
| 208 |
- local myctestargs=( |
| 209 |
- -E "(Test.KDED.DBusTabletService)" |
| 210 |
- ) |
| 211 |
- |
| 212 |
- kde5_src_test |
| 213 |
-} |
Archives