Merged with official ABS systemsettings PKGBUILD

2 files changed, 28 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index de765f225b4a..eb18ddadfb84 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,19 @@
 pkgbase = systemsettings-git
-	pkgdesc = KDE system settings
-	pkgver = r2234.079b7928
+	pkgdesc = KDE system manager for hardware, software, and workspaces
+	pkgver = 5.21.80_r2365.g10f63700
 	pkgrel = 1
-	url = https://projects.kde.org/projects/kde/kde-workspace
-	arch = i686
+	url = https://kde.org/plasma-desktop/
 	arch = x86_64
-	groups = plasma
+	groups = plasma-git
 	license = LGPL
-	makedepends = extra-cmake-modules-git
 	makedepends = git
+	makedepends = extra-cmake-modules-git
 	makedepends = kdoctools-git
-	makedepends = python
-	depends = kcmutils-git
-	depends = khtml-git
+	depends = plasma-workspace-git
 	provides = systemsettings
 	conflicts = systemsettings
-	conflicts = kde-workspace<0
 	source = git+https://github.com/KDE/systemsettings.git
-	md5sums = SKIP
+	sha256sums = SKIP
 
 pkgname = systemsettings-git
 
diff --git a/PKGBUILD b/PKGBUILD
index e9138a96f440..29b59dc6c02d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,34 @@
-# Maintainer: João Figueiredo <jf dot mundox at gmail dot com>
+# Merged with official ABS systemsettings PKGBUILD by João, 2021/02/01 (all respective contributors apply herein)
+# Maintainer: João Figueiredo <jf.mundox@gmail.com>
 # Contributor: Antonio Rojas <nqn1976 @ gmail.com>
 
 pkgname=systemsettings-git
-pkgver=r2234.079b7928
+pkgver=5.21.80_r2365.g10f63700
 pkgrel=1
-pkgdesc='KDE system settings'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/kde-workspace'
-license=('LGPL')
-depends=('kcmutils-git' 'khtml-git')
-makedepends=('extra-cmake-modules-git' 'git' 'kdoctools-git' 'python')
-conflicts=('systemsettings' 'kde-workspace<0')
-provides=('systemsettings')
-source=('git+https://github.com/KDE/systemsettings.git')
-groups=('plasma')
-md5sums=('SKIP')
+pkgdesc='KDE system manager for hardware, software, and workspaces'
+arch=($CARCH)
+url='https://kde.org/plasma-desktop/'
+license=(LGPL)
+depends=(plasma-workspace-git)
+makedepends=(git extra-cmake-modules-git kdoctools-git)
+conflicts=(${pkgname%-git})
+provides=(${pkgname%-git})
+groups=(plasma-git)
+source=("git+https://github.com/KDE/${pkgname%-git}.git")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd systemsettings
-  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(PROJECT_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 ../systemsettings \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKDE_INSTALL_LIBDIR=lib \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-  make
+  cmake -B build -S ${pkgname%-git} \
+    -DBUILD_TESTING=OFF
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="$pkgdir" cmake --install build
 }