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

[Antonio Rojas via arch-commits]

    Date: Sunday, December 13, 2020 @ 17:01:25
  Author: arojas
Revision: 404284

Fix mkspecs install dir

Modified:
  kdb/trunk/PKGBUILD

----------+
 PKGBUILD |   23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2020-12-13 14:26:15 UTC (rev 404283)
+++ PKGBUILD    2020-12-13 17:01:25 UTC (rev 404284)
@@ -2,7 +2,7 @@
 
 pkgname=kdb
 pkgver=3.2.0
-pkgrel=4
+pkgrel=5
 pkgdesc="A database connectivity and creation framework for various database 
vendors"
 arch=(x86_64)
 url="http://www.kexi-project.org/";
@@ -11,30 +11,27 @@
 makedepends=(extra-cmake-modules python mariadb-libs postgresql qt5-tools 
doxygen qt5-doc)
 optdepends=('mariadb-libs: MySQL plugin' 'postgresql: PostgreSQL plugin')
 
source=("https://download.kde.org/stable/$pkgname/src/$pkgname-$pkgver.tar.xz"{,.sig}
-         
kdb-postgresql-12.patch::"https://invent.kde.org/libraries/kdb/-/commit/40cdaea4.patch";)
+         
kdb-postgresql-12.patch::"https://invent.kde.org/libraries/kdb/-/commit/40cdaea4.patch";
+         
kdb-mkspecs-path.patch::"https://invent.kde.org/libraries/kdb/-/merge_requests/6.patch";)
 sha256sums=('8f8983bc8d143832dc14bc2003ba6af1af27688e477c0c791fd61445464f2069'
             'SKIP'
-            '7c67b4b349432cbe44413758dcd020600eca1366c82fb2d02c361dbf66e8d0f7')
+            '7c67b4b349432cbe44413758dcd020600eca1366c82fb2d02c361dbf66e8d0f7'
+            '2efccec64624d2d38b40f13ae6a508439e0f90330d5124c884c16fce461a2988')
 validpgpkeys=(4866BAF713B465677A4059643C7C0E201B6524DB) # Jarosław Staniek 
<stan...@kde.org>
 
 
 prepare() {
-  mkdir -p build
-
-  cd $pkgname-$pkgver
-  patch -p1 -i ../kdb-postgresql-12.patch # Fix build with postgresql 12
+  patch -d $pkgname-$pkgver -p1 -i ../kdb-postgresql-12.patch # Fix build with 
postgresql 12
+  patch -d $pkgname-$pkgver -p1 -i ../kdb-mkspecs-path.patch # Fix mkspecs 
install dir
 }
 
 build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_LIBDIR=lib \
+  cmake -B build -S $pkgname-$pkgver \
     -DBUILD_TESTING=OFF \
     -DBUILD_QCH=ON
-  make
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }