summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2023-01-07 14:26:36 +0100
committerMartchus2023-01-07 14:26:36 +0100
commit3672e761097ef81e7b070e041d98c37d82fa58bc (patch)
treed48275e76237d06be7a0edd7049f1c9ee3821e2a
parentd751c5a80a2f65422f271410c2a20ba935810300 (diff)
downloadaur-3672e761097ef81e7b070e041d98c37d82fa58bc.tar.gz
Update to 6.4.2
-rw-r--r--.SRCINFO12
-rw-r--r--0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch6
-rw-r--r--0002-Build-tools-for-the-target-platform.patch4
-rw-r--r--0003-Fix-compile-error-about-missing-QStringView-overload.patch6
-rw-r--r--PKGBUILD10
-rw-r--r--qtactiveqt-sha256.txt2
6 files changed, 20 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5ff7d6fde2b3..f413dc0f43ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt6-activeqt-static
pkgdesc = ActiveX integration framework (mingw-w64)
- pkgver = 6.4.1
+ pkgver = 6.4.2
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.4/6.4.1/submodules/qtactiveqt-everywhere-src-6.4.1.tar.xz
+ source = https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtactiveqt-everywhere-src-6.4.2.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 = 14cff3961d2d0004e99aaf8bdbabf0f17f172c4902382ca612697603bfdf1185
- sha256sums = 4852595069f26aab4dddb89479038d6f06f29881daa625a6ac2b75afc4d19d09
- sha256sums = fc90934324ab8b096e82d53c56abc87e354b0ede241471620536b1e5408914a1
- sha256sums = 69fa8d80280dbfd7bb093a59122baab51bd343245b91ede2d8c500d947dc79a8
+ sha256sums = 123d0e6c4e31263a91a8e3acd72ace3f0c7109f1b15a2e18d594e450c47dc5cf
+ sha256sums = 7cede1ca4b979d56f3047da9d9362c02ae3c44dc9b822743f6f26fea01070c4b
+ sha256sums = 24bb6073a6c5e19232336659c8d013921d1c5a200d4ea4c8d76f83335a3ec7f0
+ sha256sums = 1a53a66116bc05561152225e178d116d59a971c105373911804efeec0777cd4f
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 249e3030601d..cff9f243bbc3 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 de1f7443181b6646acbe0dc906592b65391912eb Mon Sep 17 00:00:00 2001
+From 6a4bb1150e82c388661552c77e39b373c3c34e99 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
@@ -26,7 +26,7 @@ index d85ca1f..86ac48f 100644
break;
}
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
-index c2120b7..978b7ad 100644
+index fc8bf8c..435ab1e 100644
--- a/tools/dumpcpp/main.cpp
+++ b/tools/dumpcpp/main.cpp
@@ -1111,6 +1111,10 @@ int main(int argc, char **argv)
@@ -52,5 +52,5 @@ index c2120b7..978b7ad 100644
}
--
-2.38.1
+2.39.0
diff --git a/0002-Build-tools-for-the-target-platform.patch b/0002-Build-tools-for-the-target-platform.patch
index c28331672794..63a1483e7995 100644
--- a/0002-Build-tools-for-the-target-platform.patch
+++ b/0002-Build-tools-for-the-target-platform.patch
@@ -1,4 +1,4 @@
-From e816d18977dc5c5c2b26b3d6da6a9651da154797 Mon Sep 17 00:00:00 2001
+From 0e8e9fc3605839c94138165817014d67c058f9f3 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
@@ -63,5 +63,5 @@ index 515a5fc..86369ae 100644
main.cpp
PUBLIC_LIBRARIES
--
-2.38.1
+2.39.0
diff --git a/0003-Fix-compile-error-about-missing-QStringView-overload.patch b/0003-Fix-compile-error-about-missing-QStringView-overload.patch
index 18b51733a444..f40f2d9ec568 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 7abc992cc0884f4732e99814601975407ebbee0a Mon Sep 17 00:00:00 2001
+From 1ca6f1cd39edfd37fe601cdd341d50dbd75b070d 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,7 +20,7 @@ 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 978b7ad..ec83f84 100644
+index 435ab1e..3b8c8e9 100644
--- a/tools/dumpcpp/main.cpp
+++ b/tools/dumpcpp/main.cpp
@@ -570,7 +570,7 @@ bool generateClassImpl(QTextStream &out, const QMetaObject *mo, const QByteArray
@@ -33,5 +33,5 @@ index 978b7ad..ec83f84 100644
nextTypeAndForceComplete = startType + lengthType;
} while (true);
--
-2.38.1
+2.39.0
diff --git a/PKGBUILD b/PKGBUILD
index 52e4e6d3bcfd..05b27348bd8d 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.4.1
+_qtver=6.4.2
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=('14cff3961d2d0004e99aaf8bdbabf0f17f172c4902382ca612697603bfdf1185'
- '4852595069f26aab4dddb89479038d6f06f29881daa625a6ac2b75afc4d19d09'
- 'fc90934324ab8b096e82d53c56abc87e354b0ede241471620536b1e5408914a1'
- '69fa8d80280dbfd7bb093a59122baab51bd343245b91ede2d8c500d947dc79a8')
+sha256sums=('123d0e6c4e31263a91a8e3acd72ace3f0c7109f1b15a2e18d594e450c47dc5cf'
+ '7cede1ca4b979d56f3047da9d9362c02ae3c44dc9b822743f6f26fea01070c4b'
+ '24bb6073a6c5e19232336659c8d013921d1c5a200d4ea4c8d76f83335a3ec7f0'
+ '1a53a66116bc05561152225e178d116d59a971c105373911804efeec0777cd4f')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
diff --git a/qtactiveqt-sha256.txt b/qtactiveqt-sha256.txt
index 27da202b1d88..28507e5203c1 100644
--- a/qtactiveqt-sha256.txt
+++ b/qtactiveqt-sha256.txt
@@ -1 +1 @@
-14cff3961d2d0004e99aaf8bdbabf0f17f172c4902382ca612697603bfdf1185
+123d0e6c4e31263a91a8e3acd72ace3f0c7109f1b15a2e18d594e450c47dc5cf