summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2023-07-20 23:12:14 +0200
committerMartchus2023-07-20 23:12:14 +0200
commit89ee9d8f6e0e10110c131d5c024dd3ed6e309891 (patch)
tree1ae5d9505a501c3641f130d684585f8f4b8f29fc
parent84188a93cc9dc6b09812a91afa1ae19950f562e6 (diff)
downloadaur-89ee9d8f6e0e10110c131d5c024dd3ed6e309891.tar.gz
Update to 6.5.2
-rw-r--r--.SRCINFO12
-rw-r--r--0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch4
-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--PKGBUILD11
-rw-r--r--qtactiveqt-sha256.txt2
6 files changed, 19 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0fab476866c0..c405bf82fa42 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt6-activeqt-static
pkgdesc = ActiveX integration framework (mingw-w64)
- pkgver = 6.5.1
+ pkgver = 6.5.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.5/6.5.1/submodules/qtactiveqt-everywhere-src-6.5.1.tar.xz
+ source = https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtactiveqt-everywhere-src-6.5.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 = cd4c9da7a1670962d9e5968f2672f5d4e4ac8aaf6598b032c49cd9bf613c317a
- sha256sums = 21c9e35e91976ecb60ee3dca50959a627d4a6b24c6d316fe5b5331bf8cf8d46e
- sha256sums = ff7a2c46386fcb57f10d7b5b6f2475d99131d84f99ff8b077123e24754140976
- sha256sums = 6b8b5c7f712be029dcb4550798236c04367ce062d9dc220231a5546c50c00db7
+ sha256sums = 5d0040ca776fe484fd19f09567bc5f2838faab409e38a15730855169215ff013
+ sha256sums = 946ed20134b4c84a360024fa1bb7dae7463b9635af361c4262afd439cc77a8d6
+ sha256sums = 28f74ae2412a42f10292964f0d1cdcfb8df86cda61e392e59e11240f4874e931
+ sha256sums = 1f41a0c8bd058e5bc8a5f6a107446f59c4b38cf266bef67793ab69794d757de9
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 b35560db66ba..9c4740405681 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 fb4a08fae1f7c9188fa4b94025ab22095f0493ce Mon Sep 17 00:00:00 2001
+From ee8a2e9fcc6c3a85f49a2296a1fc8b6a08d4539c 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
@@ -52,5 +52,5 @@ index 9820a76..222aff0 100644
}
--
-2.40.1
+2.41.0
diff --git a/0002-Build-tools-for-the-target-platform.patch b/0002-Build-tools-for-the-target-platform.patch
index a59588999e46..d9f190114af7 100644
--- a/0002-Build-tools-for-the-target-platform.patch
+++ b/0002-Build-tools-for-the-target-platform.patch
@@ -1,4 +1,4 @@
-From 6bb16d0311114122b2754b4288ebf6b4836e2b4d Mon Sep 17 00:00:00 2001
+From 38100921079202fb8f7b74f977f052c4b8219786 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.1
+2.41.0
diff --git a/0003-Fix-compile-error-about-missing-QStringView-overload.patch b/0003-Fix-compile-error-about-missing-QStringView-overload.patch
index 4c99771d0444..9ee97ecd8cb5 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 ef9e0a497fef1df8b10779cd4ba5a42309e36dfa Mon Sep 17 00:00:00 2001
+From abfb2bb0da2bc52a35a9a395d1a05ee3e35c68d0 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.1
+2.41.0
diff --git a/PKGBUILD b/PKGBUILD
index d4930ef07168..ae58bcd7e9c9 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.1
+_qtver=6.5.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=('cd4c9da7a1670962d9e5968f2672f5d4e4ac8aaf6598b032c49cd9bf613c317a'
- '21c9e35e91976ecb60ee3dca50959a627d4a6b24c6d316fe5b5331bf8cf8d46e'
- 'ff7a2c46386fcb57f10d7b5b6f2475d99131d84f99ff8b077123e24754140976'
- '6b8b5c7f712be029dcb4550798236c04367ce062d9dc220231a5546c50c00db7')
+sha256sums=('5d0040ca776fe484fd19f09567bc5f2838faab409e38a15730855169215ff013'
+ '946ed20134b4c84a360024fa1bb7dae7463b9635af361c4262afd439cc77a8d6'
+ '28f74ae2412a42f10292964f0d1cdcfb8df86cda61e392e59e11240f4874e931'
+ '1f41a0c8bd058e5bc8a5f6a107446f59c4b38cf266bef67793ab69794d757de9')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
@@ -43,6 +43,7 @@ build() {
export PKG_CONFIG=/usr/bin/$_arch-pkg-config
$_arch-cmake-static -G Ninja -B build-$_arch -S $_pkgfqn \
-DCMAKE_INSTALL_PREFIX:PATH="/usr/$_arch/static" \
+ -DCMAKE_DISABLE_FIND_PACKAGE_harfbuzz=TRUE \
-DFEATURE_static_runtime=ON \
-DFEATURE_pkg_config=ON
cmake --build build-$_arch
diff --git a/qtactiveqt-sha256.txt b/qtactiveqt-sha256.txt
index 3bbc60988970..47e22098e23c 100644
--- a/qtactiveqt-sha256.txt
+++ b/qtactiveqt-sha256.txt
@@ -1 +1 @@
-cd4c9da7a1670962d9e5968f2672f5d4e4ac8aaf6598b032c49cd9bf613c317a
+5d0040ca776fe484fd19f09567bc5f2838faab409e38a15730855169215ff013