Merged with official ABS kdelibs4support PKGBUILD

2 files changed, 28 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cf4b6d5748d0..ebbd80dffbb0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,22 @@
 pkgbase = kdelibs4support-git
-	pkgdesc = Porting aid from KDELibs4 (Git)
-	pkgver = r945.b17aa990
+	pkgdesc = Porting aid from KDELibs4
+	pkgver = 5.79.0_r996.ge6dde367
 	pkgrel = 1
 	url = https://community.kde.org/Frameworks
-	arch = i686
 	arch = x86_64
-	groups = kf5-aids
+	groups = kf5-aids-git
 	license = LGPL
-	makedepends = extra-cmake-modules
 	makedepends = git
-	makedepends = kdoctools
+	makedepends = extra-cmake-modules-git
+	makedepends = kdoctools-git
 	makedepends = qt5-tools
 	makedepends = networkmanager
 	makedepends = perl-uri
-	makedepends = kdesignerplugin
-	depends = kunitconversion
-	depends = kitemmodels
-	depends = kemoticons
-	depends = kded
-	depends = kparts
+	makedepends = kdesignerplugin-git
+	depends = kunitconversion-git
+	depends = kitemmodels-git
+	depends = kemoticons-git
+	depends = kparts-git
 	depends = perl
 	provides = kdelibs4support
 	conflicts = kdelibs4support
diff --git a/PKGBUILD b/PKGBUILD
index d002702865d7..bbdc747c6c73 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,41 @@
-# Maintainer: João Figueiredo <jf dot mundox at gmail dot com>
+# Merged with official ABS kdelibs4support 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: Andrea Scarpino <andrea@archlinux.org>
 
-_pkgname=kdelibs4support
-pkgname=$_pkgname-git
-pkgver=r945.b17aa990
+pkgname=kdelibs4support-git
+pkgver=5.79.0_r996.ge6dde367
 pkgrel=1
-pkgdesc='Porting aid from KDELibs4 (Git)'
-arch=(i686 x86_64)
+pkgdesc='Porting aid from KDELibs4'
+arch=($CARCH)
 url='https://community.kde.org/Frameworks'
 license=(LGPL)
-depends=(kunitconversion kitemmodels kemoticons kded kparts perl)
-makedepends=(extra-cmake-modules git kdoctools qt5-tools networkmanager perl-uri kdesignerplugin)
-conflicts=(kdelibs4support)
-provides=(kdelibs4support)
-groups=(kf5-aids)
-source=("git+https://github.com/KDE/kdelibs4support.git")
+depends=(kunitconversion-git kitemmodels-git kemoticons-git kparts-git perl)
+makedepends=(git extra-cmake-modules-git kdoctools-git qt5-tools networkmanager perl-uri kdesignerplugin-git)
+conflicts=(${pkgname%-git})
+provides=(${pkgname%-git})
+groups=(kf5-aids-git)
+source=("git+https://github.com/KDE/${pkgname%-git}.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd $srcdir/$_pkgname
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
-
-prepare() {
-  cd $srcdir/$_pkgname
-  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 $srcdir/$_pkgname/build
-  cmake ../ \
+  cmake -B build -S ${pkgname%-git} \
     -DCMAKE_INSTALL_LIBEXECDIR=lib \
     -DBUILD_TESTING=OFF
-  make
+  cmake --build build
 }
 
 package() {
-  cd $srcdir/$_pkgname/build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
 
 # cert bundle seems to be hardcoded
 # link it to the one from ca-certificates
   rm -f "$pkgdir"/usr/share/kf5/kssl/ca-bundle.crt
   ln -sf /etc/ssl/certs/ca-certificates.crt "$pkgdir"/usr/share/kf5/kssl/ca-bundle.crt
-
-  install -Dm644 ../COPYING.LIB "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
 }