Update to 6.3.0

5 files changed, 20 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f674ca5a4983..909bb0906b5d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-qt6-activeqt-static
 	pkgdesc = ActiveX integration framework (mingw-w64)
-	pkgver = 6.2.4
+	pkgver = 6.3.0
 	pkgrel = 1
 	url = https://www.qt.io
 	arch = any
@@ -21,11 +21,11 @@ pkgbase = mingw-w64-qt6-activeqt-static
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = https://download.qt.io/official_releases/qt/6.2/6.2.4/submodules/qtactiveqt-everywhere-src-6.2.4.tar.xz
+	source = https://download.qt.io/official_releases/qt/6.3/6.3.0/submodules/qtactiveqt-everywhere-src-6.3.0.tar.xz
 	source = 0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
 	source = 0002-Build-tools-for-the-target-platform.patch
-	sha256sums = 486c1f2ccf0e545c68ebb5e139456f924b9e0948bdd16351701d624172e539f3
-	sha256sums = 23b66eee149453d8e8b724641906b77d7dd44debdb82af9bafa8138aa8113233
-	sha256sums = 783e9fe13732419e7c878fbe925823e59c44f074ed7c1a4b5dfd5bb049e60c01
+	sha256sums = 8c5041eaadeb2723dafc1e1ed6bb8c3e508abf56e378c3a90b16effaa18f5f07
+	sha256sums = e88322f788f2f4d61c6b78380f35a4709d060366c2f2e7938cbfd3ce6660000b
+	sha256sums = f171c32bda802443e4af39d75a133cfb748a0375117f4f43e2806500f93b5472
 
 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 108d5d1686a5..00adeee2699e 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 2e1615636b001f1b610ac3c75f0f14279148ab81 Mon Sep 17 00:00:00 2001
+From 2abaa0a24d84a3fe1a1d96035b4bcb6425808fe7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 17:21:08 +0200
 Subject: [PATCH 1/2] Handle win64 in dumpcpp and
@@ -11,7 +11,7 @@ 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 4944c3b..f92d18b 100644
+index c97ad9a..37f9f94 100644
 --- a/src/activeqt/container/qaxbase.cpp
 +++ b/src/activeqt/container/qaxbase.cpp
 @@ -2104,6 +2104,10 @@ void MetaObjectGenerator::readClassInfo()
@@ -26,10 +26,10 @@ index 4944c3b..f92d18b 100644
                      break;
              }
 diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
-index 60e5c94..b2ea4eb 100644
+index 162c6c6..04a2baa 100644
 --- a/tools/dumpcpp/main.cpp
 +++ b/tools/dumpcpp/main.cpp
-@@ -1090,6 +1090,10 @@ int main(int argc, char **argv)
+@@ -1106,6 +1106,10 @@ int main(int argc, char **argv)
              typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString();
              if (QFile::exists(typeLib))
                  break;
@@ -40,7 +40,7 @@ index 60e5c94..b2ea4eb 100644
          }
  
          if (!typeLib.isEmpty())
-@@ -1154,6 +1158,10 @@ int main(int argc, char **argv)
+@@ -1170,6 +1174,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 a69416e90e39..b44fbd66d680 100644
--- a/0002-Build-tools-for-the-target-platform.patch
+++ b/0002-Build-tools-for-the-target-platform.patch
@@ -1,4 +1,4 @@
-From 8147aba1e69acf79bbc358b39ca2043c13632831 Mon Sep 17 00:00:00 2001
+From cf297227a2bab55bac8f458f6547bfa89920396d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 7 May 2021 16:10:47 +0200
 Subject: [PATCH 2/2] Build tools for the target platform
@@ -13,7 +13,7 @@ executed using WINE.
  3 files changed, 5 insertions(+), 6 deletions(-)
 
 diff --git a/src/tools/idc/CMakeLists.txt b/src/tools/idc/CMakeLists.txt
-index 19784db..d401e45 100644
+index 3a3e946..11dcad5 100644
 --- a/src/tools/idc/CMakeLists.txt
 +++ b/src/tools/idc/CMakeLists.txt
 @@ -5,12 +5,13 @@
@@ -30,10 +30,10 @@ index 19784db..d401e45 100644
 +    PUBLIC_LIBRARIES
 +        Qt::Core
  )
+ qt_internal_return_unless_building_tools()
  
- #### Keys ignored in scope 1:.:.:idc.pro:<TRUE>:
 diff --git a/tools/dumpcpp/CMakeLists.txt b/tools/dumpcpp/CMakeLists.txt
-index 8d8db8f..2c86194 100644
+index fb7b1db..d1806ab 100644
 --- a/tools/dumpcpp/CMakeLists.txt
 +++ b/tools/dumpcpp/CMakeLists.txt
 @@ -5,9 +5,8 @@
@@ -48,7 +48,7 @@ index 8d8db8f..2c86194 100644
          main.cpp
          moc.cpp moc.h
 diff --git a/tools/dumpdoc/CMakeLists.txt b/tools/dumpdoc/CMakeLists.txt
-index 073ce62..a646314 100644
+index 515a5fc..86369ae 100644
 --- a/tools/dumpdoc/CMakeLists.txt
 +++ b/tools/dumpdoc/CMakeLists.txt
 @@ -5,9 +5,8 @@
diff --git a/PKGBUILD b/PKGBUILD
index b328672f2bc8..9a9d6fcd4b4d 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.2.4
+_qtver=6.3.0
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
@@ -20,9 +20,9 @@ _pkgfqn="qtactiveqt-everywhere-src-${_qtver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
         '0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch'
         '0002-Build-tools-for-the-target-platform.patch')
-sha256sums=('486c1f2ccf0e545c68ebb5e139456f924b9e0948bdd16351701d624172e539f3'
-            '23b66eee149453d8e8b724641906b77d7dd44debdb82af9bafa8138aa8113233'
-            '783e9fe13732419e7c878fbe925823e59c44f074ed7c1a4b5dfd5bb049e60c01')
+sha256sums=('8c5041eaadeb2723dafc1e1ed6bb8c3e508abf56e378c3a90b16effaa18f5f07'
+            'e88322f788f2f4d61c6b78380f35a4709d060366c2f2e7938cbfd3ce6660000b'
+            'f171c32bda802443e4af39d75a133cfb748a0375117f4f43e2806500f93b5472')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/qtactiveqt-sha256.txt b/qtactiveqt-sha256.txt
index 270710998af3..310360066a38 100644
--- a/qtactiveqt-sha256.txt
+++ b/qtactiveqt-sha256.txt
@@ -1 +1 @@
-486c1f2ccf0e545c68ebb5e139456f924b9e0948bdd16351701d624172e539f3
+8c5041eaadeb2723dafc1e1ed6bb8c3e508abf56e378c3a90b16effaa18f5f07