Rebase against 5.15.3

6 files changed, 20 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 366a6f789454..d598f9de29c4 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+kde+r42
+	pkgver = 5.15.3+kde+r20
 	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=8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4
+	source = git+https://invent.kde.org/qt/qt/qtdeclarative#commit=02105099301450c890e1caba977ef44efdc43da7
 	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 = 70473beee156c9c2a5b3a0f60f18dc3b5662d818b999aad9c9273a5284b3be90
-	sha256sums = 15f121f1569d3fbb131d853ecf14d9e4f573ed94008131144f617ffaf81ae9a9
-	sha256sums = ac1ce1293a54cbfb8a9ffee43272346b8d71676f4cf93f2a1a00878fff47fd7a
+	sha256sums = e6b40d364b9f6fd4409c62d3cea9072de8ad95ad1a7be2ec8b51c4555b11f926
+	sha256sums = 75f4f331b29cbd1a09a7330cf716b55c70c27b7fd23929bdec710416ba84acef
+	sha256sums = 7290ced093d45e53198c6082398310e61770e2525eaaa855fe0d1db1ef72e8e1
 
 pkgname = mingw-w64-qt5-declarative
diff --git a/0001-Ensure-static-plugins-are-exported.patch b/0001-Ensure-static-plugins-are-exported.patch
index 0e096dbc5849..222143990fdd 100644
--- a/0001-Ensure-static-plugins-are-exported.patch
+++ b/0001-Ensure-static-plugins-are-exported.patch
@@ -1,4 +1,4 @@
-From d84477262d512fad230ad098d8ca33306ad3d047 Mon Sep 17 00:00:00 2001
+From 0120487a66bef4b95249517d3d1d16d58e569f82 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.34.1
+2.35.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 b47915fc9e9b..463e93b4bd3c 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 8b9f3277047ae6a69ee89766414ed3e03f4d10b3 Mon Sep 17 00:00:00 2001
+From b47eb78bd39a2db8eaebe9c21359c114ea66bf17 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.34.1
+2.35.1
 
diff --git a/0003-Disable-d3d12-requiring-fxc.exe.patch b/0003-Disable-d3d12-requiring-fxc.exe.patch
index d68f68b07fdb..9022d877dd81 100644
--- a/0003-Disable-d3d12-requiring-fxc.exe.patch
+++ b/0003-Disable-d3d12-requiring-fxc.exe.patch
@@ -1,4 +1,4 @@
-From e2f490c9a1caa3618c983d111dae33a618ee04b8 Mon Sep 17 00:00:00 2001
+From dc60d4a4ece8c116e8d03bf876d27eee2d67cf51 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.34.1
+2.35.1
 
diff --git a/PKGBUILD b/PKGBUILD
index 2558ebc66a29..fc164ee36f9f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,15 +14,16 @@
 
 _qt_module=qtdeclarative
 pkgname=mingw-w64-qt5-declarative
-pkgver=5.15.2
+pkgver=5.15.3
 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=8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4
-pkgver+=+kde+r42
+_commit=02105099301450c890e1caba977ef44efdc43da7
+_basever=$pkgver
+pkgver+=+kde+r20
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
@@ -33,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'
-            '70473beee156c9c2a5b3a0f60f18dc3b5662d818b999aad9c9273a5284b3be90'
-            '15f121f1569d3fbb131d853ecf14d9e4f573ed94008131144f617ffaf81ae9a9'
-            'ac1ce1293a54cbfb8a9ffee43272346b8d71676f4cf93f2a1a00878fff47fd7a')
+            'e6b40d364b9f6fd4409c62d3cea9072de8ad95ad1a7be2ec8b51c4555b11f926'
+            '75f4f331b29cbd1a09a7330cf716b55c70c27b7fd23929bdec710416ba84acef'
+            '7290ced093d45e53198c6082398310e61770e2525eaaa855fe0d1db1ef72e8e1')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
@@ -43,14 +44,12 @@ _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`
+  echo "$_basever+kde+r"`git rev-list --count v$_basever-lts-lgpl..$_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"
diff --git a/PKGBUILD.sh.ep b/PKGBUILD.sh.ep
index 7ac9ee3f4972..1555219b0a2c 100644
--- a/PKGBUILD.sh.ep
+++ b/PKGBUILD.sh.ep
@@ -6,7 +6,7 @@
 # Contributor: ohmyarch
 % end
 \
-pkgver=5.15.2
+pkgver=5.15.3
 pkgrel=1
 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>)
 pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'