Update to 5.15.2

7 files changed, 55 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c09524f20494..c9623612b7a2 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.1
+	pkgver = 5.15.2
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = i686
@@ -18,12 +18,14 @@ pkgbase = mingw-w64-qt5-declarative
 	options = !strip
 	options = !buildflags
 	options = staticlibs
-	source = https://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtdeclarative-everywhere-src-5.15.1.tar.xz
+	source = https://download.qt.io/official_releases/qt/5.15/5.15.2/submodules/qtdeclarative-everywhere-src-5.15.2.tar.xz
 	source = 0001-Ensure-static-plugins-are-exported.patch
 	source = 0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch
-	sha256sums = 7e30f0ccba61f9d71720b91d7f7523c23677f23cd96065cb71df1b0df329d768
-	sha256sums = accdeab4cb49857442f680a6013a648108ec4f00078e492475794aa6cc98257e
-	sha256sums = 7ff5093753aa819c6039de796e6ebffa235b51f57403e827b31a90e8c2ffbf60
+	source = 0003-Disable-d3d12-requiring-fxc.exe.patch
+	sha256sums = c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651
+	sha256sums = 0ba64350a82e050cf86ab507999ed2d813496cc2ab1c738f3aa8da6cb6502460
+	sha256sums = e476a3f619163911aab103304e271ad33194f1ddb9ef25d554f89994077ad792
+	sha256sums = 83ed9816e4581ffe9c67ab2bd28488c5e3ba04c06e6ff558da8844c4a265c9f5
 
 pkgname = mingw-w64-qt5-declarative
 
diff --git a/0001-Ensure-static-plugins-are-exported.patch b/0001-Ensure-static-plugins-are-exported.patch
index 5929d8b9aafc..b9bc384c86bc 100644
--- a/0001-Ensure-static-plugins-are-exported.patch
+++ b/0001-Ensure-static-plugins-are-exported.patch
@@ -1,7 +1,7 @@
-From 20cd4da89edeec706cfc4472b0e9a2df58844a7c Mon Sep 17 00:00:00 2001
+From a77306009e96c2dd6d7a3c6eafe9ea39fcf99407 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 23 Oct 2016 01:18:13 +0200
-Subject: [PATCH 1/2] Ensure static plugins are exported
+Subject: [PATCH 1/3] Ensure static plugins are exported
 
 ---
  src/qml/Qt5QmlConfigExtras.cmake.in | 2 +-
@@ -19,5 +19,5 @@ index 4242143bca..bccb7b3146 100644
      foreach(_other_plugin ${_qt5qml_other_plugins})
          include(${_other_plugin} OPTIONAL)
 -- 
-2.28.0
+2.29.2
 
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 2e58a0d82787..d0c427e7b6ce 100644
--- a/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch
+++ b/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch
@@ -1,7 +1,7 @@
-From c7d18dc02b67c3a7db5f2d32759829df27bc9f7d Mon Sep 17 00:00:00 2001
+From b147be462b1b727470243b83722a3f310d6f0876 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 4 Feb 2017 01:59:59 +0100
-Subject: [PATCH 2/2] Prevent exporting QML parser symbols on static build
+Subject: [PATCH 2/3] Prevent exporting QML parser symbols on static build
 
 ---
  src/qml/parser/qqmljsglobal_p.h | 6 +++---
@@ -33,5 +33,5 @@ index bf8155c6ec..2bfa230bcc 100644
  #      define QML_PARSER_EXPORT
  #    elif defined(QT_BUILD_QML_LIB)
 -- 
-2.28.0
+2.29.2
 
diff --git a/0003-Disable-d3d12-requiring-fxc.exe.patch b/0003-Disable-d3d12-requiring-fxc.exe.patch
new file mode 100644
index 000000000000..4763e3a29f58
--- /dev/null
+++ b/0003-Disable-d3d12-requiring-fxc.exe.patch
@@ -0,0 +1,33 @@
+From 2346e6d7028640b03b58bb358d0569917e8c27e7 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
+
+* fxc.exe is not provided by WINE or mingw-w64 and hence not available
+  in our build environment
+* The version from https://github.com/mozilla/fxc2 builds but it does
+  not support all CLI options required by Qt's build system
+* The build error looks like this:
+  ```
+  make[5]: Entering directory '/build/mingw-w64-qt5-declarative/src/qtdeclarative-everywhere-src-5.15.2/build-i686-w64-mingw32-shared/src/plugins/scenegraph/d3d12'
+  fxc.exe /nologo /E VS_VertexColor /T vs_5_0 /Fh vs_vertexcolor.hlslh /build/mingw-w64-qt5-declarative/src/qtdeclarative-everywhere-src-5.15.2/src/plugins/scenegraph/d3d12/shaders/vertexcolor.hlsl
+  make[5]: fxc.exe: No such file or directory
+  make[5]: *** [Makefile.Release:233: vs_vertexcolor.hlslh] Error 127
+  ```
+---
+ src/plugins/scenegraph/scenegraph.pro | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/plugins/scenegraph/scenegraph.pro b/src/plugins/scenegraph/scenegraph.pro
+index 39c0c0815c..9cc521a191 100644
+--- a/src/plugins/scenegraph/scenegraph.pro
++++ b/src/plugins/scenegraph/scenegraph.pro
+@@ -1,5 +1,4 @@
+ TEMPLATE = subdirs
+ QT_FOR_CONFIG += quick
+-qtConfig(d3d12): SUBDIRS += d3d12
+ qtConfig(openvg): SUBDIRS += openvg
+ 
+-- 
+2.29.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 6cca876249eb..5156091def9b 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@
 
 _qt_module=qtdeclarative
 pkgname=mingw-w64-qt5-declarative
-pkgver=5.15.1
+pkgver=5.15.2
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
@@ -27,10 +27,12 @@ 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"
         '0001-Ensure-static-plugins-are-exported.patch'
-        '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch')
-sha256sums=('7e30f0ccba61f9d71720b91d7f7523c23677f23cd96065cb71df1b0df329d768'
-            'accdeab4cb49857442f680a6013a648108ec4f00078e492475794aa6cc98257e'
-            '7ff5093753aa819c6039de796e6ebffa235b51f57403e827b31a90e8c2ffbf60')
+        '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch'
+        '0003-Disable-d3d12-requiring-fxc.exe.patch')
+sha256sums=('c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651'
+            '0ba64350a82e050cf86ab507999ed2d813496cc2ab1c738f3aa8da6cb6502460'
+            'e476a3f619163911aab103304e271ad33194f1ddb9ef25d554f89994077ad792'
+            '83ed9816e4581ffe9c67ab2bd28488c5e3ba04c06e6ff558da8844c4a265c9f5')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
index 74230bc434cd..7ac9ee3f4972 100644
--- a/PKGBUILD.sh.ep
+++ b/PKGBUILD.sh.ep
@@ -6,7 +6,7 @@
 # Contributor: ohmyarch
 % end
 \
-pkgver=5.15.1
+pkgver=5.15.2
 pkgrel=1
 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>)
 pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
diff --git a/qtdeclarative-sha256.txt b/qtdeclarative-sha256.txt
index 57759ad9eb4b..d9d8a92dcd14 100644
--- a/qtdeclarative-sha256.txt
+++ b/qtdeclarative-sha256.txt
@@ -1 +1 @@
-7e30f0ccba61f9d71720b91d7f7523c23677f23cd96065cb71df1b0df329d768
+c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651