Rebase on 5.15.9

6 files changed, 18 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8aac64f03cb7..7e3803c61388 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.8+kde+r21
+	pkgver = 5.15.9+kde+r19
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = i686
@@ -19,13 +19,13 @@ pkgbase = mingw-w64-qt5-declarative
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = git+https://invent.kde.org/qt/qt/qtdeclarative#commit=8defe7bfcae2ac5cb6dc25bfe3678124b09cf6f9
+	source = git+https://invent.kde.org/qt/qt/qtdeclarative#commit=89bf481b9b14f038c5e16421a7fce6dc6523785f
 	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 = SKIP
-	sha256sums = a115202b2bc9f810d905c2efcfca4f213dd64b9e24cc8acc6efff6756198a9c7
-	sha256sums = 1a0d3a66dce26bf0fa518b04ca8f4aedc12757a319b4310cb688c3136ece4a85
-	sha256sums = 62de83169f791a5bedfef7915b701ddacd67c0a84799e07355ebb7081f569fe9
+	sha256sums = 4437fc02e15a6f814af1111d34209a7424a1032aff54b22af47868fd505fad08
+	sha256sums = 17792373be52f230e255125ebb9442215b77cc2ce3988071481741832dbae4c9
+	sha256sums = 97a97599c90e42331554cfcef5f5e5da21642858a93c9d173eff1f1896bcde75
 
 pkgname = mingw-w64-qt5-declarative
diff --git a/0001-Ensure-static-plugins-are-exported.patch b/0001-Ensure-static-plugins-are-exported.patch
index c8cff767fba6..f5bf24598ca2 100644
--- a/0001-Ensure-static-plugins-are-exported.patch
+++ b/0001-Ensure-static-plugins-are-exported.patch
@@ -1,4 +1,4 @@
-From 3ce127cb6c844b0b2a0ed256943c80ba01b8e57a Mon Sep 17 00:00:00 2001
+From d8c699d3be726982e3778ac7ba2838b67b1c68d1 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.39.0
+2.40.0
 
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 2b27f76a7733..1b2fe9ce50b0 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 2964eacb132b456708304a61bb0f7aacc3c99b91 Mon Sep 17 00:00:00 2001
+From c5874f0c16a35cae33b7b374d2cc7f5f7ef3f301 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.39.0
+2.40.0
 
diff --git a/0003-Disable-d3d12-requiring-fxc.exe.patch b/0003-Disable-d3d12-requiring-fxc.exe.patch
index 68811f613172..b895233c8ce6 100644
--- a/0003-Disable-d3d12-requiring-fxc.exe.patch
+++ b/0003-Disable-d3d12-requiring-fxc.exe.patch
@@ -1,4 +1,4 @@
-From c0d07c4c6d4f035d052433f1ab1735a7e7fd39a0 Mon Sep 17 00:00:00 2001
+From 206c29fb1d2b5618f5f5de74ef4cab96e3da5b48 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.39.0
+2.40.0
 
diff --git a/PKGBUILD b/PKGBUILD
index e1949ce81a61..89b997c165da 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,16 +14,16 @@
 
 _qt_module=qtdeclarative
 pkgname=mingw-w64-qt5-declarative
-pkgver=5.15.8
+pkgver=5.15.9
 pkgrel=1
 arch=('i686' 'x86_64')
 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=8defe7bfcae2ac5cb6dc25bfe3678124b09cf6f9
+_commit=89bf481b9b14f038c5e16421a7fce6dc6523785f
 _basever=$pkgver
-pkgver+=+kde+r21
+pkgver+=+kde+r19
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
@@ -34,9 +34,9 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
         '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch'
         '0003-Disable-d3d12-requiring-fxc.exe.patch')
 sha256sums=('SKIP'
-            'a115202b2bc9f810d905c2efcfca4f213dd64b9e24cc8acc6efff6756198a9c7'
-            '1a0d3a66dce26bf0fa518b04ca8f4aedc12757a319b4310cb688c3136ece4a85'
-            '62de83169f791a5bedfef7915b701ddacd67c0a84799e07355ebb7081f569fe9')
+            '4437fc02e15a6f814af1111d34209a7424a1032aff54b22af47868fd505fad08'
+            '17792373be52f230e255125ebb9442215b77cc2ce3988071481741832dbae4c9'
+            '97a97599c90e42331554cfcef5f5e5da21642858a93c9d173eff1f1896bcde75')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
index f1e800fe6ffc..a1ca24f4d667 100644
--- a/PKGBUILD.sh.ep
+++ b/PKGBUILD.sh.ep
@@ -6,7 +6,7 @@
 # Contributor: ohmyarch
 % end
 \
-pkgver=5.15.8
+pkgver=5.15.9
 pkgrel=1
 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>)
 pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'