Merged with official ABS kpackage PKGBUILD

2 files changed, 29 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 22315a4127e9..294cac94ce6e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,24 @@
 pkgbase = kpackage-git
 	pkgdesc = Framework that lets applications manage user installable packages of non-binary assets
-	pkgver = r584.d8c432a
+	pkgver = 5.79.0_r629.ga5c6bd2
 	pkgrel = 1
-	url = https://projects.kde.org/projects/frameworks/kpackage
-	arch = i686
+	url = https://community.kde.org/Frameworks
 	arch = x86_64
-	groups = kf5
+	groups = kf5-git
 	license = LGPL
-	makedepends = extra-cmake-modules-git
 	makedepends = git
+	makedepends = extra-cmake-modules-git
 	makedepends = qt5-tools
-	makedepends = python
+	makedepends = qt5-doc
 	makedepends = kdoctools-git
-	depends = qt5-base
+	makedepends = doxygen
 	depends = karchive-git
 	depends = ki18n-git
 	depends = kcoreaddons-git
-	depends = kconfig-git
 	provides = kpackage
 	conflicts = kpackage
 	source = git+https://github.com/KDE/kpackage.git
-	md5sums = SKIP
+	sha256sums = SKIP
 
 pkgname = kpackage-git
 
diff --git a/PKGBUILD b/PKGBUILD
index bbaf086366bd..5ebe77b7f11a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,37 @@
-# Maintainer: João Figueiredo <jf dot mundox at gmail dot com>
+# Merged with official ABS kpackage PKGBUILD by João, 2021/02/01 (all respective contributors apply herein)
+# Maintainer: João Figueiredo <jf.mundox@gmail.com>
 # Contributor: Antonio Rojas <arojas@archlinux.org>
 # Contributor: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
 
 pkgname=kpackage-git
-pkgver=r584.d8c432a
+pkgver=5.79.0_r629.ga5c6bd2
 pkgrel=1
-pkgdesc="Framework that lets applications manage user installable packages of non-binary assets"
-arch=(i686 x86_64)
-url="https://projects.kde.org/projects/frameworks/kpackage"
+pkgdesc='Framework that lets applications manage user installable packages of non-binary assets'
+arch=($CARCH)
+url='https://community.kde.org/Frameworks'
 license=(LGPL)
-depends=(qt5-base karchive-git ki18n-git kcoreaddons-git kconfig-git)
-makedepends=(extra-cmake-modules-git git qt5-tools python kdoctools-git)
-groups=(kf5)
-conflicts=(kpackage)
-provides=(kpackage)
-source=('git+https://github.com/KDE/kpackage.git')
-md5sums=('SKIP')
+depends=(karchive-git ki18n-git kcoreaddons-git)
+makedepends=(git extra-cmake-modules-git qt5-tools qt5-doc kdoctools-git doxygen)
+conflicts=(${pkgname%-git})
+provides=(${pkgname%-git})
+groups=(kf5-git)
+source=("git+https://github.com/KDE/${pkgname%-git}.git")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd kpackage
-  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 ../kpackage \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKDE_INSTALL_LIBDIR=lib \
-    -DBUILD_TESTING=OFF
-  make
+  cmake -B build -S ${pkgname%-git} \
+    -DCMAKE_INSTALL_LIBEXECDIR=lib \
+    -DBUILD_TESTING=OFF \
+    -DBUILD_QCH=ON
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }