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

[Antonio Rojas]

    Date: Wednesday, May 27, 2020 @ 13:34:35
  Author: arojas
Revision: 387716

shiboken2/pyside2 5.15 rebuild

Modified:
  falkon/trunk/PKGBUILD

----------+
 PKGBUILD |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-27 13:24:00 UTC (rev 387715)
+++ PKGBUILD	2020-05-27 13:34:35 UTC (rev 387716)
@@ -2,7 +2,7 @@
 
 pkgname=falkon
 pkgver=3.1.0
-pkgrel=10
+pkgrel=11
 pkgdesc="Cross-platform QtWebEngine browser"
 arch=(x86_64)
 url="https://www.falkon.org/"
@@ -14,29 +14,28 @@
 replaces=(qupzilla)
 source=(https://download.kde.org/stable/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz{,.sig}
         falkon-pyside-5.12.2.patch::"https://cgit.kde.org/falkon.git/patch/?id=479933e0"
-        falkon-qt-5.14.patch::"https://cgit.kde.org/falkon.git/patch/?id=bbde5c69")
+        falkon-qt-5.14.patch::"https://cgit.kde.org/falkon.git/patch/?id=bbde5c69"
+        falkon-qt-5.15.patch::"https://invent.kde.org/network/falkon/-/commit/2ca83509.patch")
 sha256sums=('ce743cd80c0e2d525a784e29c9b487f73480119b0567f9ce8ef1f44cca527587'
             'SKIP'
             'ab7b8c1a8e0e53cb3db2722498f55cb39103d2138f4cf71859384549544074d6'
-            'd5a8bb8b77087ffd7ca73c004afe396333966145744d021395b196e020b1f0ae')
+            'd5a8bb8b77087ffd7ca73c004afe396333966145744d021395b196e020b1f0ae'
+            '20dad4b20649a8e3be7dcbb36c236d7afd9491fe87b1bdee57bf09a8bda5414d')
 validpgpkeys=(3CB7B8416EF6778B409FDC43EBC3FC294452C6D8) # David Rosca <nowrep at gmail.com>
 
 prepare() {
-  mkdir -p build
-
   cd $pkgname-$pkgver
   patch -p1 -i ../falkon-pyside-5.12.2.patch # Fix build with PySide 5.12.2
   patch -p1 -i ../falkon-qt-5.14.patch # Fix build with Qt 5.14
+  patch -p1 -i ../falkon-qt-5.15.patch # Fix build 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
 }