Merged with official ABS kirigami PKGBUILD

2 files changed, 41 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f089e5d129d..0e8117d4dc21 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,26 @@
 pkgbase = kirigami-git
-	pkgdesc = A set of QML components for mobile/desktop convergent applications made by KDE
-	pkgver = v2.2.0.r1515.g07876274
+	pkgdesc = A QtQuick based components set
+	pkgver = 6.0.0_r4407.g7f9b5b4a
 	pkgrel = 1
-	url = https://quickgit.kde.org/?p=kirigami.git
-	arch = i686
+	url = https://community.kde.org/Frameworks
 	arch = x86_64
-	groups = plasma
-	license = LGPL
-	makedepends = extra-cmake-modules
+	groups = kf6-git
+	license = LGPL-2.0-only
+	license = LGPL-3.0-only
 	makedepends = git
-	makedepends = qt5-svg
-	depends = qt5-quickcontrols2
-	depends = qt5-graphicaleffects
-	provides = kirigami2
-	conflicts = kirigami2
-	source = git+https://invent.kde.org/frameworks/kirigami.git
-	md5sums = SKIP
+	makedepends = doxygen
+	makedepends = extra-cmake-modules-git
+	makedepends = qt6-doc
+	makedepends = qt6-shadertools
+	makedepends = qt6-tools
+	depends = gcc-libs
+	depends = glibc
+	depends = qt6-base
+	depends = qt6-declarative
+	depends = qt6-svg
+	provides = kirigami
+	conflicts = kirigami
+	source = git+https://github.com/KDE/kirigami.git
+	sha256sums = SKIP
 
 pkgname = kirigami-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 8daa0dd600af..7bad9627ef68 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,32 @@
-# Maintainer: zanny <lordzanny@gmail.com>
-# Maintainer: Aleix Pol Gonzalez <aleixpol@kde.org>
+# Merged with official ABS kirigami PKGBUILD by João, 2024/03/01 (all respective contributors apply herein)
+# Maintainer: João Figueiredo & chaotic-aur <islandc0der@chaotic.cx>
 
 pkgname=kirigami-git
-_name=${pkgname%-git}
-pkgver=v2.2.0.r1515.g07876274
+pkgver=6.0.0_r4407.g7f9b5b4a
 pkgrel=1
-pkgdesc='A set of QML components for mobile/desktop convergent applications made by KDE'
-arch=('i686' 'x86_64')
-url='https://quickgit.kde.org/?p=kirigami.git'
-license=(LGPL)
-depends=(qt5-quickcontrols2 qt5-graphicaleffects)
-makedepends=(extra-cmake-modules git qt5-svg)
-conflicts=(kirigami2)
-provides=(kirigami2)
-groups=(plasma)
-source=("git+https://invent.kde.org/frameworks/$_name.git")
-md5sums=('SKIP')
+pkgdesc='A QtQuick based components set'
+arch=($CARCH)
+url='https://community.kde.org/Frameworks'
+license=(LGPL-2.0-only LGPL-3.0-only)
+depends=(gcc-libs glibc qt6-base qt6-declarative qt6-svg)
+makedepends=(git doxygen extra-cmake-modules-git qt6-doc qt6-shadertools qt6-tools)
+groups=(kf6-git)
+conflicts=(${pkgname%-git})
+provides=(${pkgname%-git})
+source=("git+https://github.com/KDE/${pkgname%-git}.git")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd $_name
-  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  cd ${pkgname%-git}
+  _ver="$(grep -m1 'set(KF_VERSION' CMakeLists.txt | cut -d '"' -f2 | tr - .)"
+  echo "${_ver}_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
 }
 
 build() {
-  cmake -B build -S $_name
+  cmake -B build -S ${pkgname%-git} \
+    -DQT_MAJOR_VERSION=6 \
+    -DBUILD_TESTING=OFF \
+    -DBUILD_QCH=ON
   cmake --build build
 }