summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO24
-rw-r--r--0001-Use-CMake-s-default-import-library-suffix.patch14
-rw-r--r--0002-Fix-finding-D-Bus.patch2
-rw-r--r--0003-Fix-using-static-PCRE2-and-DBus-1.patch2
-rw-r--r--0004-Fix-transitive-dependencies-of-static-libraries.patch2
-rw-r--r--0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch2
-rw-r--r--0006-Support-finding-static-MariaDB-client-library.patch2
-rw-r--r--0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch2
-rw-r--r--0008-Fix-crashes-in-rasterization-code-using-setjmp.patch6
-rw-r--r--PKGBUILD22
-rw-r--r--qtbase-sha256.txt2
11 files changed, 40 insertions, 40 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4108a1249664..1e8f9383736a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = mingw-w64-qt6-base-static
pkgdesc = A cross-platform application and UI framework (mingw-w64)
- pkgver = 6.1.1
- pkgrel = 2
+ pkgver = 6.1.2
+ pkgrel = 1
url = https://www.qt.io
arch = any
groups = mingw-w64-qt6
@@ -35,7 +35,7 @@ pkgbase = mingw-w64-qt6-base-static
options = !buildflags
options = staticlibs
options = !emptydirs
- source = https://download.qt.io/official_releases/qt/6.1/6.1.1/submodules/qtbase-everywhere-src-6.1.1.tar.xz
+ source = https://download.qt.io/official_releases/qt/6.1/6.1.2/submodules/qtbase-everywhere-src-6.1.2.tar.xz
source = 0001-Use-CMake-s-default-import-library-suffix.patch
source = 0002-Fix-finding-D-Bus.patch
source = 0003-Fix-using-static-PCRE2-and-DBus-1.patch
@@ -44,14 +44,14 @@ pkgbase = mingw-w64-qt6-base-static
source = 0006-Support-finding-static-MariaDB-client-library.patch
source = 0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
source = 0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
- sha256sums = 21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
- sha256sums = 0668320d4275eea2d7d772dbb55df4eca37520d931d093dcbd80450aa8d72b25
- sha256sums = 8b261eccf904561520f51b3e5a290336e014410d1e147def8aa8f21a097feed5
- sha256sums = 6b5837037e08da87c70c618ce5f33c3e7031c7593efd10fcb160e41d36e63d6c
- sha256sums = cb920842d1fc89b181acefab20db5b83ae3f39617ce7b507d9f691768900ae6d
- sha256sums = 5995785ef5837532cafdacf82e639a74f907c49dd344338584d6c3b4d7bb626d
- sha256sums = 1f2b8ef96fb8d3e3c24fc8e0b6e388f1cb6effd2e73d9e6b3d50c8896b055760
- sha256sums = 9d0ea0a2621aea3a1ae8066680a7d41ffda1cc9c9b93ebb3f2219c3b613ab061
- sha256sums = 272950cba900aa0b11b1c7722eed8ce1ff8c8625de97d9815a8d252ddb6ee947
+ sha256sums = b9c4061c1c7999c42c315fc5b0f4f654067b4186066dd729bbcf1bdce8d781c8
+ sha256sums = cca54459fe66dffd009883dd6855469e7dac2e37b6b71c08c619d52c19e9c465
+ sha256sums = fea7df661412a8d05d19b777f0465d521ac52a6208121a3c6a46bef00174d521
+ sha256sums = 08fcc3bed6eaf88f3621a70f828e3d6f7e29b58e3a65cb649adebd059f2cd867
+ sha256sums = 8876accd3aad0eb67ad16b01717451244c9f908255326f4313383cb534e9b211
+ sha256sums = 3a28ceaa6f55c180dc7484df7b1ce4df5f9b7bee1817f50dedd23d2ec66a5b09
+ sha256sums = 2ebe2848c7a086f2586cd26575d1731ca23fe64c607588c4c5ff877e4d8175ab
+ sha256sums = 6b8b01d90548957d0a6ce2557363ea5ad476b4f9272172ee193957e01aaefb7f
+ sha256sums = b79bce29e48b1c8a26a4300079ac02c77d6bc22450bceee6fec049e5cec81650
pkgname = mingw-w64-qt6-base-static
diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch
index c912297ac499..20ec68ea2949 100644
--- a/0001-Use-CMake-s-default-import-library-suffix.patch
+++ b/0001-Use-CMake-s-default-import-library-suffix.patch
@@ -1,4 +1,4 @@
-From df9364458a82e26c51c37e8f3cad6a2ca6b828a3 Mon Sep 17 00:00:00 2001
+From 698e2140cf864ae445abd9e2f280b1f1628eb648 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 5 Nov 2020 22:08:10 +0100
Subject: [PATCH 1/8] Use CMake's default import library suffix
@@ -13,10 +13,10 @@ Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2
5 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
-index 5498b8a904..59c905eac2 100644
+index abe03031ad..1c36697ed0 100644
--- a/cmake/QtPriHelpers.cmake
+++ b/cmake/QtPriHelpers.cmake
-@@ -370,9 +370,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
+@@ -372,9 +372,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
qt_path_join(private_pri_file_path "${target_path}" "${private_pri_file_name}")
list(APPEND pri_files "${private_pri_file_path}")
@@ -30,8 +30,8 @@ index 5498b8a904..59c905eac2 100644
+ ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX}
${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
${CMAKE_STATIC_LIBRARY_SUFFIX})
- add_custom_command(
-@@ -777,9 +781,13 @@ CONFIG += ${private_config_joined}
+ if(MSVC)
+@@ -785,9 +789,13 @@ CONFIG += ${private_config_joined}
list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}")
endforeach()
@@ -45,9 +45,9 @@ index 5498b8a904..59c905eac2 100644
+ ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX}
${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
${CMAKE_STATIC_LIBRARY_SUFFIX})
- add_custom_command(
+ if(MSVC)
diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
-index 0aab301053..f2e39b63e0 100644
+index 9e830827a0..2da463dc2d 100644
--- a/cmake/QtPrlHelpers.cmake
+++ b/cmake/QtPrlHelpers.cmake
@@ -348,11 +348,17 @@ ${prl_step1_content_libs}
diff --git a/0002-Fix-finding-D-Bus.patch b/0002-Fix-finding-D-Bus.patch
index 35c1c757f81d..140cdaa25166 100644
--- a/0002-Fix-finding-D-Bus.patch
+++ b/0002-Fix-finding-D-Bus.patch
@@ -1,4 +1,4 @@
-From dbdccd3fb77932e284848b0a8543133497a3e391 Mon Sep 17 00:00:00 2001
+From 037c54312a1886f315f711535a2b622ca8998294 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Wed, 7 Oct 2020 12:13:37 +0200
Subject: [PATCH 2/8] Fix finding D-Bus
diff --git a/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
index 1fe9d199d54d..63709170e1cd 100644
--- a/0003-Fix-using-static-PCRE2-and-DBus-1.patch
+++ b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
@@ -1,4 +1,4 @@
-From 2c85dbecb544e4550587a11df9465c0c662ceaf0 Mon Sep 17 00:00:00 2001
+From c0157b15b488b07a0ec85f709621ecd1f28d530c Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 5 Nov 2020 21:13:19 +0100
Subject: [PATCH 3/8] Fix using static PCRE2 and DBus-1
diff --git a/0004-Fix-transitive-dependencies-of-static-libraries.patch b/0004-Fix-transitive-dependencies-of-static-libraries.patch
index 6d66c35d9dd8..dff8979b3a17 100644
--- a/0004-Fix-transitive-dependencies-of-static-libraries.patch
+++ b/0004-Fix-transitive-dependencies-of-static-libraries.patch
@@ -1,4 +1,4 @@
-From d218fae4376bf0a3b801570164ee6c02e5e94cc0 Mon Sep 17 00:00:00 2001
+From eebff1217e3027957452aee75dedb50b5cafa5f6 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 5 Nov 2020 21:59:33 +0100
Subject: [PATCH 4/8] Fix transitive dependencies (of static libraries)
diff --git a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
index 2d41b4c9e266..b680fff554cb 100644
--- a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
+++ b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
@@ -1,4 +1,4 @@
-From 187e32fa4e8f92796d75f2bd47efb464e4638aec Mon Sep 17 00:00:00 2001
+From 5d5b78e1c4d3554031c85b4feb6f48c3e168ee64 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 2 Nov 2020 13:47:45 +0100
Subject: [PATCH 5/8] Fix libjpeg workaround for conflict with rpcndr.h
diff --git a/0006-Support-finding-static-MariaDB-client-library.patch b/0006-Support-finding-static-MariaDB-client-library.patch
index 389af7828c8a..bf09eb39e782 100644
--- a/0006-Support-finding-static-MariaDB-client-library.patch
+++ b/0006-Support-finding-static-MariaDB-client-library.patch
@@ -1,4 +1,4 @@
-From b95bfa5f73b66f31073644a60f04e5740e5a4dec Mon Sep 17 00:00:00 2001
+From b494454327ab0d74e4e9bf66e725389554e1fdd2 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 8 Nov 2020 00:33:12 +0100
Subject: [PATCH 6/8] Support finding static MariaDB client library
diff --git a/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch b/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
index 4e0e9c0d769f..c1c01fc0c6fe 100644
--- a/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
+++ b/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
@@ -1,4 +1,4 @@
-From 8507a185bd7614aa5250495904348ac25ad1b8ac Mon Sep 17 00:00:00 2001
+From c50929b8897f544eb9f232c9119f997530c20d26 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 8 Nov 2020 00:34:09 +0100
Subject: [PATCH 7/8] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
diff --git a/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch b/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
index 3fbc77bfaaed..046ada39d8fd 100644
--- a/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
+++ b/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
@@ -1,4 +1,4 @@
-From 4f351792812f2ad38743702ccffa6ccc7e5114da Mon Sep 17 00:00:00 2001
+From 8e627fbe4ab9331b587ec6a3c799934877a5c8d5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 26 Jun 2021 22:24:12 +0200
Subject: [PATCH 8/8] Fix crashes in rasterization code using setjmp
@@ -28,7 +28,7 @@ Change-Id: I01937d13569dd01ab4cb1f608020544c93bc343c
rename src/gui/painting/{qgrayraster.c => qgrayraster.cpp} (98%)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index bb21d1b976..6a14076d55 100644
+index bb21d1b976..0d9ade29b9 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -166,7 +166,7 @@ qt_internal_add_module(Gui
@@ -46,7 +46,7 @@ index bb21d1b976..6a14076d55 100644
+# enable exceptions for painting/qgrayraster.cpp
+set_source_files_properties("painting/qgrayraster.cpp"
-+ PROPERTIES COMPILE_FLAGS "-fexceptions"
++ PROPERTIES COMPILE_FLAGS "-fexceptions" DISABLE_PRECOMPILE_HEADERS ON SKIP_PRECOMPILE_HEADERS ON
+)
+
# Resources:
diff --git a/PKGBUILD b/PKGBUILD
index fb43c87b1324..42b906c81498 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,9 +11,9 @@
# All patches are managed at https://github.com/Martchus/qtbase
pkgname=mingw-w64-qt6-base-static
-_qtver=6.1.1
+_qtver=6.1.2
pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=1
arch=(any)
url='https://www.qt.io'
license=(GPL3 LGPL3 FDL custom)
@@ -39,15 +39,15 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
'0006-Support-finding-static-MariaDB-client-library.patch'
'0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch'
'0008-Fix-crashes-in-rasterization-code-using-setjmp.patch')
-sha256sums=('21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2'
- '0668320d4275eea2d7d772dbb55df4eca37520d931d093dcbd80450aa8d72b25'
- '8b261eccf904561520f51b3e5a290336e014410d1e147def8aa8f21a097feed5'
- '6b5837037e08da87c70c618ce5f33c3e7031c7593efd10fcb160e41d36e63d6c'
- 'cb920842d1fc89b181acefab20db5b83ae3f39617ce7b507d9f691768900ae6d'
- '5995785ef5837532cafdacf82e639a74f907c49dd344338584d6c3b4d7bb626d'
- '1f2b8ef96fb8d3e3c24fc8e0b6e388f1cb6effd2e73d9e6b3d50c8896b055760'
- '9d0ea0a2621aea3a1ae8066680a7d41ffda1cc9c9b93ebb3f2219c3b613ab061'
- '272950cba900aa0b11b1c7722eed8ce1ff8c8625de97d9815a8d252ddb6ee947')
+sha256sums=('b9c4061c1c7999c42c315fc5b0f4f654067b4186066dd729bbcf1bdce8d781c8'
+ 'cca54459fe66dffd009883dd6855469e7dac2e37b6b71c08c619d52c19e9c465'
+ 'fea7df661412a8d05d19b777f0465d521ac52a6208121a3c6a46bef00174d521'
+ '08fcc3bed6eaf88f3621a70f828e3d6f7e29b58e3a65cb649adebd059f2cd867'
+ '8876accd3aad0eb67ad16b01717451244c9f908255326f4313383cb534e9b211'
+ '3a28ceaa6f55c180dc7484df7b1ce4df5f9b7bee1817f50dedd23d2ec66a5b09'
+ '2ebe2848c7a086f2586cd26575d1731ca23fe64c607588c4c5ff877e4d8175ab'
+ '6b8b01d90548957d0a6ce2557363ea5ad476b4f9272172ee193957e01aaefb7f'
+ 'b79bce29e48b1c8a26a4300079ac02c77d6bc22450bceee6fec049e5cec81650')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt
index 3ace0e914631..611c36203bb2 100644
--- a/qtbase-sha256.txt
+++ b/qtbase-sha256.txt
@@ -1 +1 @@
-21a8aa9f07170e047270c668c8b037536f40226db7adbc529a0b41c3a3cb3ff2
+b9c4061c1c7999c42c315fc5b0f4f654067b4186066dd729bbcf1bdce8d781c8