diff options
-rw-r--r-- | .SRCINFO | 11 | ||||
-rw-r--r-- | 0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch | 6 | ||||
-rw-r--r-- | 0002-Build-tools-for-the-target-platform.patch | 4 | ||||
-rw-r--r-- | PKGBUILD | 8 | ||||
-rw-r--r-- | qtactiveqt-sha256.txt | 2 |
5 files changed, 15 insertions, 16 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-qt6-activeqt-static pkgdesc = ActiveX integration framework (mingw-w64) - pkgver = 6.1.0 + pkgver = 6.1.1 pkgrel = 1 url = https://www.qt.io arch = any @@ -21,12 +21,11 @@ pkgbase = mingw-w64-qt6-activeqt-static options = !buildflags options = staticlibs options = !emptydirs - source = https://download.qt.io/official_releases/qt/6.1/6.1.0/submodules/qtactiveqt-everywhere-src-6.1.0.tar.xz + source = https://download.qt.io/official_releases/qt/6.1/6.1.1/submodules/qtactiveqt-everywhere-src-6.1.1.tar.xz source = 0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch source = 0002-Build-tools-for-the-target-platform.patch - sha256sums = d79f964054a98b7edcfcb3f3590a58d599bcb2f9569ec10f5f5d9c0070701b4a - sha256sums = dc557cc9fed6f542ad8123a0bc3c384a065c019f630c8d80a8c2ff33843d7516 - sha256sums = e0dfaee2453e03f97c784bdd934ba9f58c21fe0f16a8727154d515191a93f0fa + sha256sums = ee853e96784f56ccb98f92212010cba7f04a1ef5e7f7da65c93a0d15c24a6cab + sha256sums = 065d3fdc1acd2ebe152f2f56f3480c936d923b7ebd50b07f7c33f664574637d8 + sha256sums = bde9677fa74577b688e60be47b509c2ba4887e5d5f81f2edeebe8e924bdc6545 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 c13d879e9519..2d17d0e2fbb9 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 52bafd8ad71ac730ee03a2827b1bda32527c0780 Mon Sep 17 00:00:00 2001 +From 7002b344e8fb6b625917c1ef92402b7909905f1b 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 @@ -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 e97dd91..e0d9dbd 100644 +index 4944c3b..f92d18b 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -2104,6 +2104,10 @@ void MetaObjectGenerator::readClassInfo() @@ -52,5 +52,5 @@ index 092a3c0..c597942 100644 } -- -2.31.1 +2.32.0 diff --git a/0002-Build-tools-for-the-target-platform.patch b/0002-Build-tools-for-the-target-platform.patch index c53282b24ec4..77fc2dc19252 100644 --- a/0002-Build-tools-for-the-target-platform.patch +++ b/0002-Build-tools-for-the-target-platform.patch @@ -1,4 +1,4 @@ -From 58ecfedd3e4868c7ac9bb3402e6b44c5e0a1091f Mon Sep 17 00:00:00 2001 +From d254521e709f26b0a77c4d0f98f45dcf716dbf06 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 073ce62..a646314 100644 main.cpp PUBLIC_LIBRARIES -- -2.31.1 +2.32.0 @@ -4,7 +4,7 @@ # you also find the URL of a binary repository. pkgname=mingw-w64-qt6-activeqt-static -_qtver=6.1.0 +_qtver=6.1.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=('d79f964054a98b7edcfcb3f3590a58d599bcb2f9569ec10f5f5d9c0070701b4a' - 'dc557cc9fed6f542ad8123a0bc3c384a065c019f630c8d80a8c2ff33843d7516' - 'e0dfaee2453e03f97c784bdd934ba9f58c21fe0f16a8727154d515191a93f0fa') +sha256sums=('ee853e96784f56ccb98f92212010cba7f04a1ef5e7f7da65c93a0d15c24a6cab' + '065d3fdc1acd2ebe152f2f56f3480c936d923b7ebd50b07f7c33f664574637d8' + 'bde9677fa74577b688e60be47b509c2ba4887e5d5f81f2edeebe8e924bdc6545') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qtactiveqt-sha256.txt b/qtactiveqt-sha256.txt index bdd4eccd06f7..bef023792082 100644 --- a/qtactiveqt-sha256.txt +++ b/qtactiveqt-sha256.txt @@ -1 +1 @@ -d79f964054a98b7edcfcb3f3590a58d599bcb2f9569ec10f5f5d9c0070701b4a +ee853e96784f56ccb98f92212010cba7f04a1ef5e7f7da65c93a0d15c24a6cab |