Update to 6.4.0

6 files changed, 22 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 51bb7c77dbd6..573658f445bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-qt6-activeqt-static
 	pkgdesc = ActiveX integration framework (mingw-w64)
-	pkgver = 6.3.2
+	pkgver = 6.4.0
 	pkgrel = 1
 	url = https://www.qt.io
 	arch = any
@@ -21,13 +21,13 @@ pkgbase = mingw-w64-qt6-activeqt-static
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = https://download.qt.io/official_releases/qt/6.3/6.3.2/submodules/qtactiveqt-everywhere-src-6.3.2.tar.xz
+	source = https://download.qt.io/official_releases/qt/6.4/6.4.0/submodules/qtactiveqt-everywhere-src-6.4.0.tar.xz
 	source = 0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
 	source = 0002-Build-tools-for-the-target-platform.patch
 	source = 0003-Fix-compile-error-about-missing-QStringView-overload.patch
-	sha256sums = fc70894425fa064bb486b6323c3ae9f405e462ed32b7494ab830a16429675514
-	sha256sums = 7d7377d77790a8dbb9f80d1b2539ddb848db59782911ba842d4ce4dfa64b8d55
-	sha256sums = 68473136a589f73c4b04455196ee8b9ca627d368a8f7e19a18864c0cc563a7d7
-	sha256sums = 8c94ab1a21a98fca5912f94eb70fbc64cfa4faa55a165bc01276b4c83e2bb3fd
+	sha256sums = 591532f49d7796da1776332d532469fea7a2bcb82aa37f41eed9aafe5ea8aadd
+	sha256sums = 20a2bf72fe2a48d7b58b413be90081e42723f9d623e7367df6a89577527ac6a3
+	sha256sums = d645b4f44157c652444508d0ff57b4796863d1f5ea2d5c608e5154981339f585
+	sha256sums = 07c139f80a5b35532a8f1b3a5624b49a5368b02b816f2deebbaccfeb778d77aa
 
 pkgname = mingw-w64-qt6-activeqt-static
diff --git a/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch b/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
index 3b9f834ffece..519321b56f6a 100644
--- a/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
+++ b/0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
@@ -1,4 +1,4 @@
-From 99ecce1582c58af2c9b100c8e33ab1b531307c0a Mon Sep 17 00:00:00 2001
+From f373dbba285fe3a6e171dd3d4fa0929d9c006085 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 17:21:08 +0200
 Subject: [PATCH 1/3] Handle win64 in dumpcpp and
@@ -11,10 +11,10 @@ See https://bugreports.qt.io/browse/QTBUG-46827
  2 files changed, 12 insertions(+)
 
 diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
-index 29d1ae9..dc871c5 100644
+index d85ca1f..86ac48f 100644
 --- a/src/activeqt/container/qaxbase.cpp
 +++ b/src/activeqt/container/qaxbase.cpp
-@@ -2164,6 +2164,10 @@ void MetaObjectGenerator::readClassInfo()
+@@ -2117,6 +2117,10 @@ void MetaObjectGenerator::readClassInfo()
              const QStringList versions = controls.childGroups();
              for (const QString &version : versions) {
                  tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win32/.")).toString();
@@ -26,10 +26,10 @@ index 29d1ae9..dc871c5 100644
                      break;
              }
 diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
-index 400ecce..ef44327 100644
+index c2120b7..978b7ad 100644
 --- a/tools/dumpcpp/main.cpp
 +++ b/tools/dumpcpp/main.cpp
-@@ -1136,6 +1136,10 @@ int main(int argc, char **argv)
+@@ -1111,6 +1111,10 @@ int main(int argc, char **argv)
              typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString();
              if (QFile::exists(typeLib))
                  break;
@@ -40,7 +40,7 @@ index 400ecce..ef44327 100644
          }
  
          if (!typeLib.isEmpty())
-@@ -1200,6 +1204,10 @@ int main(int argc, char **argv)
+@@ -1175,6 +1179,10 @@ int main(int argc, char **argv)
              typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString();
              if (QFile::exists(typeLib))
                  break;
