Merged with official ABS krunner PKGBUILD

2 files changed, 26 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 90b0eba7bfcb..037e15aae8dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = krunner-git
 	pkgdesc = Framework for providing different actions given a string query
-	pkgver = r564.83fdd52
+	pkgver = 5.79.0_r569.geaaf2ca
 	pkgrel = 1
 	url = https://community.kde.org/Frameworks
-	arch = i686
 	arch = x86_64
-	groups = kf5
+	groups = kf5-git
 	license = LGPL
-	makedepends = extra-cmake-modules
-	makedepends = kdoctools
-	makedepends = doxygen
 	makedepends = git
+	makedepends = extra-cmake-modules-git
+	makedepends = kdoctools-git
+	makedepends = doxygen
 	makedepends = qt5-tools
-	depends = plasma-framework
-	depends = threadweaver
+	makedepends = qt5-doc
+	depends = plasma-framework-git
+	depends = threadweaver-git
 	provides = krunner
 	conflicts = krunner
 	source = git+https://github.com/KDE/krunner.git
diff --git a/PKGBUILD b/PKGBUILD
index f30742263037..7f9bebf75d6b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,37 @@
-# Maintainer: João Figueiredo <jf dot mundox at gmail dot com>
+# Merged with official ABS krunner PKGBUILD by João, 2021/02/01 (all respective contributors apply herein)
+# Maintainer: João Figueiredo <jf.mundox@gmail.com>
 # Contributor: Felix Golatofski <contact@xdfr.de>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Antonio Rojas <arojas@archlinux.org>
 
-_pkgname=krunner
-pkgname=$_pkgname-git
-pkgver=r564.83fdd52
+pkgname=krunner-git
+pkgver=5.79.0_r569.geaaf2ca
 pkgrel=1
 pkgdesc='Framework for providing different actions given a string query'
-arch=('i686' 'x86_64')
+arch=($CARCH)
 url='https://community.kde.org/Frameworks'
-license=('LGPL')
-groups=(kf5)
-depends=(plasma-framework threadweaver)
-makedepends=(extra-cmake-modules kdoctools doxygen git qt5-tools)
-conflicts=("$_pkgname")
-provides=("$_pkgname")
-source=('git+https://github.com/KDE/krunner.git')
+license=(LGPL)
+groups=(kf5-git)
+depends=(plasma-framework-git threadweaver-git)
+makedepends=(git extra-cmake-modules-git kdoctools-git doxygen qt5-tools qt5-doc)
+conflicts=(${pkgname%-git})
+provides=(${pkgname%-git})
+source=("git+https://github.com/KDE/${pkgname%-git}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd $srcdir/$_pkgname
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-  cd $srcdir/$_pkgname
-  mkdir -p build
+  cd ${pkgname%-git}
+  _ver="$(grep -m1 "set(KF5\?_VERSION" CMakeLists.txt | cut -d '"' -f2 | tr - .)"
+  echo "${_ver}_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cd $srcdir/$_pkgname/build
-  cmake ../ \
+  cmake -B build -S ${pkgname%-git} \
     -DBUILD_TESTING=OFF \
     -DBUILD_QCH=ON
-  make
+  cmake --build build
 }
 
 package() {
-  cd $srcdir/$_pkgname/build
-  make DESTDIR="$pkgdir" install
-  install -Dm644 ../LICENSES/* -t "$pkgdir/usr/share/licenses/$_pkgname/"
+  DESTDIR="$pkgdir" cmake --install build
 }