[gentoo-commits] repo/gentoo:master commit in: kde-misc/wacomtablet/files/, kde-misc/wacomtablet/

["Andreas Sturmlechner" <asturm@gentoo.org>]

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
-}