diff --git a/0002-Build-tools-for-the-target-platform.patch b/0002-Build-tools-for-the-target-platform.patch
index 6eadee7193f5..3f9ff32692f0 100644
--- a/0002-Build-tools-for-the-target-platform.patch
+++ b/0002-Build-tools-for-the-target-platform.patch
@@ -1,4 +1,4 @@
-From 474401fa162c3d7497e587d21c7ed296c840ec04 Mon Sep 17 00:00:00 2001
+From 3d363bb32a8f0c8ab65ca85706b3f01282d1e20c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 7 May 2021 16:10:47 +0200
 Subject: [PATCH 2/3] Build tools for the target platform
diff --git a/0003-Fix-compile-error-about-missing-QStringView-overload.patch b/0003-Fix-compile-error-about-missing-QStringView-overload.patch
index 5dff89d21c00..cad36ed5ac4a 100644
--- a/0003-Fix-compile-error-about-missing-QStringView-overload.patch
+++ b/0003-Fix-compile-error-about-missing-QStringView-overload.patch
@@ -1,4 +1,4 @@
-From e7b3391c2b5f568ad03282ee0f242e42170b22d0 Mon Sep 17 00:00:00 2001
+From bcf11383e1a08c12ea36aa98dd6aa4777b6b653c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 12 Sep 2022 17:38:47 +0200
 Subject: [PATCH 3/3] Fix compile error about missing QStringView overload
@@ -20,10 +20,10 @@ Prevents the following compiler error:
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
-index ef44327..997fa24 100644
+index 978b7ad..ec83f84 100644
 --- a/tools/dumpcpp/main.cpp
 +++ b/tools/dumpcpp/main.cpp
-@@ -595,7 +595,7 @@ bool generateClassImpl(QTextStream &out, const QMetaObject *mo, const QByteArray
+@@ -570,7 +570,7 @@ bool generateClassImpl(QTextStream &out, const QMetaObject *mo, const QByteArray
          const auto namespaceForTypeEntry = namespaceForType.constFind(type.toUtf8());
          if (namespaceForTypeEntry != namespaceForType.constEnd()) {
              const auto ns = QString::fromUtf8(namespaceForTypeEntry.value());
diff --git a/PKGBUILD b/PKGBUILD
index f9e8130acbb3..3ca8294e7e01 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # you also find the URL of a binary repository.
 
 pkgname=mingw-w64-qt6-activeqt-static
-_qtver=6.3.2
+_qtver=6.4.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@@ -21,10 +21,10 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
         '0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch'
         '0002-Build-tools-for-the-target-platform.patch'
         '0003-Fix-compile-error-about-missing-QStringView-overload.patch')
-sha256sums=('fc70894425fa064bb486b6323c3ae9f405e462ed32b7494ab830a16429675514'
-            '7d7377d77790a8dbb9f80d1b2539ddb848db59782911ba842d4ce4dfa64b8d55'
-            '68473136a589f73c4b04455196ee8b9ca627d368a8f7e19a18864c0cc563a7d7'
-            '8c94ab1a21a98fca5912f94eb70fbc64cfa4faa55a165bc01276b4c83e2bb3fd')
+sha256sums=('591532f49d7796da1776332d532469fea7a2bcb82aa37f41eed9aafe5ea8aadd'
+            '20a2bf72fe2a48d7b58b413be90081e42723f9d623e7367df6a89577527ac6a3'
+            'd645b4f44157c652444508d0ff57b4796863d1f5ea2d5c608e5154981339f585'
+            '07c139f80a5b35532a8f1b3a5624b49a5368b02b816f2deebbaccfeb778d77aa')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/qtactiveqt-sha256.txt b/qtactiveqt-sha256.txt
index b01b6e004de9..6779b1a90560 100644
--- a/qtactiveqt-sha256.txt
+++ b/qtactiveqt-sha256.txt
@@ -1 +1 @@
-fc70894425fa064bb486b6323c3ae9f405e462ed32b7494ab830a16429675514
+591532f49d7796da1776332d532469fea7a2bcb82aa37f41eed9aafe5ea8aadd