summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2022-06-15 02:03:58 +0200
committerMartchus2022-06-15 02:03:58 +0200
commite14e7c1718c804ade9a7014d7c749ce448ab06af (patch)
treeda72ce8537a39ddae4cdb8de317f51d1e975cca8
parent87675c8272946fa399ca5a02bc101b177c342f21 (diff)
downloadaur-e14e7c1718c804ade9a7014d7c749ce448ab06af.tar.gz
Update to 6.3.1
-rw-r--r--.SRCINFO10
-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--PKGBUILD8
-rw-r--r--qtactiveqt-sha256.txt2
5 files changed, 15 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 909bb0906b5d..cce0dd4dd983 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt6-activeqt-static
pkgdesc = ActiveX integration framework (mingw-w64)
- pkgver = 6.3.0
+ pkgver = 6.3.1
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.3/6.3.0/submodules/qtactiveqt-everywhere-src-6.3.0.tar.xz
+ source = https://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/qtactiveqt-everywhere-src-6.3.1.tar.xz
source = 0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
source = 0002-Build-tools-for-the-target-platform.patch
- sha256sums = 8c5041eaadeb2723dafc1e1ed6bb8c3e508abf56e378c3a90b16effaa18f5f07
- sha256sums = e88322f788f2f4d61c6b78380f35a4709d060366c2f2e7938cbfd3ce6660000b
- sha256sums = f171c32bda802443e4af39d75a133cfb748a0375117f4f43e2806500f93b5472
+ sha256sums = 64b54e93bd3deb325c404ff7c7255b2769963b4096ebc22a97db788b257ebe2b
+ sha256sums = b2f1cc5963db2b9d57911dec5b916365586239832733d103afcfa5c989502e61
+ sha256sums = 9560597e94dc85c341f745db64d1bdbf3da295c5c0eb1c7c6594334311fda26c
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 00adeee2699e..e8340f0a775b 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 2abaa0a24d84a3fe1a1d96035b4bcb6425808fe7 Mon Sep 17 00:00:00 2001
+From 11bf98cd89b7169d81352ba7f652661964531751 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
@@ -26,7 +26,7 @@ index c97ad9a..37f9f94 100644
break;
}
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
-index 162c6c6..04a2baa 100644
+index 3142265..8188657 100644
--- a/tools/dumpcpp/main.cpp
+++ b/tools/dumpcpp/main.cpp
@@ -1106,6 +1106,10 @@ int main(int argc, char **argv)
@@ -52,5 +52,5 @@ index 162c6c6..04a2baa 100644
}
--
-2.35.1
+2.36.1
diff --git a/0002-Build-tools-for-the-target-platform.patch b/0002-Build-tools-for-the-target-platform.patch
index b44fbd66d680..98a67f5c24c0 100644
--- a/0002-Build-tools-for-the-target-platform.patch
+++ b/0002-Build-tools-for-the-target-platform.patch
@@ -1,4 +1,4 @@
-From cf297227a2bab55bac8f458f6547bfa89920396d Mon Sep 17 00:00:00 2001
+From 108c018eb1669292c88430a1639d982eb269e31a 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
@@ -63,5 +63,5 @@ index 515a5fc..86369ae 100644
main.cpp
PUBLIC_LIBRARIES
--
-2.35.1
+2.36.1
diff --git a/PKGBUILD b/PKGBUILD
index 9a9d6fcd4b4d..c4f6e38856b5 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.3.0
+_qtver=6.3.1
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=('8c5041eaadeb2723dafc1e1ed6bb8c3e508abf56e378c3a90b16effaa18f5f07'
- 'e88322f788f2f4d61c6b78380f35a4709d060366c2f2e7938cbfd3ce6660000b'
- 'f171c32bda802443e4af39d75a133cfb748a0375117f4f43e2806500f93b5472')
+sha256sums=('64b54e93bd3deb325c404ff7c7255b2769963b4096ebc22a97db788b257ebe2b'
+ 'b2f1cc5963db2b9d57911dec5b916365586239832733d103afcfa5c989502e61'
+ '9560597e94dc85c341f745db64d1bdbf3da295c5c0eb1c7c6594334311fda26c')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
diff --git a/qtactiveqt-sha256.txt b/qtactiveqt-sha256.txt
index 310360066a38..d80bb2939d13 100644
--- a/qtactiveqt-sha256.txt
+++ b/qtactiveqt-sha256.txt
@@ -1 +1 @@
-8c5041eaadeb2723dafc1e1ed6bb8c3e508abf56e378c3a90b16effaa18f5f07
+64b54e93bd3deb325c404ff7c7255b2769963b4096ebc22a97db788b257ebe2b