summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO22
-rw-r--r--0001-Use-CMake-s-default-import-library-suffix.patch16
-rw-r--r--0002-Fix-finding-D-Bus.patch4
-rw-r--r--0003-Fix-using-static-PCRE2-and-DBus-1.patch4
-rw-r--r--0004-Fix-transitive-dependencies-of-static-libraries.patch4
-rw-r--r--0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch4
-rw-r--r--0006-Support-finding-static-MariaDB-client-library.patch4
-rw-r--r--0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch4
-rw-r--r--0008-Fix-crashes-in-rasterization-code-using-setjmp.patch8
-rw-r--r--PKGBUILD20
-rw-r--r--qtbase-sha256.txt2
11 files changed, 46 insertions, 46 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b8bbace2b5f3..426180fc8207 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-qt6-base
pkgdesc = A cross-platform application and UI framework (mingw-w64)
- pkgver = 6.1.2
+ pkgver = 6.1.3
pkgrel = 1
url = https://www.qt.io
arch = any
@@ -35,7 +35,7 @@ pkgbase = mingw-w64-qt6-base
options = !buildflags
options = staticlibs
options = !emptydirs
- source = https://download.qt.io/official_releases/qt/6.1/6.1.2/submodules/qtbase-everywhere-src-6.1.2.tar.xz
+ source = https://download.qt.io/official_releases/qt/6.1/6.1.3/submodules/qtbase-everywhere-src-6.1.3.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
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 = b9c4061c1c7999c42c315fc5b0f4f654067b4186066dd729bbcf1bdce8d781c8
- sha256sums = cca54459fe66dffd009883dd6855469e7dac2e37b6b71c08c619d52c19e9c465
- sha256sums = fea7df661412a8d05d19b777f0465d521ac52a6208121a3c6a46bef00174d521
- sha256sums = 08fcc3bed6eaf88f3621a70f828e3d6f7e29b58e3a65cb649adebd059f2cd867
- sha256sums = 8876accd3aad0eb67ad16b01717451244c9f908255326f4313383cb534e9b211
- sha256sums = 3a28ceaa6f55c180dc7484df7b1ce4df5f9b7bee1817f50dedd23d2ec66a5b09
- sha256sums = 2ebe2848c7a086f2586cd26575d1731ca23fe64c607588c4c5ff877e4d8175ab
- sha256sums = 6b8b01d90548957d0a6ce2557363ea5ad476b4f9272172ee193957e01aaefb7f
- sha256sums = b79bce29e48b1c8a26a4300079ac02c77d6bc22450bceee6fec049e5cec81650
+ sha256sums = 1e9abb2ea4daa0fd11f46fc871d9e896b916e1b7130fed74c83d66221bb4fe78
+ sha256sums = 7f1dc7bb25a16dda6beb8df1e84aba085f7cb561e76539b2a10b8f77f61a9754
+ sha256sums = d38da78f9787a430c510a3a2da0a69f30664e7ba916116bf9d260f35e02dc5c6
+ sha256sums = b281014ae468774ba2d3b138d202acf63ddcbe1c9e7df32cceab1eeee9797e1f
+ sha256sums = 68f8ce781d2b3d6123e31e9093e266a8811bc3798c0acbc40bc55176ec843848
+ sha256sums = 8ca9936959fa4b89222d02ae806f7c69240a9d79f167be7d4e4e2c906e1b0811
+ sha256sums = 361357253cab254eabafdf62253131e705c9e1b473466191eae10d2a43c79e47
+ sha256sums = 155de7fafdc36d79977c2b7f3f84c5c74e6cad14f39a95fbccff1e8b8b3f0b49
+ sha256sums = 156a862efb8fb1ca0bc67cdb6a08a4ced8e19497bb24e5f4a3c108c40b847d7c
pkgname = mingw-w64-qt6-base
diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch
index 20ec68ea2949..6a1f3aeaa10a 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 698e2140cf864ae445abd9e2f280b1f1628eb648 Mon Sep 17 00:00:00 2001
+From df9364458a82e26c51c37e8f3cad6a2ca6b828a3 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 abe03031ad..1c36697ed0 100644
+index 5498b8a904..59c905eac2 100644
--- a/cmake/QtPriHelpers.cmake
+++ b/cmake/QtPriHelpers.cmake
-@@ -372,9 +372,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
+@@ -370,9 +370,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 abe03031ad..1c36697ed0 100644
+ ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX}
${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
${CMAKE_STATIC_LIBRARY_SUFFIX})
- if(MSVC)
-@@ -785,9 +789,13 @@ CONFIG += ${private_config_joined}
+ add_custom_command(
+@@ -777,9 +781,13 @@ CONFIG += ${private_config_joined}
list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}")
endforeach()
@@ -45,9 +45,9 @@ index abe03031ad..1c36697ed0 100644
+ ${CMAKE_CMAKE_IMPORT_LIBRARY_SUFFIX}
${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES}
${CMAKE_STATIC_LIBRARY_SUFFIX})
- if(MSVC)
+ add_custom_command(
diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
-index 9e830827a0..2da463dc2d 100644
+index 0aab301053..f2e39b63e0 100644
--- a/cmake/QtPrlHelpers.cmake
+++ b/cmake/QtPrlHelpers.cmake
@@ -348,11 +348,17 @@ ${prl_step1_content_libs}
@@ -110,5 +110,5 @@ index fc4c745c90..939ea2b212 100644
get_target_property(target_type ${target} TYPE)
if(target_type STREQUAL "STATIC_LIBRARY")
--
-2.32.0
+2.33.0
diff --git a/0002-Fix-finding-D-Bus.patch b/0002-Fix-finding-D-Bus.patch
index 140cdaa25166..93d36160095f 100644
--- a/0002-Fix-finding-D-Bus.patch
+++ b/0002-Fix-finding-D-Bus.patch
@@ -1,4 +1,4 @@
-From 037c54312a1886f315f711535a2b622ca8998294 Mon Sep 17 00:00:00 2001
+From dbdccd3fb77932e284848b0a8543133497a3e391 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
@@ -20,5 +20,5 @@ index e227d224e0..bdbcab9eb3 100644
+ set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
+endif()
--
-2.32.0
+2.33.0
diff --git a/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
index 63709170e1cd..f6877b16bcca 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 c0157b15b488b07a0ec85f709621ecd1f28d530c Mon Sep 17 00:00:00 2001
+From 2c85dbecb544e4550587a11df9465c0c662ceaf0 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
@@ -44,5 +44,5 @@ index accaa4f5ed..4b11c74caa 100644
# include <dbus/dbus.h>
#else
--
-2.32.0
+2.33.0
diff --git a/0004-Fix-transitive-dependencies-of-static-libraries.patch b/0004-Fix-transitive-dependencies-of-static-libraries.patch
index dff8979b3a17..23c6e3da1337 100644
--- a/0004-Fix-transitive-dependencies-of-static-libraries.patch
+++ b/0004-Fix-transitive-dependencies-of-static-libraries.patch
@@ -1,4 +1,4 @@
-From eebff1217e3027957452aee75dedb50b5cafa5f6 Mon Sep 17 00:00:00 2001
+From d218fae4376bf0a3b801570164ee6c02e5e94cc0 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)
@@ -133,5 +133,5 @@ index b151932da7..7e6b38acd1 100644
Qt::CorePrivate
Qt::SqlPrivate
--
-2.32.0
+2.33.0
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 b680fff554cb..05dc25c51372 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 5d5b78e1c4d3554031c85b4feb6f48c3e168ee64 Mon Sep 17 00:00:00 2001
+From 187e32fa4e8f92796d75f2bd47efb464e4638aec 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
@@ -33,5 +33,5 @@ index beef18f260..72708145f4 100644
#ifdef const
# undef const // remove crazy C hackery in jconfig.h
--
-2.32.0
+2.33.0
diff --git a/0006-Support-finding-static-MariaDB-client-library.patch b/0006-Support-finding-static-MariaDB-client-library.patch
index bf09eb39e782..7c5d0b6177de 100644
--- a/0006-Support-finding-static-MariaDB-client-library.patch
+++ b/0006-Support-finding-static-MariaDB-client-library.patch
@@ -1,4 +1,4 @@
-From b494454327ab0d74e4e9bf66e725389554e1fdd2 Mon Sep 17 00:00:00 2001
+From b95bfa5f73b66f31073644a60f04e5740e5a4dec 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
@@ -27,5 +27,5 @@ index 0fcba2148e..ab4f6fdc9e 100644
include(FindPackageHandleStandardArgs)
--
-2.32.0
+2.33.0
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 c1c01fc0c6fe..c9c3e1be697e 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 c50929b8897f544eb9f232c9119f997530c20d26 Mon Sep 17 00:00:00 2001
+From 8507a185bd7614aa5250495904348ac25ad1b8ac 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
@@ -25,5 +25,5 @@ index af8c3d18c4..eb1f47c6e1 100644
#
# Macros and functions for building Qt modules
--
-2.32.0
+2.33.0
diff --git a/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch b/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
index 046ada39d8fd..2348941bb833 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 8e627fbe4ab9331b587ec6a3c799934877a5c8d5 Mon Sep 17 00:00:00 2001
+From 4f351792812f2ad38743702ccffa6ccc7e5114da 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..0d9ade29b9 100644
+index bb21d1b976..6a14076d55 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..0d9ade29b9 100644
+# enable exceptions for painting/qgrayraster.cpp
+set_source_files_properties("painting/qgrayraster.cpp"
-+ PROPERTIES COMPILE_FLAGS "-fexceptions" DISABLE_PRECOMPILE_HEADERS ON SKIP_PRECOMPILE_HEADERS ON
++ PROPERTIES COMPILE_FLAGS "-fexceptions"
+)
+
# Resources:
@@ -248,5 +248,5 @@ index e2326a56c1..7b30969ec8 100644
"Description": "FreeType is a freely available software library to render fonts.",
"Homepage": "http://www.freetype.org",
--
-2.32.0
+2.33.0
diff --git a/PKGBUILD b/PKGBUILD
index 474449829f0e..15d884ac48cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
# All patches are managed at https://github.com/Martchus/qtbase
pkgname=mingw-w64-qt6-base
-_qtver=6.1.2
+_qtver=6.1.3
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@@ -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=('b9c4061c1c7999c42c315fc5b0f4f654067b4186066dd729bbcf1bdce8d781c8'
- 'cca54459fe66dffd009883dd6855469e7dac2e37b6b71c08c619d52c19e9c465'
- 'fea7df661412a8d05d19b777f0465d521ac52a6208121a3c6a46bef00174d521'
- '08fcc3bed6eaf88f3621a70f828e3d6f7e29b58e3a65cb649adebd059f2cd867'
- '8876accd3aad0eb67ad16b01717451244c9f908255326f4313383cb534e9b211'
- '3a28ceaa6f55c180dc7484df7b1ce4df5f9b7bee1817f50dedd23d2ec66a5b09'
- '2ebe2848c7a086f2586cd26575d1731ca23fe64c607588c4c5ff877e4d8175ab'
- '6b8b01d90548957d0a6ce2557363ea5ad476b4f9272172ee193957e01aaefb7f'
- 'b79bce29e48b1c8a26a4300079ac02c77d6bc22450bceee6fec049e5cec81650')
+sha256sums=('1e9abb2ea4daa0fd11f46fc871d9e896b916e1b7130fed74c83d66221bb4fe78'
+ '7f1dc7bb25a16dda6beb8df1e84aba085f7cb561e76539b2a10b8f77f61a9754'
+ 'd38da78f9787a430c510a3a2da0a69f30664e7ba916116bf9d260f35e02dc5c6'
+ 'b281014ae468774ba2d3b138d202acf63ddcbe1c9e7df32cceab1eeee9797e1f'
+ '68f8ce781d2b3d6123e31e9093e266a8811bc3798c0acbc40bc55176ec843848'
+ '8ca9936959fa4b89222d02ae806f7c69240a9d79f167be7d4e4e2c906e1b0811'
+ '361357253cab254eabafdf62253131e705c9e1b473466191eae10d2a43c79e47'
+ '155de7fafdc36d79977c2b7f3f84c5c74e6cad14f39a95fbccff1e8b8b3f0b49'
+ '156a862efb8fb1ca0bc67cdb6a08a4ced8e19497bb24e5f4a3c108c40b847d7c')
_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt
index 611c36203bb2..da01cfbf726a 100644
--- a/qtbase-sha256.txt
+++ b/qtbase-sha256.txt
@@ -1 +1 @@
-b9c4061c1c7999c42c315fc5b0f4f654067b4186066dd729bbcf1bdce8d781c8
+1e9abb2ea4daa0fd11f46fc871d9e896b916e1b7130fed74c83d66221bb4fe78