summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2024-02-15 21:22:27 +0100
committerMartchus2024-02-15 21:22:27 +0100
commit510b840b9cd1ae72c627fb72397e22aa932a72c5 (patch)
treec54d9a6ee45bae432914cbc9e2944d3db1223e3b
parent7cec877a23594578ab8397916231691faeec6f7e (diff)
downloadaur-510b840b9cd1ae72c627fb72397e22aa932a72c5.tar.gz
Update to 6.6.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.patch2
-rw-r--r--0003-Fix-compile-error-about-missing-QStringView-overload.patch2
-rw-r--r--PKGBUILD10
-rw-r--r--qtactiveqt-sha256.txt2
6 files changed, 16 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5f2bd216f670..c29b2b53c2ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt6-activeqt-static
pkgdesc = ActiveX integration framework (mingw-w64)
- pkgver = 6.6.1
+ pkgver = 6.6.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.6/6.6.1/submodules/qtactiveqt-everywhere-src-6.6.1.tar.xz
+ source = https://download.qt.io/official_releases/qt/6.6/6.6.2/submodules/qtactiveqt-everywhere-src-6.6.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 = 9950f17041dce3977da80b4c65adad859952a800569799f25e7b395c1e04cfec
- sha256sums = c0cabe05e3953456cf330d2c52a3f11a75ae4ec0945a298f8a13671aebd7f2de
- sha256sums = 6a074d10a419a2df164cf66cfdcb8a3705bc064d6f8c7777d4b4e77ca1a118da
- sha256sums = a9a6005b05cbe7081314a545d9d2dd10b48fac6264b2e54c7bc8b699266b6096
+ sha256sums = 87fa010302ee5814fa5bbe9aafce6f01f3e60c3001299873c09d37a0c758789b
+ sha256sums = ea4b89818dd07d2fae698d4ecd09bf426c437ab4d0e16ef18722bd6db2c0f6f5
+ sha256sums = c70fe8796dac5ea4bebca1a7b97a509a43a9968524abd1b052ad501201e1afd3
+ sha256sums = d1ad0556750309a13e90e61882ca2c1ada4ef01a9920a12f2a554af53d9b8240
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 0804508666e3..b5dfe4a6e769 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 7df430149d047580d627e92793121ad114331969 Mon Sep 17 00:00:00 2001
+From ce766e27093dd76e58c6233434c869dfb6ff7c67 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 5ba59c3..a58936b 100644
+index 3463f3c..88d3249 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -2118,6 +2118,10 @@ void MetaObjectGenerator::readClassInfo()
diff --git a/0002-Build-tools-for-the-target-platform.patch b/0002-Build-tools-for-the-target-platform.patch
index 2f877a1d0218..e0d16f87a2ac 100644
--- a/0002-Build-tools-for-the-target-platform.patch
+++ b/0002-Build-tools-for-the-target-platform.patch
@@ -1,4 +1,4 @@
-From 8abe25dc12e5e826caf6c8c0221dc982b8c5af3b Mon Sep 17 00:00:00 2001
+From fc012c87b599cca39c9dcaaf2e48da9afbc729b9 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 83b82c29f877..f88112bcb854 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 db2ede6a2e3cb897b4302a4e6474c457a8bdf8f0 Mon Sep 17 00:00:00 2001
+From 8cdb1f8bb457dc5e7d978da3bb8fbfdb7ae37800 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
diff --git a/PKGBUILD b/PKGBUILD
index e6fe92330862..f389ab6f9338 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.6.1
+_qtver=6.6.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=('9950f17041dce3977da80b4c65adad859952a800569799f25e7b395c1e04cfec'
- 'c0cabe05e3953456cf330d2c52a3f11a75ae4ec0945a298f8a13671aebd7f2de'
- '6a074d10a419a2df164cf66cfdcb8a3705bc064d6f8c7777d4b4e77ca1a118da'
- 'a9a6005b05cbe7081314a545d9d2dd10b48fac6264b2e54c7bc8b699266b6096')
+sha256sums=('87fa010302ee5814fa5bbe9aafce6f01f3e60c3001299873c09d37a0c758789b'
+ 'ea4b89818dd07d2fae698d4ecd09bf426c437ab4d0e16ef18722bd6db2c0f6f5'
+ 'c70fe8796dac5ea4bebca1a7b97a509a43a9968524abd1b052ad501201e1afd3'
+ 'd1ad0556750309a13e90e61882ca2c1ada4ef01a9920a12f2a554af53d9b8240')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
diff --git a/qtactiveqt-sha256.txt b/qtactiveqt-sha256.txt
index e885bd7888fe..f77c81cf259c 100644
--- a/qtactiveqt-sha256.txt
+++ b/qtactiveqt-sha256.txt
@@ -1 +1 @@
-9950f17041dce3977da80b4c65adad859952a800569799f25e7b395c1e04cfec
+87fa010302ee5814fa5bbe9aafce6f01f3e60c3001299873c09d37a0c758789b