summaryrefslogtreecommitdiff
path: root/kde-misc/wacomtablet/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-08-18 18:16:17 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-08-18 18:16:17 +0100
commitfc637fb28da700da71ec2064d65ca5a7a31b9c6c (patch)
tree326613a08f25851c388715e205576a2e7d25dc4f /kde-misc/wacomtablet/files
parentb24bd25253fe093f722ab576d29fdc41d04cb1ee (diff)
gentoo resync : 18.08.2019
Diffstat (limited to 'kde-misc/wacomtablet/files')
-rw-r--r--kde-misc/wacomtablet/files/wacomtablet-3.1.1-correct-width-height-values.patch52
-rw-r--r--kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch29
-rw-r--r--kde-misc/wacomtablet/files/wacomtablet-3.1.1-xlib-optional.patch19
3 files changed, 0 insertions, 100 deletions
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 805539728870..000000000000
--- 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 6b0cc5dec637..000000000000
--- 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 ae40d90a64b0..000000000000
--- 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()