From 31b84416988e09e69de84cc339f34591c5ee12f5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 24 Feb 2024 21:59:32 +0100
Subject: [PATCH] Update mingw-w64-extra-cmake-modules and -kirigami2 to 6.0.0

Not tested yet
---
 extra-cmake-modules/mingw-w64/PKGBUILD | 19 +++++++++----------
 kirigami2/mingw-w64/PKGBUILD           | 16 ++++++++++------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/extra-cmake-modules/mingw-w64/PKGBUILD b/extra-cmake-modules/mingw-w64/PKGBUILD
index 5dceaa03..0157e83e 100644
--- a/extra-cmake-modules/mingw-w64/PKGBUILD
+++ b/extra-cmake-modules/mingw-w64/PKGBUILD
@@ -1,5 +1,6 @@
-pkgname=mingw-w64-extra-cmake-modules
-pkgver=5.102.0
+_pkgname=extra-cmake-modules
+pkgname=mingw-w64-$_pkgname
+pkgver=6.0.0
 pkgrel=1
 arch=(any)
 pkgdesc="Extra modules and scripts for CMake (mingw-w64)"
@@ -8,14 +9,12 @@ license=("LGPL")
 depends=(mingw-w64-cmake)
 options=(staticlibs !strip !buildflags)
 url="https://community.kde.org/Frameworks"
-source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/extra-cmake-modules-${pkgver}.tar.xz"{,.sig}
-"set-AUTOSTATICPLUGINS.patch"
-"05aa27dc0e14dab407379a4d22f895e9eff13cc0.patch")
-sha256sums=('f259aeb5a8e046ee2a0e658645f3af6d3e42145d3ae576f305b2b6e24a297f9b'
-            'SKIP'
-            '30bdcedab402c69ea0db3460f5a23cbd226a5cd1e12b13926b8a65df773e14a0'
-            '7e44cf56a8274c8166eaf02e60c2d34e5048992a7e3c8309b998b762a394e909')
-validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB) # David Faure <faure@kde.org>
+source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$_pkgname-$pkgver.tar.xz{,.sig})
+sha256sums=('23992bf19db717156b7d6dd13118caa79fd57f090beb062e8308db3c09f70d0c'
+            'SKIP')
+validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB  # David Faure <faure@kde.org>
+              E0A3EB202F8E57528E13E72FD7574483BB57B18D) # Jonathan Esk-Riddell <jr@jriddell.org>
+options=(!buildflags staticlibs !strip !emptydirs)
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
diff --git a/kirigami2/mingw-w64/PKGBUILD b/kirigami2/mingw-w64/PKGBUILD
index 426dace7..bc1f849d 100644
--- a/kirigami2/mingw-w64/PKGBUILD
+++ b/kirigami2/mingw-w64/PKGBUILD
@@ -4,9 +4,9 @@
 # All my PKGBUILDs are managed at https://github.com/Martchus/PKGBUILDs where
 # you also find the URL of a binary repository.
 
-_pkgname=kirigami2
-pkgname=mingw-w64-$_pkgname
-pkgver=5.94.0
+_pkgname=kirigami
+pkgname=mingw-w64-${_pkgname}2
+pkgver=6.0.0
 pkgrel=1
 pkgdesc="A QtQuick based components set (mingw-w64)"
 arch=('any')
@@ -14,10 +14,14 @@ url='https://community.kde.org/Frameworks'
 license=(LGPL)
 depends=(mingw-w64-crt mingw-w64-qt5-quickcontrols mingw-w64-qt5-quickcontrols2 mingw-w64-qt5-graphicaleffects)
 makedepends=(mingw-w64-gcc mingw-w64-cmake mingw-w64-extra-cmake-modules mingw-w64-qt5-tools mingw-w64-qt5-svg kpackage)
-source=("https://download.kde.org/stable/frameworks/${pkgver%.*}/$_pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('d7f27da3325feb339f4e1a3db78df44f05e4f505f36e15c7caeac04da0428e39'
+source=(https://download.kde.org/stable/frameworks/${pkgver%.*}/$_pkgname-$pkgver.tar.xz{,.sig})
+sha256sums=('ed0f56c89249fb92a9af99a94fd13542abbae4a8f1613aaaa2bfab87914b601a'
             'SKIP')
-validpgpkeys=('53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB') # David Faure <faure@kde.org>
+validpgpkeys=(53E6B47B45CEA3E0D5B7457758D0EE648A48B3BB  # David Faure <faure@kde.org>
+              E0A3EB202F8E57528E13E72FD7574483BB57B18D) # Jonathan Esk-Riddell <jr@jriddell.org>
+#_commit=05626819a0ed2f5b3db65191803b237992cbf17d
+#source=(git+https://invent.kde.org/frameworks/kirigami.git#commit=$_commit)
+#sha256sums=(SKIP)
 options=(!buildflags staticlibs !strip !emptydirs)
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'