Merged with official ABS kdecoration PKGBUILD

2 files changed, 27 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 52d6f4743bfd..a790574494f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,14 @@
 pkgbase = kdecoration-git
-	pkgdesc = Plugin based library to create window decorations (Git)
-	pkgver = v5.19.90.r1.g46b7027
+	pkgdesc = Plugin based library to create window decorations
+	pkgver = 5.21.80_r248.g54d5b27
 	pkgrel = 1
-	url = https://www.kde.org/workspaces/plasmadesktop/
-	arch = i686
+	url = https://kde.org/plasma-desktop/
 	arch = x86_64
-	groups = plasma
-	license = LGPL3.0
-	makedepends = extra-cmake-modules
+	groups = plasma-git
+	license = LGPL
 	makedepends = git
-	depends = ki18n
+	makedepends = extra-cmake-modules-git
+	depends = ki18n-git
 	provides = kdecoration
 	conflicts = kdecoration
 	source = git+https://github.com/KDE/kdecoration.git
diff --git a/PKGBUILD b/PKGBUILD
index 14bd27cad673..008f18937612 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,36 @@
-# Maintainer: João Figueiredo <jf dot mundox at gmail dot com>
+# Merged with official ABS kdecoration 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: Antonio Rojas <arojas@archlinux.org>
 # Contributor: Henri Chain <henri@henricha.in>
 
-_pkgname=kdecoration
-pkgname=$_pkgname-git
-pkgver=v5.19.90.r1.g46b7027
+pkgname=kdecoration-git
+pkgver=5.21.80_r248.g54d5b27
 pkgrel=1
-pkgdesc='Plugin based library to create window decorations (Git)'
-arch=(i686 x86_64)
-url='https://www.kde.org/workspaces/plasmadesktop/'
-license=(LGPL3.0)
-depends=(ki18n)
-makedepends=(extra-cmake-modules git)
-conflicts=(kdecoration)
-provides=(kdecoration)
-groups=(plasma)
-source=('git+https://github.com/KDE/kdecoration.git')
+pkgdesc='Plugin based library to create window decorations'
+arch=($CARCH)
+url='https://kde.org/plasma-desktop/'
+license=(LGPL)
+depends=(ki18n-git)
+makedepends=(git extra-cmake-modules-git)
+conflicts=(${pkgname%-git})
+provides=(${pkgname%-git})
+groups=(plasma-git)
+source=("git+https://github.com/KDE/${pkgname%-git}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd $srcdir/$_pkgname
-  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
-  cd $srcdir/$_pkgname
-  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 $srcdir/$_pkgname/build
-  cmake ../ \
+  cmake -B build -S ${pkgname%-git} \
     -DBUILD_TESTING=OFF
-  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
 }