Merged with official ABS kiconthemes PKGBUILD

2 files changed, 31 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1234455a7802..deffc3b22d47 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,25 @@
 pkgbase = kiconthemes-git
-	pkgdesc = KIconThemes
-	pkgver = v4.100.0.rc1.r400.gd6b1a91
+	pkgdesc = Support for icon themes
+	pkgver = 5.79.0_r469.gc161dfe
 	pkgrel = 1
-	url = https://projects.kde.org/projects/frameworks/kiconthemes
-	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-wayland
+	makedepends = qt5-doc
 	depends = qt5-svg
 	depends = kconfigwidgets-git
 	depends = kitemviews-git
 	depends = karchive-git
+	optdepends = breeze-icons-git: fallback icon theme
 	provides = kiconthemes
 	conflicts = kiconthemes
 	source = git+https://github.com/KDE/kiconthemes.git
-	md5sums = SKIP
+	sha256sums = SKIP
 
 pkgname = kiconthemes-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 939966f9ecd4..8b7b5341fb6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,36 @@
-# Maintainer: João Figueiredo <jf dot mundox at gmail dot com>
+# Merged with official ABS kiconthemes PKGBUILD by João, 2021/02/01 (all respective contributors apply herein)
+# Maintainer: João Figueiredo <jf.mundox@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kiconthemes-git
-pkgver=v4.100.0.rc1.r400.gd6b1a91
+pkgver=5.79.0_r469.gc161dfe
 pkgrel=1
-pkgdesc='KIconThemes'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/frameworks/kiconthemes'
-license=('LGPL')
-depends=('qt5-svg' 'kconfigwidgets-git' 'kitemviews-git' 'karchive-git')
-makedepends=('extra-cmake-modules-git' 'git' 'python' 'qt5-tools' 'qt5-wayland')
-conflicts=(kiconthemes)
-provides=(kiconthemes)
-source=('git+https://github.com/KDE/kiconthemes.git')
-md5sums=('SKIP')
+pkgdesc='Support for icon themes'
+arch=($CARCH)
+url='https://community.kde.org/Frameworks'
+license=(LGPL)
+depends=(qt5-svg kconfigwidgets-git kitemviews-git karchive-git)
+makedepends=(git extra-cmake-modules-git doxygen qt5-tools qt5-doc)
+conflicts=(${pkgname%-git})
+provides=(${pkgname%-git})
+optdepends=('breeze-icons-git: fallback icon theme')
+groups=(kf5-git)
+source=("git+https://github.com/KDE/${pkgname%-git}.git")
+sha256sums=('SKIP')
 
 pkgver() {
   cd ${pkgname%-git}
-  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
-  mkdir -p build
+  _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 ../kiconthemes \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKDE_INSTALL_LIBDIR=lib \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-    -DBUILD_TESTING=OFF
-  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
 }