Update to use KDE fork patches

5 files changed, 29 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c9623612b7a2..bf0fd80a26e3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-qt5-declarative
 	pkgdesc = Classes for QML and JavaScript languages (mingw-w64)
-	pkgver = 5.15.2
+	pkgver = 5.15.2+kde+r24
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = i686
@@ -14,18 +14,19 @@ pkgbase = mingw-w64-qt5-declarative
 	makedepends = mingw-w64-vulkan-headers
 	makedepends = mingw-w64-pkg-config
 	makedepends = python
+	makedepends = git
 	depends = mingw-w64-qt5-base
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz
+	source = git+https://invent.kde.org/qt/qt/qtdeclarative#commit=e203a185cfab199a89a33b903096d6d0023a8a88
 	source = 0001-Ensure-static-plugins-are-exported.patch
 	source = 0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch
 	source = 0003-Disable-d3d12-requiring-fxc.exe.patch
-	sha256sums = c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651
-	sha256sums = 0ba64350a82e050cf86ab507999ed2d813496cc2ab1c738f3aa8da6cb6502460
-	sha256sums = e476a3f619163911aab103304e271ad33194f1ddb9ef25d554f89994077ad792
-	sha256sums = 83ed9816e4581ffe9c67ab2bd28488c5e3ba04c06e6ff558da8844c4a265c9f5
+	sha256sums = SKIP
+	sha256sums = 05e6f881e3c327025bb7693b3622652e37cc0acd1a4c4efebbb8b39d0391e568
+	sha256sums = 451dd25d86f64c641048eda8a6ab7f74c0ffcf99436ca32b149f96e44060a119
+	sha256sums = bc4b056d159920124bd007086a791d657b41ec4d22213fd59200524c386400ab
 
 pkgname = mingw-w64-qt5-declarative
 
diff --git a/0001-Ensure-static-plugins-are-exported.patch b/0001-Ensure-static-plugins-are-exported.patch
index b9bc384c86bc..c0b76679dac6 100644
--- a/0001-Ensure-static-plugins-are-exported.patch
+++ b/0001-Ensure-static-plugins-are-exported.patch
@@ -1,4 +1,4 @@
-From a77306009e96c2dd6d7a3c6eafe9ea39fcf99407 Mon Sep 17 00:00:00 2001
+From 5b23d07532d7622129bdf5093b80d24fd0e72cbe Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 23 Oct 2016 01:18:13 +0200
 Subject: [PATCH 1/3] Ensure static plugins are exported
@@ -19,5 +19,5 @@ index 4242143bca..bccb7b3146 100644
      foreach(_other_plugin ${_qt5qml_other_plugins})
          include(${_other_plugin} OPTIONAL)
 -- 
-2.29.2
+2.31.1
 
diff --git a/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch b/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch
index d0c427e7b6ce..a64dff92d43a 100644
--- a/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch
+++ b/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch
@@ -1,4 +1,4 @@
-From b147be462b1b727470243b83722a3f310d6f0876 Mon Sep 17 00:00:00 2001
+From 3ff37757918247a848198d205d03b8a1f0760b48 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 4 Feb 2017 01:59:59 +0100
 Subject: [PATCH 2/3] Prevent exporting QML parser symbols on static build
@@ -33,5 +33,5 @@ index bf8155c6ec..2bfa230bcc 100644
  #      define QML_PARSER_EXPORT
  #    elif defined(QT_BUILD_QML_LIB)
 -- 
-2.29.2
+2.31.1
 
diff --git a/0003-Disable-d3d12-requiring-fxc.exe.patch b/0003-Disable-d3d12-requiring-fxc.exe.patch
index 4763e3a29f58..a7bffb55f6f8 100644
--- a/0003-Disable-d3d12-requiring-fxc.exe.patch
+++ b/0003-Disable-d3d12-requiring-fxc.exe.patch
@@ -1,4 +1,4 @@
-From 2346e6d7028640b03b58bb358d0569917e8c27e7 Mon Sep 17 00:00:00 2001
+From c08f46e4b43ae0635df976fa0933f499e141b168 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 20 Nov 2020 18:32:31 +0100
 Subject: [PATCH 3/3] Disable d3d12 requiring fxc.exe
@@ -29,5 +29,5 @@ index 39c0c0815c..9cc521a191 100644
  qtConfig(openvg): SUBDIRS += openvg
  
 -- 
-2.29.2
+2.31.1
 
diff --git a/PKGBUILD b/PKGBUILD
index 5156091def9b..c7f76b93b989 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -21,26 +21,36 @@ pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
 depends=('mingw-w64-qt5-base')
 makedepends=('mingw-w64-gcc' 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'python')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
+_commit=e203a185cfab199a89a33b903096d6d0023a8a88
+pkgver+=+kde+r24
+makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
 url='https://www.qt.io/'
-_pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
+_pkgfqn=${_qt_module}
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
         '0001-Ensure-static-plugins-are-exported.patch'
         '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch'
         '0003-Disable-d3d12-requiring-fxc.exe.patch')
-sha256sums=('c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651'
-            '0ba64350a82e050cf86ab507999ed2d813496cc2ab1c738f3aa8da6cb6502460'
-            'e476a3f619163911aab103304e271ad33194f1ddb9ef25d554f89994077ad792'
-            '83ed9816e4581ffe9c67ab2bd28488c5e3ba04c06e6ff558da8844c4a265c9f5')
+sha256sums=('SKIP'
+            '05e6f881e3c327025bb7693b3622652e37cc0acd1a4c4efebbb8b39d0391e568'
+            '451dd25d86f64c641048eda8a6ab7f74c0ffcf99436ca32b149f96e44060a119'
+            'bc4b056d159920124bd007086a791d657b41ec4d22213fd59200524c386400ab')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
 _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared')
 
+pkgver() {
+  cd $_pkgfqn
+  echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit`
+}
+
 prepare() {
   cd "${srcdir}/${_pkgfqn}"
 
+  git revert -n 568763928a78b52373932b01be17e040f7c3fa50 # Revert version bump
+
   # apply patches; further descriptions can be found in patch files itself
   for patch in "$srcdir/"*.patch; do
     patch -p1 -i "$patch"