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

[Antonio Rojas]

    Date: Tuesday, February 22, 2022 @ 07:37:19
  Author: arojas
Revision: 1135774

Fix build with Qt 5.15 (FS#73921), add debug symbols

Modified:
  apper/trunk/PKGBUILD

----------+
 PKGBUILD |   42 ++++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-22 07:34:48 UTC (rev 1135773)
+++ PKGBUILD	2022-02-22 07:37:19 UTC (rev 1135774)
@@ -5,48 +5,46 @@
 
 pkgname=apper
 pkgver=1.0.0
-pkgrel=4
-pkgdesc="An application and package manager using PackageKit"
+pkgrel=5
+pkgdesc='An application and package manager using PackageKit'
 arch=(x86_64)
-url="https://www.kde.org/applications/system/apper/"
+url='https://www.kde.org/applications/system/apper/'
 license=(GPL)
 depends=(packagekit-qt5 kcmutils appstream-qt qt5-xmlpatterns)
 makedepends=(extra-cmake-modules kdoctools plasma-workspace)
 optdepends=('plasma-workspace: Updates daemon')
 source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"{,.sig} apper-rpath.patch
-        apper-qt5.11.patch::"https://cgit.kde.org/apper.git/patch/?id=d8960ea9"
-        apper-qt5.14.patch::"https://cgit.kde.org/apper.git/patch/?id=1815d19f"
-        kdebug-401461.patch::"https://cgit.kde.org/apper.git/patch/?id=d486706f")
+        apper-qt5.11.patch::https://invent.kde.org/system/apper/-/commit/d8960ea9.patch
+        apper-qt5.14.patch::https://invent.kde.org/system/apper/-/commit/1815d19f.patch
+        kdebug-401461.patch::https://invent.kde.org/system/apper/-/commit/d486706f.patch
+        apper-qt5.15.patch::https://invent.kde.org/system/apper/-/commit/f2fb923e.patch)
 sha256sums=('1a30be92aab8bd258c2a8824f533c5646b934e06b4268edbd11724ea450f4923'
             'SKIP'
             '17ce82a3f9ba8888febc5d2b2dc63e5c73d7be4b216e9110f0ca73050be0010d'
-            '05d9f54d788256ec658cadec6571f3ec649ab3e82adb8daa2e7209aa9c1ff062'
-            '1275d8af4d61d50e3d39a6507395bb4142572720937e9ebfe9679c69b53ce402'
-            '2f66e12f40c68fb1b8c7a1d4fcf71adfdd4dceb9ecf0806c636fbf20d55e2154')
+            '667301c14bc6b4c83eaf78b5c5724f1a6cfe7f49aadd3a3fde2e3e1192f9374e'
+            'a662281b518929c5ae1d91bc829d60a02a7cf20fb434a1a3809017c5dc971312'
+            'fedc93b12289136b777d3b4441ce7997bea089c996463eec491328f2e6c1f390'
+            'b91e81fc476c443f6e20920476f5907e5e1695e5551595b42b866607ba2bcb9c')
 validpgpkeys=(70C26659D184ABC01FFAF45228DDEDC6E4480AD0) # Daniel Nicoletti <dantti12 at gmail.com>
+options=(debug)
 
 prepare() {
-  mkdir -p build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../apper-rpath.patch # Fix RPATH of apper binary
-  patch -p1 -i ../apper-qt5.11.patch # fix build with Qt 5.11
-  patch -p1 -i ../apper-qt5.14.patch # fix build with Qt 5.14
-  patch -p1 -i ../kdebug-401461.patch # fix crash
+  patch -d $pkgname-$pkgver -p1 < apper-rpath.patch # Fix RPATH of apper binary
+  patch -d $pkgname-$pkgver -p1 < apper-qt5.11.patch # Fix build with Qt 5.11
+  patch -d $pkgname-$pkgver -p1 < apper-qt5.14.patch # Fix build with Qt 5.14
+  patch -d $pkgname-$pkgver -p1 < kdebug-401461.patch # Fix crash
+  patch -d $pkgname-$pkgver -p1 < apper-qt5.15.patch # Fix build with Qt 5.15
 }
 
 build() {
-  cd build
-
-  cmake ../$pkgname-$pkgver \
+  cmake -B build -S $pkgname-$pkgver \
     -DCMAKE_INSTALL_LIBEXECDIR=lib \
     -DAPPSTREAM=ON
-  make
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 
 # fix conflicts with gnome-software
   mv "$pkgdir"/usr/share/dbus-1/services/{,kde_}org.freedesktop.PackageKit.service