summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2023-05-26 15:32:35 +0200
committerMartchus2023-05-26 15:32:35 +0200
commit84188a93cc9dc6b09812a91afa1ae19950f562e6 (patch)
treeffb8a014be23f8b683ef23740dcfd82fcb5dcb7f
parent46f03dcd461191acd6461b530cf754f623365a85 (diff)
downloadaur-84188a93cc9dc6b09812a91afa1ae19950f562e6.tar.gz
Update to 6.5.1
-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.patch4
-rw-r--r--PKGBUILD10
-rw-r--r--qtactiveqt-sha256.txt2
6 files changed, 19 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ac837a5f88f7..0fab476866c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt6-activeqt-static
pkgdesc = ActiveX integration framework (mingw-w64)
- pkgver = 6.5.0
+ pkgver = 6.5.1
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.5/6.5.0/submodules/qtactiveqt-everywhere-src-6.5.0.tar.xz
+ source = https://download.qt.io/official_releases/qt/6.5/6.5.1/submodules/qtactiveqt-everywhere-src-6.5.1.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 = 25b0aacbd9aaac3822ee44ac201a159d3e63c77bfbce57599c0368f294f89c3b
- sha256sums = 869a86ceb1801432bada4f12420703140563393661d9d4283982019d5831cd14
- sha256sums = 78e8f82cf03e5ce55498f553a98e65b8e990c38038b58bf98afcceb65add27ed
- sha256sums = c83752006cae2dd3573c88aa674daef6cb62d2e7e1146a8c8ea32cbca9a20362
+ sha256sums = cd4c9da7a1670962d9e5968f2672f5d4e4ac8aaf6598b032c49cd9bf613c317a
+ sha256sums = 21c9e35e91976ecb60ee3dca50959a627d4a6b24c6d316fe5b5331bf8cf8d46e
+ sha256sums = ff7a2c46386fcb57f10d7b5b6f2475d99131d84f99ff8b077123e24754140976
+ sha256sums = 6b8b5c7f712be029dcb4550798236c04367ce062d9dc220231a5546c50c00db7
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 1314612c105d..b35560db66ba 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 cfa5a39b153d434906682f3c89059e2c38a43940 Mon Sep 17 00:00:00 2001
+From fb4a08fae1f7c9188fa4b94025ab22095f0493ce 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,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 c3b9b0a..ee19ffe 100644
+index 973347b..551c737 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -2118,6 +2118,10 @@ void MetaObjectGenerator::readClassInfo()
@@ -52,5 +52,5 @@ index 9820a76..222aff0 100644
}
--
-2.40.0
+2.40.1
diff --git a/0002-Build-tools-for-the-target-platform.patch b/0002-Build-tools-for-the-target-platform.patch
index 351fc4273bcb..a59588999e46 100644
--- a/0002-Build-tools-for-the-target-platform.patch
+++ b/0002-Build-tools-for-the-target-platform.patch
@@ -1,4 +1,4 @@
-From c20640e04fcc1b26e7d608a85e3e0060e0598124 Mon Sep 17 00:00:00 2001
+From 6bb16d0311114122b2754b4288ebf6b4836e2b4d 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
@@ -61,5 +61,5 @@ index 84b4018..1dc4b9e 100644
main.cpp
LIBRARIES
--
-2.40.0
+2.40.1
diff --git a/0003-Fix-compile-error-about-missing-QStringView-overload.patch b/0003-Fix-compile-error-about-missing-QStringView-overload.patch
index 96e47e4dd0bc..4c99771d0444 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 fd8c8a7edd18b3fc310073ca1bf6483f1ad46a08 Mon Sep 17 00:00:00 2001
+From ef9e0a497fef1df8b10779cd4ba5a42309e36dfa 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
@@ -33,5 +33,5 @@ index 222aff0..53d2a18 100644
nextTypeAndForceComplete = startType + lengthType;
} while (true);
--
-2.40.0
+2.40.1
diff --git a/PKGBUILD b/PKGBUILD
index 5e03b8efb174..d4930ef07168 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.5.0
+_qtver=6.5.1
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=('25b0aacbd9aaac3822ee44ac201a159d3e63c77bfbce57599c0368f294f89c3b'
- '869a86ceb1801432bada4f12420703140563393661d9d4283982019d5831cd14'
- '78e8f82cf03e5ce55498f553a98e65b8e990c38038b58bf98afcceb65add27ed'
- 'c83752006cae2dd3573c88aa674daef6cb62d2e7e1146a8c8ea32cbca9a20362')
+sha256sums=('cd4c9da7a1670962d9e5968f2672f5d4e4ac8aaf6598b032c49cd9bf613c317a'
+ '21c9e35e91976ecb60ee3dca50959a627d4a6b24c6d316fe5b5331bf8cf8d46e'
+ 'ff7a2c46386fcb57f10d7b5b6f2475d99131d84f99ff8b077123e24754140976'
+ '6b8b5c7f712be029dcb4550798236c04367ce062d9dc220231a5546c50c00db7')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
diff --git a/qtactiveqt-sha256.txt b/qtactiveqt-sha256.txt
index f49193f81458..3bbc60988970 100644
--- a/qtactiveqt-sha256.txt
+++ b/qtactiveqt-sha256.txt
@@ -1 +1 @@
-25b0aacbd9aaac3822ee44ac201a159d3e63c77bfbce57599c0368f294f89c3b
+cd4c9da7a1670962d9e5968f2672f5d4e4ac8aaf6598b032c49cd9bf613c317a