[arch-commits] Commit in kcm-wacomtablet/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Wednesday, July 8, 2020 @ 06:45:29
  Author: arojas
Revision: 660474

Fix build with Qt 5.15

Modified:
  kcm-wacomtablet/trunk/PKGBUILD

----------+
 PKGBUILD |   22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-08 06:40:57 UTC (rev 660473)
+++ PKGBUILD	2020-07-08 06:45:29 UTC (rev 660474)
@@ -10,31 +10,29 @@
 epoch=1
 pkgdesc="KDE GUI for the Wacom Linux Drivers"
 arch=(x86_64)
-url="https://cgit.kde.org/wacomtablet.git"
+url="https://invent.kde.org/kde/wacomtablet.git"
 license=(GPL)
 depends=(xf86-input-wacom plasma-workspace)
 makedepends=(extra-cmake-modules kdoctools)
 source=("https://download.kde.org/stable/wacomtablet/$pkgver/wacomtablet-$pkgver.tar.xz"{,.sig}
-        "add_missing_includes.diff")
+        "add_missing_includes.diff"
+        wacomtablet-qt5.15.patch::"https://invent.kde.org/system/wacomtablet/-/commit/4f73ff02.patch")
 sha256sums=('c80ce63a41f6fcbb50ac4c2130ed2f8273c4b744e62e33d4b714bf83e8e5f7a4'
             'SKIP'
-            '143b2e81e5152c2f1db6e03089b32d9b9fdf1e61739743179b0efb299eb5b44d')
+            '143b2e81e5152c2f1db6e03089b32d9b9fdf1e61739743179b0efb299eb5b44d'
+            '8cb4ca5b3b1fb65cd14a1c6dd20cca249e183169eeb43aef90b056dda7465c32')
 validpgpkeys=('E6E4C916590026E45836A12EA8896AFDFEF5DF53') # Valeriy Malov
 
 prepare() {
-  mkdir -p build
-
-  cd wacomtablet-$pkgver
-  patch -Np1 < "$srcdir/add_missing_includes.diff"
+  patch -d wacomtablet-$pkgver -p1 -i ../add_missing_includes.diff
+  patch -d wacomtablet-$pkgver -p1 -i ../wacomtablet-qt5.15.patch # Fix build with Qt 5.15
 }
 
 build() {
-  cd build
-  cmake ../wacomtablet-$pkgver
-  make
+  cmake -B build -S wacomtablet-$pkgver
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }