Date: Wednesday, June 19, 2019 @ 16:53:15
  Author: arojas
Revision: 482414

Qt 5.13 rebuild, fix mkspecs install dir

Modified:
  gammaray/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2019-06-19 16:49:30 UTC (rev 482413)
+++ PKGBUILD    2019-06-19 16:53:15 UTC (rev 482414)
@@ -2,7 +2,7 @@
 
 pkgname=gammaray
 pkgver=2.10.0
-pkgrel=1
+pkgrel=2
 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,9 +15,13 @@
             '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-qt-5.13a.patch::"https://github.com/KDAB/GammaRay/commit/621dbd9.patch";
+        
gammaray-qt-5.13b.patch::"https://github.com/KDAB/GammaRay/commit/3cb4f283.patch";)
 sha256sums=('0554e43067c2eba3517cf746a921385cf15675db79f879e1c3a7851c4951ffbe'
-            'SKIP')
+            'SKIP'
+            'b2922a5207821402f013588dd89a17625704964518f4bdc6a3a622425aed50b2'
+            '4be04460e980f1308d40d9621af3171e688d7420e69c9d59cc5743562d4188cd')
 validpgpkeys=(E86C000370B1B9E2A9191AD53DBFB6882C9358FB) # KDAB Products 
<i...@kdab.com>
 
 prepare() {
@@ -25,6 +29,10 @@
 
 # Fix plugin install dir
   sed -e 's|plugins/gammaray|lib/qt/plugins/gammaray|' -i 
$pkgname-$pkgver/CMakeLists.txt
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../gammaray-qt-5.13a.patch # Fix build with Qt 5.13
+  patch -p1 -i ../gammaray-qt-5.13b.patch
 }
 
 build() {
@@ -33,6 +41,7 @@
     -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
 }

Reply via email to