Merged with official ABS kpeople PKGBUILD

2 files changed, 31 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1186f03673e0..5ac22fef94ed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,22 @@
 pkgbase = kpeople-git
 	pkgdesc = A library that provides access to all contacts and the people who hold them
-	pkgver = r1257.c68b83b
+	pkgver = 5.79.0_r1292.gb4d64c7
 	pkgrel = 1
-	url = http://community.kde.org/KTp/libkpeople
-	arch = i686
+	url = https://community.kde.org/Frameworks
 	arch = x86_64
+	groups = kf5-git
 	license = LGPL
-	makedepends = extra-cmake-modules-git
 	makedepends = git
-	makedepends = python
+	makedepends = extra-cmake-modules-git
+	makedepends = doxygen
+	makedepends = qt5-tools
+	makedepends = qt5-doc
+	makedepends = qt5-declarative
+	depends = kcoreaddons-git
+	depends = ki18n-git
 	depends = kwidgetsaddons-git
 	depends = kitemviews-git
+	optdepends = qt5-declarative: QML bindings
 	provides = kpeople
 	conflicts = kpeople
 	source = git+https://github.com/KDE/kpeople.git
diff --git a/PKGBUILD b/PKGBUILD
index b46fcdf14f03..6c5633d0d0cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,36 @@
-# Maintainer: João Figueiredo <jf dot mundox at gmail dot com>
+# Merged with official ABS kpeople PKGBUILD by João, 2021/02/01 (all respective contributors apply herein)
+# Maintainer: João Figueiredo <jf.mundox@gmail.com>
 # Contributor: Antonio Rojas 
 
 pkgname=kpeople-git
-pkgver=r1257.c68b83b
+pkgver=5.79.0_r1292.gb4d64c7
 pkgrel=1
 pkgdesc='A library that provides access to all contacts and the people who hold them'
-arch=(i686 x86_64)
-url='http://community.kde.org/KTp/libkpeople'
+arch=($CARCH)
+url='https://community.kde.org/Frameworks'
 license=(LGPL)
-depends=(kwidgetsaddons-git kitemviews-git)
-makedepends=(extra-cmake-modules-git git python)
-conflicts=(kpeople)
-provides=(kpeople)
-source=('git+https://github.com/KDE/kpeople.git')
+depends=(kcoreaddons-git ki18n-git kwidgetsaddons-git kitemviews-git)
+makedepends=(git extra-cmake-modules-git doxygen qt5-tools qt5-doc qt5-declarative)
+conflicts=(${pkgname%-git})
+provides=(${pkgname%-git})
+optdepends=('qt5-declarative: QML bindings')
+groups=(kf5-git)
+source=("git+https://github.com/KDE/${pkgname%-git}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd kpeople
-  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 ../kpeople \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE_INSTALL_LIBDIR=lib \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-  make
+  cmake -B build -S ${pkgname%-git} \
+    -DBUILD_TESTING=OFF \
+    -DBUILD_QCH=ON
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 }