Update/rebase to 5.15.7

5 files changed, 17 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 48d4ccb45945..fd1786fa58aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-qt5-declarative-static
 	pkgdesc = Classes for QML and JavaScript languages (mingw-w64)
-	pkgver = 5.15.6+kde+r19
+	pkgver = 5.15.7+kde+r18
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = any
@@ -19,13 +19,13 @@ pkgbase = mingw-w64-qt5-declarative-static
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = git+https://invent.kde.org/qt/qt/qtdeclarative#commit=e1ecf1c4e09b2f1d04f94971771019e59a50679f
+	source = git+https://invent.kde.org/qt/qt/qtdeclarative#commit=45d43c04088efb8346979f633f72bb1f23183461
 	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 = 93ca828371ec1ca99cf94c0f57a6558ee362190120dc009146aff0c4d9afea8a
-	sha256sums = 382e8325139c465a9b687d6b40c2b81e74258fbf30e8feacb19cb80372ca0b86
-	sha256sums = 560e481e059960d957a5ed6e9b0a96c5a62b1ca0198203dbe490a454b9ee2608
+	sha256sums = 7ee4d37402bc2b1871303dad61b75bd0ecb5a05124ca6bf50880ef1102d3abd1
+	sha256sums = 1e5e570c62935ea756ad7295292e8bcfc3436aa4582f4f095dede10f2bcefc9c
+	sha256sums = ae26e44a85751660c1d4c26d0bf61436186703d0b050f03c6c5084b2b2d8ee08
 
 pkgname = mingw-w64-qt5-declarative-static
diff --git a/0001-Ensure-static-plugins-are-exported.patch b/0001-Ensure-static-plugins-are-exported.patch
index 8b6fde597ce5..c30b33fc5120 100644
--- a/0001-Ensure-static-plugins-are-exported.patch
+++ b/0001-Ensure-static-plugins-are-exported.patch
@@ -1,4 +1,4 @@
-From 83e49e77be2f909caab679b3b26f3f63d5f410ad Mon Sep 17 00:00:00 2001
+From 215c69aebf14203ff7421f428bcf408a1bb9992e 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.37.3
+2.38.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 b0b8befe2ca8..7c837419df3d 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 228400565e48d53d0b6c0b79a29484af5e08adc2 Mon Sep 17 00:00:00 2001
+From dc176daed491b3493b76c2de97777aab775abe60 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.37.3
+2.38.1
 
diff --git a/0003-Disable-d3d12-requiring-fxc.exe.patch b/0003-Disable-d3d12-requiring-fxc.exe.patch
index 1ee754fdc02f..419557bd1e93 100644
--- a/0003-Disable-d3d12-requiring-fxc.exe.patch
+++ b/0003-Disable-d3d12-requiring-fxc.exe.patch
@@ -1,4 +1,4 @@
-From 0445f6c4f3755318c39bb5207031f230bdbb270b Mon Sep 17 00:00:00 2001
+From 71967ec36ac84ac199574624b4da149af4df5e71 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.37.3
+2.38.1
 
diff --git a/PKGBUILD b/PKGBUILD
index b2ffb271a900..a2a9277e5c7f 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,16 +14,16 @@
 
 _qt_module=qtdeclarative
 pkgname=mingw-w64-qt5-declarative-static
-pkgver=5.15.6
+pkgver=5.15.7
 pkgrel=1
 arch=('any')
 pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
 depends=('mingw-w64-qt5-base-static')
 makedepends=('mingw-w64-gcc' 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'python')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=e1ecf1c4e09b2f1d04f94971771019e59a50679f
+_commit=45d43c04088efb8346979f633f72bb1f23183461
 _basever=$pkgver
-pkgver+=+kde+r19
+pkgver+=+kde+r18
 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'
-            '93ca828371ec1ca99cf94c0f57a6558ee362190120dc009146aff0c4d9afea8a'
-            '382e8325139c465a9b687d6b40c2b81e74258fbf30e8feacb19cb80372ca0b86'
-            '560e481e059960d957a5ed6e9b0a96c5a62b1ca0198203dbe490a454b9ee2608')
+            '7ee4d37402bc2b1871303dad61b75bd0ecb5a05124ca6bf50880ef1102d3abd1'
+            '1e5e570c62935ea756ad7295292e8bcfc3436aa4582f4f095dede10f2bcefc9c'
+            'ae26e44a85751660c1d4c26d0bf61436186703d0b050f03c6c5084b2b2d8ee08')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'