summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2021-10-02 12:39:11 +0200
committerMartchus2021-10-02 12:39:11 +0200
commitcd3b294c2031e9a85a657ec9eb3c2f607866066b (patch)
tree5307772e2ef5cf5aec51a92bc3378dd5b3de5b9c
parent8330ef38895f4204ebcd5df4ec8c5c7933421641 (diff)
downloadaur-cd3b294c2031e9a85a657ec9eb3c2f607866066b.tar.gz
Update to 6.2.0
-rw-r--r--.SRCINFO10
-rw-r--r--0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch4
-rw-r--r--0002-Build-tools-for-the-target-platform.patch6
-rw-r--r--PKGBUILD8
-rw-r--r--qtactiveqt-sha256.txt2
5 files changed, 15 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ce5226270913..c3d9963c0f31 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt6-activeqt-static
pkgdesc = ActiveX integration framework (mingw-w64)
- pkgver = 6.1.3
+ pkgver = 6.2.0
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.1/6.1.3/submodules/qtactiveqt-everywhere-src-6.1.3.tar.xz
+ source = https://download.qt.io/official_releases/qt/6.2/6.2.0/submodules/qtactiveqt-everywhere-src-6.2.0.tar.xz
source = 0001-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
source = 0002-Build-tools-for-the-target-platform.patch
- sha256sums = bb35cab37e12fd053d84a204998795bdce02a2e353fbc5da452638dd1e13ddf4
- sha256sums = 61baa4f0e3e713af36df7b73a78ade58bd1e2b64864be68c0a8ec231f6cec58b
- sha256sums = 7f5309d5b3fe4a0590a42582500dd6585c3f43b664f6aea1b3e71ab5d3080328
+ sha256sums = ed991638e27e2e8eac487c2002845827097d1e66397100eea2061d8ad790ded2
+ sha256sums = a5b8d3518ab40bee6ecab2ff09b69b836f24fa22f402fdd000a9d5bfdb1e8b3f
+ sha256sums = 492770fe044c7907e2b34728e729667fd0a826975a1b864d59bcc60fae94f77c
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 d8f1735fa269..407983262d68 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 8229db183bed3b4ac8976f8ace978a3c77683bc0 Mon Sep 17 00:00:00 2001
+From 6bc100ab085078adedd616c0520b855a420d6498 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 4944c3b..f92d18b 100644
break;
}
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
-index 092a3c0..c597942 100644
+index 60e5c94..b2ea4eb 100644
--- a/tools/dumpcpp/main.cpp
+++ b/tools/dumpcpp/main.cpp
@@ -1090,6 +1090,10 @@ int main(int argc, char **argv)
diff --git a/0002-Build-tools-for-the-target-platform.patch b/0002-Build-tools-for-the-target-platform.patch
index 14f72b02f109..ddc908b9cdea 100644
--- a/0002-Build-tools-for-the-target-platform.patch
+++ b/0002-Build-tools-for-the-target-platform.patch
@@ -1,4 +1,4 @@
-From 473bd2989f49e7f6d5b32a0c45eab3b3bfee923d Mon Sep 17 00:00:00 2001
+From b0388c698bbd0aa7d1ac76dc4f67065e34761f57 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
@@ -13,7 +13,7 @@ executed using WINE.
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/tools/idc/CMakeLists.txt b/src/tools/idc/CMakeLists.txt
-index d21b9f0..d401e45 100644
+index 19784db..d401e45 100644
--- a/src/tools/idc/CMakeLists.txt
+++ b/src/tools/idc/CMakeLists.txt
@@ -5,12 +5,13 @@
@@ -24,7 +24,7 @@ index d21b9f0..d401e45 100644
+qt_internal_add_app(${target_name} # special case
# BOOTSTRAP # special case
TARGET_DESCRIPTION "Active Qt Interface Description Compiler"
-- TOOLS_TARGET AxContainer # special case
+- TOOLS_TARGET AxServer # special case
SOURCES
main.cpp
+ PUBLIC_LIBRARIES
diff --git a/PKGBUILD b/PKGBUILD
index aea2872914b2..b97563983ff1 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.1.3
+_qtver=6.2.0
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=('bb35cab37e12fd053d84a204998795bdce02a2e353fbc5da452638dd1e13ddf4'
- '61baa4f0e3e713af36df7b73a78ade58bd1e2b64864be68c0a8ec231f6cec58b'
- '7f5309d5b3fe4a0590a42582500dd6585c3f43b664f6aea1b3e71ab5d3080328')
+sha256sums=('ed991638e27e2e8eac487c2002845827097d1e66397100eea2061d8ad790ded2'
+ 'a5b8d3518ab40bee6ecab2ff09b69b836f24fa22f402fdd000a9d5bfdb1e8b3f'
+ '492770fe044c7907e2b34728e729667fd0a826975a1b864d59bcc60fae94f77c')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
diff --git a/qtactiveqt-sha256.txt b/qtactiveqt-sha256.txt
index 4a5a3b0f864d..761e1ed67069 100644
--- a/qtactiveqt-sha256.txt
+++ b/qtactiveqt-sha256.txt
@@ -1 +1 @@
-bb35cab37e12fd053d84a204998795bdce02a2e353fbc5da452638dd1e13ddf4
+ed991638e27e2e8eac487c2002845827097d1e66397100eea2061d8ad790ded2