Merged with official ABS kjs PKGBUILD

2 files changed, 24 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 34b091784fba..b2819ff5993c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = kjs-git
 	pkgdesc = Support for JS scripting in applications
-	pkgver = r288.6be4429
+	pkgver = 5.79.0_r311.g9b9dd97
 	pkgrel = 1
-	url = https://projects.kde.org/projects/frameworks/kjs
-	arch = i686
+	url = https://community.kde.org/Frameworks
 	arch = x86_64
-	groups = kf5-aids
+	groups = kf5-aids-git
 	license = LGPL
-	makedepends = extra-cmake-modules-git
 	makedepends = git
+	makedepends = extra-cmake-modules-git
 	makedepends = kdoctools-git
 	depends = qt5-base
 	provides = kjs
 	conflicts = kjs
 	source = git+https://github.com/KDE/kjs.git
-	md5sums = SKIP
+	sha256sums = SKIP
 
 pkgname = kjs-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 391ab71c4c42..59c34f3b60a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,34 @@
-# Maintainer: João Figueiredo <jf dot mundox at gmail dot com>
+# Merged with official ABS kjs PKGBUILD by João, 2021/02/01 (all respective contributors apply herein)
+# Maintainer: João Figueiredo <jf.mundox@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kjs-git
-pkgver=r288.6be4429
+pkgver=5.79.0_r311.g9b9dd97
 pkgrel=1
 pkgdesc='Support for JS scripting in applications'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/frameworks/kjs'
-license=('LGPL')
-depends=('qt5-base')
-makedepends=('extra-cmake-modules-git' 'git' 'kdoctools-git')
-groups=('kf5-aids')
-conflicts=('kjs')
-provides=('kjs')
-source=('git+https://github.com/KDE/kjs.git')
-md5sums=('SKIP')
+arch=($CARCH)
+url='https://community.kde.org/Frameworks'
+license=(LGPL)
+depends=(qt5-base)
+makedepends=(git extra-cmake-modules-git kdoctools-git)
+conflicts=(${pkgname%-git})
+provides=(${pkgname%-git})
+groups=(kf5-aids-git)
+source=("git+https://github.com/KDE/${pkgname%-git}.git")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd kjs
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-  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 build
-  cmake ../kjs \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKDE_INSTALL_LIBDIR=lib \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+  cmake -B build -S ${pkgname%-git} \
     -DBUILD_TESTING=OFF
-  make
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }