From 0d24567b94f74eadade7298ead53249061fbbb79 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Jul 21 2020 16:55:30 +0000
Subject: 3.2.0, pull in Qt 5.15 fix


---

diff --git a/.gitignore b/.gitignore
index ebbac25..ec76906 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,6 @@
 /wacomtablet-2.9.82.tar.xz
 /wacomtablet-3.1.0.tar.xz
 /wacomtablet-3.1.1.tar.xz
+/wacomtablet-3.2.0.tar.xz
+/0024-Fix-build-with-Qt-5.15.patch
+/0035-Fix-Qt-5.15-obsoletions.patch
diff --git a/0046-Supposedly-fix-building-with-gcc9.patch b/0046-Supposedly-fix-building-with-gcc9.patch
deleted file mode 100644
index 543d036..0000000
--- a/0046-Supposedly-fix-building-with-gcc9.patch
+++ /dev/null
@@ -1,30 +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: [PATCH 46/47] (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)>
--- 
-2.21.0
-
diff --git a/kcm_wacomtablet.spec b/kcm_wacomtablet.spec
index ec05fe8..903dff2 100644
--- a/kcm_wacomtablet.spec
+++ b/kcm_wacomtablet.spec
@@ -2,8 +2,8 @@
 
 Name:    kcm_wacomtablet
 Summary: KDE Control module for Wacom Graphictablets
-Version: 3.1.1
-Release: 4%{?dist}
+Version: 3.2.0
+Release: 1%{?dist}
 
 License: GPLv2+
 # mirror
@@ -11,13 +11,9 @@ URL:     https://github.com/KDE/wacomtablet
 Source0: https://download.kde.org/stable/wacomtablet/%{version}/wacomtablet-%{version}.tar.xz
 
 ## upstream patches
-Patch46: 0046-Supposedly-fix-building-with-gcc9.patch
-
-## upstreamable patches
-# use 'find_package(X11 REQUIRED COMPONENTS Xi)' instead of
-# 'find_package(X11 REQUIRES COMPONENTS XLIB)' which doesn't seem to work
-# on requent cmake-3.14+
-Patch100: wacomtablet-3.1.1-Xi.patch
+Patch24: 0024-Fix-build-with-Qt-5.15.patch
+# fix for Qt 5.15 but breaks building against older Qt
+#Patch35: 0035-Fix-Qt-5.15-obsoletions.patch
 
 BuildRequires: extra-cmake-modules
 BuildRequires: kf5-ki18n-devel
@@ -56,7 +52,8 @@ with profile support to handle different button/pen layouts per profile.
 
 
 %build
-%{cmake_kf5}
+%cmake_kf5
+
 %cmake_build
 
 
@@ -88,6 +85,9 @@ with profile support to handle different button/pen layouts per profile.
 
 
 %changelog
+* Tue Jul 21 2020 Rex Dieter <rdieter@fedoraproject.org> - 3.2.0-1
+- 3.2.0, pull in Qt 5.15 fix
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 1255847..25159af 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-SHA512 (wacomtablet-3.1.1.tar.xz) = 91f8ab9326b8307d63e09c7d75d613553f16c6cb93837cc404cb251aeda93078011b0c5aa0fc20ca4613d82421d73804cc55fa71a688bf4dd0f1d616733ade97
+SHA512 (wacomtablet-3.2.0.tar.xz) = acbabd6d6546bc85f0ed4e245668dc89b1c2ecaedd3754bf7ad8027b90f3ae81e5312395376de272dcbd416a9a1115bff2481351bd3f418bef7fa06d0db0c5a6
+SHA512 (0024-Fix-build-with-Qt-5.15.patch) = 611957b233b36fecd1b2521983ba4c8a843723efb3e0369ad382b08f10da419722557c9d30ff1c61124497380f6274ce8d16c4bf05913e8b184082bda4f4fa0c
+SHA512 (0035-Fix-Qt-5.15-obsoletions.patch) = fd010317aaee767704b7b758b6a4e98b5db6b3deb3fda88ccdcd42135a03128e873668c681c762d4bfc0bf13ff53c2bae6c368f9e5d71810d0e3e41ac48b6b81
diff --git a/wacomtablet-3.1.1-Xi.patch b/wacomtablet-3.1.1-Xi.patch
deleted file mode 100644
index 4b8bc72..0000000
--- a/wacomtablet-3.1.1-Xi.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up wacomtablet-3.1.1/CMakeLists.txt.Xi wacomtablet-3.1.1/CMakeLists.txt
---- wacomtablet-3.1.1/CMakeLists.txt.Xi	2019-04-28 09:51:27.549410462 -0500
-+++ wacomtablet-3.1.1/CMakeLists.txt	2019-04-28 09:42:31.892006437 -0500
-@@ -24,7 +24,7 @@ ecm_setup_version(${PROJECT_VERSION}
- 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 COMPONENTS Xi)
- find_package(XorgWacom REQUIRED)
- find_package(LibWacom REQUIRED)
-