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

[Antonio Rojas via arch-commits]

    Date: Tuesday, May 26, 2020 @ 18:10:09
  Author: arojas
Revision: 635146

Qt 5.15 rebuild

Modified:
  gammaray/trunk/PKGBUILD

----------+
 PKGBUILD |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2020-05-26 17:54:20 UTC (rev 635145)
+++ PKGBUILD    2020-05-26 18:10:09 UTC (rev 635146)
@@ -2,7 +2,7 @@
 
 pkgname=gammaray
 pkgver=2.11.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A tool for examining the internals of a Qt application and to some 
extent also manipulate it"
 arch=(x86_64)
 url="https://www.kdab.com/gammaray/";
@@ -15,30 +15,32 @@
             'qt5-connectivity: bluetooth plugin'
             'qt5-script: script engine debugger plugin'
             'kcoreaddons: KJob tracker plugin')
-source=(https://github.com/KDAB/GammaRay/releases/download/v$pkgver/gammaray-$pkgver.tar.gz{,.asc})
+source=(https://github.com/KDAB/GammaRay/releases/download/v$pkgver/gammaray-$pkgver.tar.gz{,.asc}
+        
gammaray-qt5.15a.patch::"https://github.com/KDAB/GammaRay/commit/ec9fe408.patch";
+        
gammaray-qt5.15b.patch::"https://github.com/KDAB/GammaRay/commit/7cd17bca.patch";)
 sha256sums=('87a1d72ad1ad6d1a0156c54a85b0976ab38c6a64136458ca7c4ee491566d25d0'
-            'SKIP')
+            'SKIP'
+            'e98094b3ca0594e069fc08cdbfa520dd53208ccac454255da5e84d6bd39685f2'
+            '4fa605325a0e98ff25fea4cd1b46796d1fd1d668a04dbfc28569140a2c8f104d')
 validpgpkeys=(E86C000370B1B9E2A9191AD53DBFB6882C9358FB) # KDAB Products 
<i...@kdab.com>
 
 prepare() {
-  mkdir -p build
-
 # Fix plugin install dir
   sed -e 's|plugins/gammaray|lib/qt/plugins/gammaray|' -i 
$pkgname-$pkgver/CMakeLists.txt
+
+  patch -d $pkgname-$pkgver -p1 -i ../gammaray-qt5.15a.patch
+  patch -d $pkgname-$pkgver -p1 -i ../gammaray-qt5.15b.patch # Fix build with 
Qt 5.15
 }
 
 build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
+  cmake -B build -S $pkgname-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
     -DGAMMARAY_INSTALL_QT_LAYOUT=ON \
     -DECM_MKSPECS_INSTALL_DIR=/usr/lib/qt/mkspecs/modules \
     -DPLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/gammaray
-  make
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }