git » konsole.git » commit b9161b1

Fix crash on right click with Qt 5.15

author Antonio Rojas
2020-05-29 11:56:14 UTC
committer Antonio Rojas
2020-05-29 11:56:14 UTC
parent 1156dbdd1a65991970657224b54ef09bb414654d

Fix crash on right click with Qt 5.15

PKGBUILD +9 -9

diff --git a/PKGBUILD b/PKGBUILD
index 241597d..8b3dc46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=konsole
 pkgver=20.04.1
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url='https://kde.org/applications/system/konsole/'
 pkgdesc="KDE's terminal emulator"
@@ -13,24 +13,24 @@ groups=(kde-applications kde-utilities)
 depends=(knotifyconfig kpty kparts kinit knewstuff)
 makedepends=(extra-cmake-modules kdoctools)
 optdepends=('keditbookmarks: to manage bookmarks')
-source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
+source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+         kdebug-419526.patch::"https://invent.kde.org/utilities/konsole/commit/e7e8e9d1.patch")
 sha256sums=('b5ada61759b4731cccb3814c4cc9a495c309ad93c9943e4b7e802b3fe53a7932'
-            'SKIP')
+            'SKIP'
+            '92f5fd30536017a0711869a04b5be298326e45e7b19afb2012f319761d0c322f')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck@kde.org>
 
 prepare() {
-  mkdir -p build
+  patch -d $pkgname-$pkgver -p1 -i ../kdebug-419526.patch # Fix crash on right-click with Qt 5.15
 }
 
 build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
+  cmake -B build -S $pkgname-$pkgver \
     -DBUILD_TESTING=OFF
-  make
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }