diff options
| author | Martchus | 2024-04-04 10:44:33 +0200 |
|---|---|---|
| committer | Martchus | 2024-04-04 10:44:33 +0200 |
| commit | 54d151502fbdeff6b79262dc438257797d9d6cf1 (patch) | |
| tree | 8436fba97826778bd16b1b8488b512c81fd9dd66 | |
| parent | bc87d5c85b8fead9f26a6c1ba8ebf42c08fad24d (diff) | |
| download | aur-mingw-w64-qt6-base.tar.gz | |
Update to 6.7.0
21 files changed, 139 insertions, 363 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-qt6-base pkgdesc = A cross-platform application and UI framework (mingw-w64) - pkgver = 6.6.3 + pkgver = 6.7.0 pkgrel = 1 url = https://www.qt.io arch = any @@ -36,7 +36,7 @@ pkgbase = mingw-w64-qt6-base options = !buildflags options = staticlibs options = !emptydirs - source = https://download.qt.io/official_releases/qt/6.6/6.6.3/submodules/qtbase-everywhere-src-6.6.3.tar.xz + source = https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtbase-everywhere-src-6.7.0.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,33 +44,33 @@ pkgbase = mingw-w64-qt6-base source = 0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch 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 - source = 0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch - source = 0010-Fix-dependency-of-xcb-image-on-xcb-util.patch - source = 0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch - source = 0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch - source = 0013-Allow-overriding-preference-for-shared-libzstd-libra.patch - source = 0014-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch - source = 0015-Fix-setting-exception-flags-of-plugin-targets.patch - source = 0016-Link-corelib-correctly-against-runtimeobject-when-co.patch - source = 0017-Workaround-linker-error-about-missing-symbol-__sync_.patch - sha256sums = 0493fd0b380c4edf8872f011a7f26d245aa4cdd75b349904ef340a22dedf7462 - sha256sums = 4436fa3cb4ae8042d4e7420dd69aff5e7ee90eab623b55290dadb4347f3af562 - sha256sums = 5535db09b73284474eaf13181f52f52d67acad39f9fdc3a4cbd9938354e431b5 - sha256sums = c4dd118f2670f526d1a294e00db91e3bc8e3fc733ece40f3d42e14f4210c9d9e - sha256sums = 9e4e0cffecb7718c76f6f1f5d1d73bfddb630339ebb71e1fe947b0abe1cd9696 - sha256sums = 2365407788639c006c03b0c9ab524c1335a4175623e92d537b6e134b5b78793d - sha256sums = 9de86821cb75a0c7f6ffd26188a58347d4982497460aa1940ae7c6fd19a05e11 - sha256sums = 721c32de68daca63ee2440218da7f998d052cf5122f0266ce18dc9fcf979d743 - sha256sums = e8540d9b2b06a149668e389d8713a5e5d70a6728a01f7678fec36091f10d57a1 - sha256sums = 25aaadd7ea30f4fc2d75f3bcb8dcb0a82e1fed23c7c34fa1deb7369032f9e24e - sha256sums = 7f1d483ab4b229c60a0658c6da18fb82619e0d8696ad5010de40748ce0b15b85 - sha256sums = e61047f9f167c9229978895cd19cb7cbd722620fb600d48f63dcc8f727b79b09 - sha256sums = e2811f2f857bf09572622cfec907bf738f3fdca1da9d83acd6cbaa62aa12ec85 - sha256sums = 4b3a18cb211bdbdefda2ac34e97d16bc989e969ab77983cfcef8a75e06366504 - sha256sums = d3a02fb4fe241187ce9dd91123e661cde1e6ccdb098c26a9f7a2209b20074c89 - sha256sums = 3652e0a71c16c2d7ec249f349cd38374d32b0f87401b4ef3e2f583e0e290ec78 - sha256sums = 022dbdf8b2e89bb4ec80311807aaae46cb52896dd89ecb212adc5c7b7ab59be6 - sha256sums = 1497d88387d761da233588b024cdb46e7f02b4a7a3efcc9508317fd4571e008c + source = 0008-Find-fontconfig-via-pkg-config-for-correct-handling-.patch + source = 0009-Fix-dependency-of-xcb-image-on-xcb-util.patch + source = 0010-Allow-using-properties-of-PkgConfig-targets-for-glib.patch + source = 0011-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch + source = 0012-Allow-overriding-preference-for-shared-libzstd-libra.patch + source = 0013-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch + source = 0014-Fix-setting-exception-flags-of-plugin-targets.patch + source = 0015-Link-corelib-correctly-against-runtimeobject-when-co.patch + source = 0016-Workaround-linker-error-about-missing-symbol-__sync_.patch + source = 0017-Fix-wrong-cpp-conditional-in-qspan.h.patch + sha256sums = 11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254 + sha256sums = e25f83ddf9e3f9eefcb833751cff8957f32cb2f13f5a1f033679b45d2c9e544e + sha256sums = ae4a20f41df34eefc960ed5cb2cf54afb421573f08545d5492882edd18e00a3c + sha256sums = 5d329d722365c07a28b85a9d1ba9c6c53ad19124662aa1825cdd78ece82c47f3 + sha256sums = 86dd06b2a1bd7b050763346d2bd16a63c914c516782df64a3c6c78268ea33e06 + sha256sums = 4390d712d64d50e2cd8d0cea3a53317cda4e7a21bd99a346f1bd82d18514b6f5 + sha256sums = 73c2780b8efe19f32ea433d2254e0ceeb503f77004812048e3fcef5da363fd31 + sha256sums = 272db976e1a219063d87b8ef21537fbe8959c87acbb34de4cbe5b995bc2eb46a + sha256sums = 43c5a589616a200ded1a2c81b2d4c09919dc96b7ed0df50dea97148f373db147 + sha256sums = 1fbc2aecb48912ef1f4563f5eb4a1d3f5fad0767052a763cebe72d631cdf1e77 + sha256sums = e7f591f23724529b6f45182352f0a4274d4c09f0a2686d7f6588857c3d81df08 + sha256sums = 313ae6611f91ce7c12366035f0271a1bd1fa787f68a652de95f2fd55a71b4e1f + sha256sums = 7de102a3e66bf6aafeb3c0cd0ae49b344e166b902d4d29fd33366883b11f1d5d + sha256sums = 5e9b7c818bd972c694075a0a01d0f44a9d6d6aaf9e3b36174702b8839f30b76b + sha256sums = b707bf9d69cf866dd776e5c07235161186747607dc24264320784e1222272fcc + sha256sums = 04811ea7c29e15a9d5c63c6f483804ec2538e8e826c3c06019b78a98435b56b2 + sha256sums = ce7dc86c30f160e6d565c579a84e0b0f799b1afa751ebe0748a0e80f8408cb7f + sha256sums = 55959f673e409ea952661cbddfb8b046bec7cda3d8b05686bed82ace4246e273 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 32c8bc3e704f..3cf2db08aaaf 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 30fa1f27688dd6b7263479bdfaefb266102427c3 Mon Sep 17 00:00:00 2001 +From 5ab173c6ee597e09eecf53411ec3726c19a40ce5 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Thu, 5 Nov 2020 22:08:10 +0100 Subject: [PATCH 01/17] Use CMake's default import library suffix @@ -98,7 +98,7 @@ index 24ed125f12b..73ebe453d3d 100644 CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake -index 32d0693311d..566cbac3799 100644 +index 8a0d07feac7..17d7b8fc123 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -550,7 +550,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target) diff --git a/0002-Fix-finding-D-Bus.patch b/0002-Fix-finding-D-Bus.patch index 46145217abff..99c69292396a 100644 --- a/0002-Fix-finding-D-Bus.patch +++ b/0002-Fix-finding-D-Bus.patch @@ -1,4 +1,4 @@ -From 238012eaa343098ec97473788bec60cc74587800 Mon Sep 17 00:00:00 2001 +From f6576a2efd85e14323eacb15725f48351e7c6a40 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 7 Oct 2020 12:13:37 +0200 Subject: [PATCH 02/17] 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 6e50a5b1f6e1..d15fe6a7256b 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 a77593b453a5361feb0dd053dbe389fdd5501cdd Mon Sep 17 00:00:00 2001 +From 7e76f866f256a65e49dab374c90366f98bcb2415 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Thu, 5 Nov 2020 21:13:19 +0100 Subject: [PATCH 03/17] Fix using static PCRE2 and DBus-1 @@ -13,7 +13,7 @@ Change-Id: I2387b79462b6d183b71f9433dd937f63fc7ef26e 2 files changed, 9 insertions(+) diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp -index b00d263b710..032812ae861 100644 +index a1e288ae6ce..41f943cdf19 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp @@ -20,6 +20,11 @@ @@ -29,7 +29,7 @@ index b00d263b710..032812ae861 100644 #include <pcre2.h> diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h -index e3008be7619..9c745c16c41 100644 +index 78b7e049ef3..d06a3b04aac 100644 --- a/src/dbus/qdbus_symbols_p.h +++ b/src/dbus/qdbus_symbols_p.h @@ -21,6 +21,10 @@ diff --git a/0004-Fix-transitive-dependencies-of-static-libraries.patch b/0004-Fix-transitive-dependencies-of-static-libraries.patch index 7bb7b38a698f..f78f4d660787 100644 --- a/0004-Fix-transitive-dependencies-of-static-libraries.patch +++ b/0004-Fix-transitive-dependencies-of-static-libraries.patch @@ -1,4 +1,4 @@ -From f54f12d78abb6cd209f79c2309d6b50cff64c06e Mon Sep 17 00:00:00 2001 +From 1818236acb18356b2fbdd3bca4e7e36f55347c47 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Thu, 5 Nov 2020 21:59:33 +0100 Subject: [PATCH 04/17] Fix transitive dependencies (of static libraries) @@ -119,12 +119,12 @@ index 967ccc5c026..9a7d5150dcf 100644 unset(__png_target_name) unset(__png_found) diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt -index d392f4dfa55..165c345e1ba 100644 +index 2f55ab49500..bcf0bdbb42e 100644 --- a/src/plugins/sqldrivers/psql/CMakeLists.txt +++ b/src/plugins/sqldrivers/psql/CMakeLists.txt -@@ -17,7 +17,7 @@ qt_internal_add_plugin(QPSQLDriverPlugin - QT_NO_CAST_FROM_ASCII +@@ -18,7 +18,7 @@ qt_internal_add_plugin(QPSQLDriverPlugin QT_NO_CAST_TO_ASCII + QT_NO_CONTEXTLESS_CONNECT LIBRARIES - PostgreSQL::PostgreSQL + PostgreSQL::PostgreSQL ${POSTGRESQL_DEPENDENCIES} 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 16dcd04ffeb4..1e7e5d742ad5 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 9304a56442c6af9deec0a4d084477e0daf63e24e Mon Sep 17 00:00:00 2001 +From 4819b1a1a2216cb11ebc847e1aec4f7b2587386b Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Mon, 2 Nov 2020 13:47:45 +0100 Subject: [PATCH 05/17] Fix libjpeg workaround for conflict with rpcndr.h @@ -13,7 +13,7 @@ Change-Id: I011b7735485689c9797cffe2646c8c3d15d0645e 1 file changed, 1 insertion(+) diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp -index 0d72ba01d04..a706fb4cea3 100644 +index 6bc7712c617..db5500d99ea 100644 --- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp +++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp @@ -26,6 +26,7 @@ diff --git a/0006-Support-finding-static-MariaDB-client-library.patch b/0006-Support-finding-static-MariaDB-client-library.patch index bdc06f3201be..534bf5903c69 100644 --- a/0006-Support-finding-static-MariaDB-client-library.patch +++ b/0006-Support-finding-static-MariaDB-client-library.patch @@ -1,4 +1,4 @@ -From 5e59b3c67062118177e0e4370db7d06b05c276da Mon Sep 17 00:00:00 2001 +From 31e89a3cc37e127d89a7d004a433be806912e09e Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 8 Nov 2020 00:33:12 +0100 Subject: [PATCH 06/17] 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 70b88d8015c9..535a3f6b1a8d 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 ee08e83b5a8bc4960326f15229ee9f033be8134b Mon Sep 17 00:00:00 2001 +From 2ea39a8625fa2a8bd61c91fd479b4299b4181f3f Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 8 Nov 2020 00:34:09 +0100 Subject: [PATCH 07/17] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer diff --git a/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch b/0008-Find-fontconfig-via-pkg-config-for-correct-handling-.patch index b5f7d0aaffc5..268b8e21b6ac 100644 --- a/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch +++ b/0008-Find-fontconfig-via-pkg-config-for-correct-handling-.patch @@ -1,7 +1,7 @@ -From 3e13be5576b33773f16a4a4cdddbaab6235eae85 Mon Sep 17 00:00:00 2001 +From 5a4ab8c0fb624472ae7e4ad56c2d74b9cc67d57a Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 24 Apr 2022 23:00:27 +0200 -Subject: [PATCH 09/17] Find fontconfig via pkg-config for correct handling of +Subject: [PATCH 08/17] Find fontconfig via pkg-config for correct handling of its dependencies CMake's own find module unforunately does not consider fontconfig's deps so @@ -33,10 +33,10 @@ index 00000000000..1a52327ae6f + set(Fontconfig_FOUND 1) +endif() diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt -index 820b943f16d..c6eb55f0a56 100644 +index 3207244afd2..b0cbee37bbb 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt -@@ -710,7 +710,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_fre +@@ -736,7 +736,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_fre text/unix/qfontconfigdatabase.cpp text/unix/qfontconfigdatabase_p.h text/unix/qfontenginemultifontconfig.cpp text/unix/qfontenginemultifontconfig_p.h LIBRARIES @@ -46,7 +46,7 @@ index 820b943f16d..c6eb55f0a56 100644 qt_internal_extend_target(Gui CONDITION APPLE AND NOT MACOS diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake -index 222073adcdd..27cdac0dbf5 100644 +index 4affd7b30a5..141675b5e6e 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -43,7 +43,7 @@ qt_find_package(WrapSystemFreetype 2.2.0 PROVIDED_TARGETS WrapSystemFreetype::Wr diff --git a/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch b/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch deleted file mode 100644 index 179d84763d85..000000000000 --- a/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch +++ /dev/null @@ -1,252 +0,0 @@ -From cc87940ac0e524bc249bc79c343eaa1502d8bbc1 Mon Sep 17 00:00:00 2001 -From: Martchus <martchus@gmx.net> -Date: Sat, 26 Jun 2021 22:24:12 +0200 -Subject: [PATCH 08/17] Fix crashes in rasterization code using setjmp -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* Use C++ exceptions instead of setjmp to workaround crashes -* The setjmp/longjmp code crashes when compiling for x86_64-w64-mingw32 - with GCC 11 and optimizations enabled¹. It crashes when jumping back - to handle the case of insufficient memory. This change uses C++ - exceptions instead (turning the compile unit into a C++ unit instead - of just using C) which should behave identical but don't seem to - crash. -* Fix rendering certain SVGs and possibly other graphics - -Change-Id: I01937d13569dd01ab4cb1f608020544c93bc343c - ---- - -¹ See https://bugreports.qt.io/browse/QTBUG-94692 for details. ---- - src/gui/CMakeLists.txt | 7 +++- - .../{qgrayraster.c => qgrayraster.cpp} | 41 ++++++++----------- - src/gui/painting/qt_attribution.json | 2 +- - 3 files changed, 24 insertions(+), 26 deletions(-) - rename src/gui/painting/{qgrayraster.c => qgrayraster.cpp} (98%) - -diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt -index dded14bb313..820b943f16d 100644 ---- a/src/gui/CMakeLists.txt -+++ b/src/gui/CMakeLists.txt -@@ -174,7 +174,7 @@ qt_internal_add_module(Gui - painting/qdrawingprimitive_sse2_p.h - painting/qemulationpaintengine.cpp painting/qemulationpaintengine_p.h - painting/qfixed_p.h -- painting/qgrayraster.c painting/qgrayraster_p.h -+ painting/qgrayraster.cpp painting/qgrayraster_p.h - painting/qicc.cpp painting/qicc_p.h - painting/qimagescale.cpp painting/qimagescale_p.h - painting/qmath_p.h -@@ -283,6 +283,11 @@ qt_internal_add_module(Gui - "(^|/)qrhi\\.h$|(^|/)qrhi_platform\\.h$|(^|/)qshader\\.h$|(^|/)qshaderdescription\\.h$" - ) - -+# 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 -+) -+ - # Resources: - set_source_files_properties("../3rdparty/icc/sRGB2014.icc" - PROPERTIES QT_RESOURCE_ALIAS "sRGB2014.icc" -diff --git a/src/gui/painting/qgrayraster.c b/src/gui/painting/qgrayraster.cpp -similarity index 98% -rename from src/gui/painting/qgrayraster.c -rename to src/gui/painting/qgrayraster.cpp -index 3c222c49e16..813cfc08dcf 100644 ---- a/src/gui/painting/qgrayraster.c -+++ b/src/gui/painting/qgrayraster.cpp -@@ -3,7 +3,7 @@ - - /***************************************************************************/ - /* */ --/* qgrayraster.c, derived from ftgrays.c */ -+/* qgrayraster.cpp, derived from ftgrays.c */ - /* */ - /* A new `perfect' anti-aliasing renderer (body). */ - /* */ -@@ -121,17 +121,12 @@ - # include <vxWorksCommon.h> /* needed for setjmp.h */ - #endif - #include <string.h> /* for qt_ft_memcpy() */ --#include <setjmp.h> - #include <limits.h> - - #define QT_FT_UINT_MAX UINT_MAX - - #define qt_ft_memset memset - --#define qt_ft_setjmp setjmp --#define qt_ft_longjmp longjmp --#define qt_ft_jmp_buf jmp_buf -- - #include <stddef.h> - typedef ptrdiff_t QT_FT_PtrDist; - -@@ -141,6 +136,8 @@ typedef ptrdiff_t QT_FT_PtrDist; - #define ErrRaster_Memory_Overflow -4 - #define ErrRaster_OutOfMemory -6 - -+struct RasterMemoryOverflow {}; -+ - #define QT_FT_BEGIN_HEADER - #define QT_FT_END_HEADER - -@@ -274,8 +271,6 @@ QT_FT_END_STMNT - int band_size; - int band_shoot; - -- qt_ft_jmp_buf jump_buffer; -- - void* buffer; - long buffer_size; - -@@ -297,12 +292,14 @@ QT_FT_END_STMNT - - } TRaster, *PRaster; - -+ extern "C" { - int q_gray_rendered_spans(TRaster *raster) - { - if ( raster && raster->worker ) - return raster->worker->skip_spans > 0 ? 0 : -raster->worker->skip_spans; - return 0; - } -+ } - - /*************************************************************************/ - /* */ -@@ -368,7 +365,6 @@ QT_FT_END_STMNT - ras.max_ey = ( ras.max_ey + 63 ) >> 6; - } - -- - /*************************************************************************/ - /* */ - /* Record the current cell in the table. */ -@@ -397,7 +393,7 @@ QT_FT_END_STMNT - } - - if ( ras.num_cells >= ras.max_cells ) -- qt_ft_longjmp( ras.jump_buffer, 1 ); -+ throw RasterMemoryOverflow(); - - cell = ras.cells + ras.num_cells++; - cell->x = x; -@@ -1470,7 +1466,7 @@ QT_FT_END_STMNT - - QT_FT_TRACE5(( " move to (%.2f, %.2f)\n", - v_start.x / 64.0, v_start.y / 64.0 )); -- error = gray_move_to( &v_start, user ); -+ error = gray_move_to( &v_start, static_cast<PWorker>(user) ); - if ( error ) - goto Exit; - -@@ -1492,7 +1488,7 @@ QT_FT_END_STMNT - - QT_FT_TRACE5(( " line to (%.2f, %.2f)\n", - vec.x / 64.0, vec.y / 64.0 )); -- gray_render_line(user, UPSCALE(vec.x), UPSCALE(vec.y)); -+ gray_render_line(static_cast<PWorker>(user), UPSCALE(vec.x), UPSCALE(vec.y)); - continue; - } - -@@ -1521,7 +1517,7 @@ QT_FT_END_STMNT - " with control (%.2f, %.2f)\n", - vec.x / 64.0, vec.y / 64.0, - v_control.x / 64.0, v_control.y / 64.0 )); -- gray_render_conic(user, &v_control, &vec); -+ gray_render_conic(static_cast<PWorker>(user), &v_control, &vec); - continue; - } - -@@ -1535,7 +1531,7 @@ QT_FT_END_STMNT - " with control (%.2f, %.2f)\n", - v_middle.x / 64.0, v_middle.y / 64.0, - v_control.x / 64.0, v_control.y / 64.0 )); -- gray_render_conic(user, &v_control, &v_middle); -+ gray_render_conic(static_cast<PWorker>(user), &v_control, &v_middle); - - v_control = vec; - goto Do_Conic; -@@ -1545,7 +1541,7 @@ QT_FT_END_STMNT - " with control (%.2f, %.2f)\n", - v_start.x / 64.0, v_start.y / 64.0, - v_control.x / 64.0, v_control.y / 64.0 )); -- gray_render_conic(user, &v_control, &v_start); -+ gray_render_conic(static_cast<PWorker>(user), &v_control, &v_start); - goto Close; - } - -@@ -1580,7 +1576,7 @@ QT_FT_END_STMNT - vec.x / 64.0, vec.y / 64.0, - vec1.x / 64.0, vec1.y / 64.0, - vec2.x / 64.0, vec2.y / 64.0 )); -- gray_render_cubic(user, &vec1, &vec2, &vec); -+ gray_render_cubic(static_cast<PWorker>(user), &vec1, &vec2, &vec); - continue; - } - -@@ -1589,7 +1585,7 @@ QT_FT_END_STMNT - v_start.x / 64.0, v_start.y / 64.0, - vec1.x / 64.0, vec1.y / 64.0, - vec2.x / 64.0, vec2.y / 64.0 )); -- gray_render_cubic(user, &vec1, &vec2, &v_start); -+ gray_render_cubic(static_cast<PWorker>(user), &vec1, &vec2, &v_start); - goto Close; - } - } -@@ -1598,7 +1594,7 @@ QT_FT_END_STMNT - /* close the contour with a line segment */ - QT_FT_TRACE5(( " line to (%.2f, %.2f)\n", - v_start.x / 64.0, v_start.y / 64.0 )); -- gray_render_line(user, UPSCALE(v_start.x), UPSCALE(v_start.y)); -+ gray_render_line(static_cast<PWorker>(user), UPSCALE(v_start.x), UPSCALE(v_start.y)); - - Close: - first = last + 1; -@@ -1626,14 +1622,11 @@ QT_FT_END_STMNT - { - volatile int error = 0; - -- if ( qt_ft_setjmp( ras.jump_buffer ) == 0 ) -- { -+ try { - error = QT_FT_Outline_Decompose( &ras.outline, &ras ); - if ( !ras.invalid ) - gray_record_cell( RAS_VAR ); -- } -- else -- { -+ } catch (const RasterMemoryOverflow &) { - error = ErrRaster_Memory_Overflow; - } - -@@ -1898,7 +1891,7 @@ QT_FT_END_STMNT - static int - gray_raster_new( QT_FT_Raster* araster ) - { -- *araster = malloc(sizeof(TRaster)); -+ *araster = static_cast<TRaster *>(malloc(sizeof(TRaster))); - if (!*araster) { - *araster = 0; - return ErrRaster_Memory_Overflow; -diff --git a/src/gui/painting/qt_attribution.json b/src/gui/painting/qt_attribution.json -index 33ed2fd5c7b..658547ce4a8 100644 ---- a/src/gui/painting/qt_attribution.json -+++ b/src/gui/painting/qt_attribution.json -@@ -4,7 +4,7 @@ - "Name": "Anti-aliasing rasterizer from FreeType 2", - "QDocModule": "qtgui", - "QtUsage": "Used in Qt GUI.", -- "Files": "qgrayraster.c", -+ "Files": "qgrayraster.cpp", - - "Description": "FreeType is a freely available software library to render fonts.", - "Homepage": "http://www.freetype.org", --- -2.44.0 - diff --git a/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch b/0009-Fix-dependency-of-xcb-image-on-xcb-util.patch index 1f79d3405f86..3fcb413906d8 100644 --- a/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch +++ b/0009-Fix-dependency-of-xcb-image-on-xcb-util.patch @@ -1,7 +1,7 @@ -From 1f7ead09cc41d8be6f60b03ace9d6583be130bbe Mon Sep 17 00:00:00 2001 +From 0dbe526b2008f4ceadf5d64f5727c56f186dee20 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 24 Apr 2022 23:49:36 +0200 -Subject: [PATCH 10/17] Fix dependency of xcb-image on xcb-util +Subject: [PATCH 09/17] Fix dependency of xcb-image on xcb-util Considering this linker error, xcb-image apparently depends on xcb-util: ``` diff --git a/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch b/0010-Allow-using-properties-of-PkgConfig-targets-for-glib.patch index a23fbf7a7e27..894c7ab3ae37 100644 --- a/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch +++ b/0010-Allow-using-properties-of-PkgConfig-targets-for-glib.patch @@ -1,7 +1,7 @@ -From b372fe6ab04d2ab06c173f16f8f116f477ff025b Mon Sep 17 00:00:00 2001 +From d4755a76385f7168f2571be3e10604579c51e505 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Tue, 26 Apr 2022 20:16:31 +0200 -Subject: [PATCH 11/17] Allow using properties of PkgConfig targets for glib2 +Subject: [PATCH 10/17] Allow using properties of PkgConfig targets for glib2 to handle deps of static glib2 Change-Id: I37d20256d17ae9cc0775e32aa479f1e433ece908 diff --git a/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch b/0011-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch index 22036c58efc9..56b52abc27d6 100644 --- a/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch +++ b/0011-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch @@ -1,7 +1,7 @@ -From 02b48c168d191668a4b22a950ed507aafdaf8c55 Mon Sep 17 00:00:00 2001 +From ffc4949b3ef9aba745c39fe137d04ebeb7218e27 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 1 May 2022 23:28:26 +0200 -Subject: [PATCH 12/17] Allow using properties of PkgConfig targets for Wayland +Subject: [PATCH 11/17] Allow using properties of PkgConfig targets for Wayland to handle deps of static libs Change-Id: I2a4acf0acaf5a363d551384bb4c33c48a3792f27 diff --git a/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch b/0012-Allow-overriding-preference-for-shared-libzstd-libra.patch index 520604a85f85..3023aa823104 100644 --- a/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch +++ b/0012-Allow-overriding-preference-for-shared-libzstd-libra.patch @@ -1,7 +1,7 @@ -From 4e1a0159903caec1b32ed1556dffecb66eba5298 Mon Sep 17 00:00:00 2001 +From 76d4c957cc1bc010b95a1fd755edd8d5a9b0b5ca Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Tue, 7 Nov 2023 23:58:54 +0100 -Subject: [PATCH 13/17] Allow overriding preference for shared libzstd library +Subject: [PATCH 12/17] Allow overriding preference for shared libzstd library As of 3f45905953d57e0174059d7d9d6bc75c3c1c406c Qt prefers the shared zstd library. This breaks static builds. With this change the static library is diff --git a/0014-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch b/0013-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch index bf04d417efab..42bde496d8b3 100644 --- a/0014-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch +++ b/0013-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch @@ -1,7 +1,7 @@ -From 3cb82f403853a4e18280f369394fc2da36b29a01 Mon Sep 17 00:00:00 2001 +From 4c0319dc229bec434f0ac6df9eff6826d3d06f91 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sat, 17 Feb 2024 20:31:12 +0100 -Subject: [PATCH 14/17] Fix errors due to disabled exceptions with cpp_winrt +Subject: [PATCH 13/17] Fix errors due to disabled exceptions with cpp_winrt support The winrt headers use exceptions so code using them must be compiled @@ -13,7 +13,7 @@ Change-Id: I216f65b260062ff2020f8a288ddda78c3e9fc3c9 1 file changed, 1 insertion(+) diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt -index ca1bbcb758c..16fd2cd2be9 100644 +index ea119bfb1e2..4cc9b87ced7 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -9,6 +9,7 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin diff --git a/0015-Fix-setting-exception-flags-of-plugin-targets.patch b/0014-Fix-setting-exception-flags-of-plugin-targets.patch index 87f99ffae728..8a8593860eba 100644 --- a/0015-Fix-setting-exception-flags-of-plugin-targets.patch +++ b/0014-Fix-setting-exception-flags-of-plugin-targets.patch @@ -1,7 +1,7 @@ -From 16270d06822ab9ad3f0aa179c32607ad7260a6ad Mon Sep 17 00:00:00 2001 +From 5c025309750ea1093f46b2227d76348de5c0d4aa Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sat, 17 Feb 2024 20:48:21 +0100 -Subject: [PATCH 15/17] Fix setting exception flags of plugin targets +Subject: [PATCH 14/17] Fix setting exception flags of plugin targets Change-Id: I93b1b5fa55f3e35e13351d9c981409f1593bf8a8 --- diff --git a/0016-Link-corelib-correctly-against-runtimeobject-when-co.patch b/0015-Link-corelib-correctly-against-runtimeobject-when-co.patch index 9ba902becbc8..2e0dba6786a5 100644 --- a/0016-Link-corelib-correctly-against-runtimeobject-when-co.patch +++ b/0015-Link-corelib-correctly-against-runtimeobject-when-co.patch @@ -1,41 +1,41 @@ -From 31f9863d7d2228baaea7be1debf94d1e272c6768 Mon Sep 17 00:00:00 2001 +From 7ac1996bcf302e058b3537c1fa09b443523fe4e3 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sat, 17 Feb 2024 21:39:39 +0100 -Subject: [PATCH 16/17] Link corelib correctly against runtimeobject when +Subject: [PATCH 15/17] Link corelib correctly against runtimeobject when compiling for Windows This library is included by mingw-w64 and also needs to be linked against for code in `qlocale_win.cpp` enabled via the `cpp_winrt` feature flag. -Change-Id: Ie3bd0290bb2f1c0d227c60a6cf6580efddd837fd +Change-Id: I9f06f3845165afaf305a0fc7771a1093cba08811 --- src/corelib/CMakeLists.txt | 3 +-- .../networkinformation/networklistmanager/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt -index f4bd31b55d4..ba7c025d722 100644 +index bf24eec2cfb..7816b9e37b0 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt -@@ -779,8 +779,7 @@ qt_internal_extend_target(Core CONDITION WIN32 - text/qlocale_win.cpp +@@ -819,8 +819,7 @@ qt_internal_extend_target(Core CONDITION WASM + text/qlocale_wasm.cpp ) -# On MS-Win, clang has two flavors, one of which immitates MSVC (so claims to be it) --qt_internal_extend_target(Core CONDITION WIN32 AND MSVC AND NOT CLANG +-qt_internal_extend_target(Core CONDITION MSVC +qt_internal_extend_target(Core CONDITION WIN32 LIBRARIES runtimeobject ) diff --git a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt -index a9acc465f36..acd3754f4e5 100644 +index f15eedf866b..acd3754f4e5 100644 --- a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt +++ b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt @@ -14,7 +14,7 @@ qt_internal_add_plugin(QNLMNIPlugin Qt::NetworkPrivate ) --qt_internal_extend_target(QNLMNIPlugin CONDITION WIN32 AND MSVC AND NOT CLANG +-qt_internal_extend_target(QNLMNIPlugin CONDITION MSVC +qt_internal_extend_target(QNLMNIPlugin CONDITION WIN32 LIBRARIES runtimeobject diff --git a/0017-Workaround-linker-error-about-missing-symbol-__sync_.patch b/0016-Workaround-linker-error-about-missing-symbol-__sync_.patch index 3a5b33741e6e..9ff13a8df043 100644 --- a/0017-Workaround-linker-error-about-missing-symbol-__sync_.patch +++ b/0016-Workaround-linker-error-about-missing-symbol-__sync_.patch @@ -1,7 +1,7 @@ -From 267f6ff8b49fca1b16463864fe18accbf81d6e37 Mon Sep 17 00:00:00 2001 +From 3176558331d11327354603618f6bb6a26705c50c Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sat, 17 Feb 2024 23:11:18 +0100 -Subject: [PATCH 17/17] Workaround linker error about missing symbol +Subject: [PATCH 16/17] Workaround linker error about missing symbol `__sync_bool_compare_and_swap_16` This error only happens when compiling for the x86_64-w64-mingw32 target @@ -10,7 +10,7 @@ avoid it. This means the `CMPXCHG16B` instruction is required but this code will only run on newer systems anyway (considering Qt requires Windows 10). -Change-Id: I02c47c386d80e5f8a21bb2a4cee83e2141dee481 +Change-Id: I1b96a6dc44c5f7d527dbed9db58b4f030f175721 --- src/corelib/CMakeLists.txt | 5 +++++ .../networkinformation/networklistmanager/CMakeLists.txt | 5 +++++ @@ -19,11 +19,11 @@ Change-Id: I02c47c386d80e5f8a21bb2a4cee83e2141dee481 4 files changed, 20 insertions(+) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt -index ba7c025d722..fbb40bb8305 100644 +index 7816b9e37b0..6f908c9fa75 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt -@@ -779,6 +779,11 @@ qt_internal_extend_target(Core CONDITION WIN32 - text/qlocale_win.cpp +@@ -819,6 +819,11 @@ qt_internal_extend_target(Core CONDITION WASM + text/qlocale_wasm.cpp ) +# workaround undefined reference to `__sync_bool_compare_and_swap_16' @@ -51,10 +51,10 @@ index acd3754f4e5..0557c60afd1 100644 set_property(TARGET QNLMNIPlugin PROPERTY AUTOGEN_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/autogen") diff --git a/src/plugins/platforms/direct2d/CMakeLists.txt b/src/plugins/platforms/direct2d/CMakeLists.txt -index e21b230cd78..e44587af743 100644 +index fe4a237aff3..98f96827ab2 100644 --- a/src/plugins/platforms/direct2d/CMakeLists.txt +++ b/src/plugins/platforms/direct2d/CMakeLists.txt -@@ -82,6 +82,11 @@ qt_internal_add_plugin(QWindowsDirect2DIntegrationPlugin +@@ -83,6 +83,11 @@ qt_internal_add_plugin(QWindowsDirect2DIntegrationPlugin runtimeobject ) @@ -67,10 +67,10 @@ index e21b230cd78..e44587af743 100644 set_source_files_properties("../windows/openglblacklists/default.json" PROPERTIES QT_RESOURCE_ALIAS "default.json" diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt -index 16fd2cd2be9..2521707ddae 100644 +index 4cc9b87ced7..d767b2a2659 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt -@@ -70,6 +70,11 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin +@@ -71,6 +71,11 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin runtimeobject ) diff --git a/0017-Fix-wrong-cpp-conditional-in-qspan.h.patch b/0017-Fix-wrong-cpp-conditional-in-qspan.h.patch new file mode 100644 index 000000000000..97fd63d72b20 --- /dev/null +++ b/0017-Fix-wrong-cpp-conditional-in-qspan.h.patch @@ -0,0 +1,28 @@ +From 97da3cf6be021886a367ce894425f842059fbdcf Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Tue, 2 Apr 2024 23:29:07 +0200 +Subject: [PATCH 17/17] Fix wrong cpp conditional in qspan.h + +Picked from https://gitlab.archlinux.org/archlinux/packaging/packages/qt6-base/-/blob/main/fix-wrong-cpp-if.patch + +Change-Id: I29a1fb31a43a5fc61b312d6746cf125c48dc802f +--- + src/corelib/tools/qspan.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/corelib/tools/qspan.h b/src/corelib/tools/qspan.h +index c9de1005a77..d6ae2570ae3 100644 +--- a/src/corelib/tools/qspan.h ++++ b/src/corelib/tools/qspan.h +@@ -297,7 +297,7 @@ public: + : QSpanBase(il.begin(), il.size()) + {} + +-#if __cpp_lib_span ++#ifdef __cpp_lib_span + template <typename S, size_t N, if_qualification_conversion<S> = true> + Q_IMPLICIT constexpr QSpanBase(std::span<S, N> other) noexcept + : QSpanBase(other.data(), other.size()) +-- +2.44.0 + @@ -11,7 +11,7 @@ # All patches are managed at https://github.com/Martchus/qtbase pkgname=mingw-w64-qt6-base -_qtver=6.6.3 +_qtver=6.7.0 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -38,34 +38,34 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm '0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch' '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' - '0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch' - '0010-Fix-dependency-of-xcb-image-on-xcb-util.patch' - '0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch' - '0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch' - '0013-Allow-overriding-preference-for-shared-libzstd-libra.patch' - '0014-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch' - '0015-Fix-setting-exception-flags-of-plugin-targets.patch' - '0016-Link-corelib-correctly-against-runtimeobject-when-co.patch' - '0017-Workaround-linker-error-about-missing-symbol-__sync_.patch') -sha256sums=('0493fd0b380c4edf8872f011a7f26d245aa4cdd75b349904ef340a22dedf7462' - '4436fa3cb4ae8042d4e7420dd69aff5e7ee90eab623b55290dadb4347f3af562' - '5535db09b73284474eaf13181f52f52d67acad39f9fdc3a4cbd9938354e431b5' - 'c4dd118f2670f526d1a294e00db91e3bc8e3fc733ece40f3d42e14f4210c9d9e' - '9e4e0cffecb7718c76f6f1f5d1d73bfddb630339ebb71e1fe947b0abe1cd9696' - '2365407788639c006c03b0c9ab524c1335a4175623e92d537b6e134b5b78793d' - '9de86821cb75a0c7f6ffd26188a58347d4982497460aa1940ae7c6fd19a05e11' - '721c32de68daca63ee2440218da7f998d052cf5122f0266ce18dc9fcf979d743' - 'e8540d9b2b06a149668e389d8713a5e5d70a6728a01f7678fec36091f10d57a1' - '25aaadd7ea30f4fc2d75f3bcb8dcb0a82e1fed23c7c34fa1deb7369032f9e24e' - '7f1d483ab4b229c60a0658c6da18fb82619e0d8696ad5010de40748ce0b15b85' - 'e61047f9f167c9229978895cd19cb7cbd722620fb600d48f63dcc8f727b79b09' - 'e2811f2f857bf09572622cfec907bf738f3fdca1da9d83acd6cbaa62aa12ec85' - '4b3a18cb211bdbdefda2ac34e97d16bc989e969ab77983cfcef8a75e06366504' - 'd3a02fb4fe241187ce9dd91123e661cde1e6ccdb098c26a9f7a2209b20074c89' - '3652e0a71c16c2d7ec249f349cd38374d32b0f87401b4ef3e2f583e0e290ec78' - '022dbdf8b2e89bb4ec80311807aaae46cb52896dd89ecb212adc5c7b7ab59be6' - '1497d88387d761da233588b024cdb46e7f02b4a7a3efcc9508317fd4571e008c') + '0008-Find-fontconfig-via-pkg-config-for-correct-handling-.patch' + '0009-Fix-dependency-of-xcb-image-on-xcb-util.patch' + '0010-Allow-using-properties-of-PkgConfig-targets-for-glib.patch' + '0011-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch' + '0012-Allow-overriding-preference-for-shared-libzstd-libra.patch' + '0013-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch' + '0014-Fix-setting-exception-flags-of-plugin-targets.patch' + '0015-Link-corelib-correctly-against-runtimeobject-when-co.patch' + '0016-Workaround-linker-error-about-missing-symbol-__sync_.patch' + '0017-Fix-wrong-cpp-conditional-in-qspan.h.patch') +sha256sums=('11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254' + 'e25f83ddf9e3f9eefcb833751cff8957f32cb2f13f5a1f033679b45d2c9e544e' + 'ae4a20f41df34eefc960ed5cb2cf54afb421573f08545d5492882edd18e00a3c' + '5d329d722365c07a28b85a9d1ba9c6c53ad19124662aa1825cdd78ece82c47f3' + '86dd06b2a1bd7b050763346d2bd16a63c914c516782df64a3c6c78268ea33e06' + '4390d712d64d50e2cd8d0cea3a53317cda4e7a21bd99a346f1bd82d18514b6f5' + '73c2780b8efe19f32ea433d2254e0ceeb503f77004812048e3fcef5da363fd31' + '272db976e1a219063d87b8ef21537fbe8959c87acbb34de4cbe5b995bc2eb46a' + '43c5a589616a200ded1a2c81b2d4c09919dc96b7ed0df50dea97148f373db147' + '1fbc2aecb48912ef1f4563f5eb4a1d3f5fad0767052a763cebe72d631cdf1e77' + 'e7f591f23724529b6f45182352f0a4274d4c09f0a2686d7f6588857c3d81df08' + '313ae6611f91ce7c12366035f0271a1bd1fa787f68a652de95f2fd55a71b4e1f' + '7de102a3e66bf6aafeb3c0cd0ae49b344e166b902d4d29fd33366883b11f1d5d' + '5e9b7c818bd972c694075a0a01d0f44a9d6d6aaf9e3b36174702b8839f30b76b' + 'b707bf9d69cf866dd776e5c07235161186747607dc24264320784e1222272fcc' + '04811ea7c29e15a9d5c63c6f483804ec2538e8e826c3c06019b78a98435b56b2' + 'ce7dc86c30f160e6d565c579a84e0b0f799b1afa751ebe0748a0e80f8408cb7f' + '55959f673e409ea952661cbddfb8b046bec7cda3d8b05686bed82ace4246e273') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt index 21b56735a692..7f03d3a380dc 100644 --- a/qtbase-sha256.txt +++ b/qtbase-sha256.txt @@ -1 +1 @@ -0493fd0b380c4edf8872f011a7f26d245aa4cdd75b349904ef340a22dedf7462 +11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254 |