diff options
20 files changed, 97 insertions, 143 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-qt6-base-static pkgdesc = A cross-platform application and UI framework (mingw-w64) - pkgver = 6.7.0 + pkgver = 6.7.1 pkgrel = 1 url = https://www.qt.io arch = any @@ -36,7 +36,7 @@ pkgbase = mingw-w64-qt6-base-static options = !buildflags options = staticlibs options = !emptydirs - source = https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtbase-everywhere-src-6.7.0.tar.xz + source = https://download.qt.io/official_releases/qt/6.7/6.7.1/submodules/qtbase-everywhere-src-6.7.1.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 @@ -53,24 +53,22 @@ pkgbase = mingw-w64-qt6-base-static 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 + sha256sums = b7338da1bdccb4d861e714efffaa83f174dfe37e194916bfd7ec82279a6ace19 + sha256sums = 305745c1effeb20fd63411342cf308d7f518b63f8e14b2c55d1ba31c45ae068f + sha256sums = 6113d9c8392f0e7a34e8220bbfb01d6af63543e260e7ed4f65029fd859212b0f + sha256sums = 220f32dc67cd256f706a135b072f639d88440ad8d5943ec7b311510eb7531cb7 + sha256sums = 2b6e95199698bc1af539ea39c37620b1170ddf77fa45c9120c3f0a59f58d8af1 + sha256sums = ccb04d5ca4b09cc8c19fab5427dcee8b4de6aaa4489f99e323830f66207318f6 + sha256sums = a8c1636dbf1480cbb3c56227e8b53dfd309293576cacefe689894dd6aaa8b597 + sha256sums = 48f6b23b2f34ce6158132b7b7ee6e7e527d65b26ec950777592dc0b80d1b96b0 + sha256sums = d2441d85329e70205532f8483a3e30b346861e44949b9803849677e61af496dd + sha256sums = 3dd924f235a129e8c008d6fe4d92dbeb1875eed74db0add801538584438e6629 + sha256sums = 5721ddde57dc808f99183cfca29491a014ff29b0bd6ed1397d189c3af3c20198 + sha256sums = bf658085615d03333bb44e30ba11760e27556844d5731b3f92a17bb6e5ff1c42 + sha256sums = 5c8b7919222b3df5c5ff92a4baebb2130100ddc11c0d6743816347cc2509597b + sha256sums = 1b2dad7aaabdc9922be87e2e90e49a270690c5935818efa8a7bd15a54de7cd73 + sha256sums = 863b60f362f477a48a2be440563f0f547db7102d8c79961fd9fa2295d35f2b0a + sha256sums = 29af07b430f2a416b8fd0a8241c07205232cb4eb31626c9444256d03ebdba92c + sha256sums = d1cbb46c443c64fe477fe5a6d9e0fd450e3f5c9f9423ce75c310659caef4d8db 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 3cf2db08aaaf..65fde26c6971 100644 --- a/0001-Use-CMake-s-default-import-library-suffix.patch +++ b/0001-Use-CMake-s-default-import-library-suffix.patch @@ -1,7 +1,7 @@ -From 5ab173c6ee597e09eecf53411ec3726c19a40ce5 Mon Sep 17 00:00:00 2001 +From b98455fa6cb955beb32c560768bf15ef02b4b8c2 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 +Subject: [PATCH 01/16] Use CMake's default import library suffix Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2 --- @@ -13,7 +13,7 @@ Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake -index f1d45cdcf6c..32ca0589699 100644 +index 0151fcb77b0..94c96be0397 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -523,9 +523,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features @@ -31,7 +31,7 @@ index f1d45cdcf6c..32ca0589699 100644 ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} ${CMAKE_STATIC_LIBRARY_SUFFIX}) if(MSVC) -@@ -976,9 +980,13 @@ CONFIG += ${private_config_joined} +@@ -991,9 +995,13 @@ CONFIG += ${private_config_joined} list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}") endforeach() @@ -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 8a0d07feac7..17d7b8fc123 100644 +index 31a1f1da030..023fb51c53c 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -550,7 +550,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target) @@ -110,5 +110,5 @@ index 8a0d07feac7..17d7b8fc123 100644 get_target_property(target_type ${target} TYPE) if(target_type STREQUAL "STATIC_LIBRARY") -- -2.44.0 +2.45.1 diff --git a/0002-Fix-finding-D-Bus.patch b/0002-Fix-finding-D-Bus.patch index 99c69292396a..2d1624de3ac9 100644 --- a/0002-Fix-finding-D-Bus.patch +++ b/0002-Fix-finding-D-Bus.patch @@ -1,7 +1,7 @@ -From f6576a2efd85e14323eacb15725f48351e7c6a40 Mon Sep 17 00:00:00 2001 +From 388c862005ba748e588b9888145ea233805d353d 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 +Subject: [PATCH 02/16] Fix finding D-Bus Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986 --- @@ -20,5 +20,5 @@ index e2a58790c4e..8e0ed81f893 100644 + set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY}) +endif() -- -2.44.0 +2.45.1 diff --git a/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/0003-Fix-using-static-PCRE2-and-DBus-1.patch index d15fe6a7256b..c03e981ca945 100644 --- a/0003-Fix-using-static-PCRE2-and-DBus-1.patch +++ b/0003-Fix-using-static-PCRE2-and-DBus-1.patch @@ -1,7 +1,7 @@ -From 7e76f866f256a65e49dab374c90366f98bcb2415 Mon Sep 17 00:00:00 2001 +From 31d36a1103e08bd695d05a240fd760a5ef6f9185 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 +Subject: [PATCH 03/16] Fix using static PCRE2 and DBus-1 When making a static build of Qt we're using the static version of these libraries and must define the corresponding macros. @@ -44,5 +44,5 @@ index 78b7e049ef3..d06a3b04aac 100644 # include <dbus/dbus.h> #else -- -2.44.0 +2.45.1 diff --git a/0004-Fix-transitive-dependencies-of-static-libraries.patch b/0004-Fix-transitive-dependencies-of-static-libraries.patch index f78f4d660787..80d854110011 100644 --- a/0004-Fix-transitive-dependencies-of-static-libraries.patch +++ b/0004-Fix-transitive-dependencies-of-static-libraries.patch @@ -1,7 +1,7 @@ -From 1818236acb18356b2fbdd3bca4e7e36f55347c47 Mon Sep 17 00:00:00 2001 +From 843c76c9b005938e5921c667af64c64afaf8bf6b 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) +Subject: [PATCH 04/16] Fix transitive dependencies (of static libraries) The dependencies of these libraries are not reliably picked up by their corresponding find modules. This change allows adding the required @@ -132,5 +132,5 @@ index 2f55ab49500..bcf0bdbb42e 100644 Qt::CorePrivate Qt::SqlPrivate -- -2.44.0 +2.45.1 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 1e7e5d742ad5..3b9a0735ce17 100644 --- a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch +++ b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch @@ -1,7 +1,7 @@ -From 4819b1a1a2216cb11ebc847e1aec4f7b2587386b Mon Sep 17 00:00:00 2001 +From 34ff174b475dff12bef9942808796df93072133a 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 +Subject: [PATCH 05/16] Fix libjpeg workaround for conflict with rpcndr.h Otherwise it won't compile against mingw-w64-libjpeg-turbo. This version of libjpeg seems to take care of the conflict already as long as jconfig.h is @@ -25,5 +25,5 @@ index 6bc7712c617..db5500d99ea 100644 #ifdef const # undef const // remove crazy C hackery in jconfig.h -- -2.44.0 +2.45.1 diff --git a/0006-Support-finding-static-MariaDB-client-library.patch b/0006-Support-finding-static-MariaDB-client-library.patch index 534bf5903c69..9becdffe1587 100644 --- a/0006-Support-finding-static-MariaDB-client-library.patch +++ b/0006-Support-finding-static-MariaDB-client-library.patch @@ -1,7 +1,7 @@ -From 31e89a3cc37e127d89a7d004a433be806912e09e Mon Sep 17 00:00:00 2001 +From 0d6f8018db765e3d10137aca8357783d54a7ce33 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 +Subject: [PATCH 06/16] Support finding static MariaDB client library We need to reverse the order to look for mariadb first (and only then for mysql) because otherwise it would pick up the static library @@ -34,5 +34,5 @@ index b61d0107f25..6fb26e51f13 100644 endif() -- -2.44.0 +2.45.1 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 535a3f6b1a8d..fa95f6f2da16 100644 --- a/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch +++ b/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch @@ -1,7 +1,7 @@ -From 2ea39a8625fa2a8bd61c91fd479b4299b4181f3f Mon Sep 17 00:00:00 2001 +From ffd4524cadfa5fe5b84f3809123ee5a0511c6416 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 +Subject: [PATCH 07/16] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer static libraries Change-Id: Ibb688ac503ecdf1dd3bd838890efdfc01bf706aa @@ -25,5 +25,5 @@ index 129f1ebb771..9bae62d8795 100644 # This depends on qt_internal_read_repo_dependencies existing. -- -2.44.0 +2.45.1 diff --git a/0008-Find-fontconfig-via-pkg-config-for-correct-handling-.patch b/0008-Find-fontconfig-via-pkg-config-for-correct-handling-.patch index 268b8e21b6ac..71d2c00e8032 100644 --- a/0008-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 5a4ab8c0fb624472ae7e4ad56c2d74b9cc67d57a Mon Sep 17 00:00:00 2001 +From 4e4ba608f3235c015b630bf99a7db810fae3a2bb Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 24 Apr 2022 23:00:27 +0200 -Subject: [PATCH 08/17] Find fontconfig via pkg-config for correct handling of +Subject: [PATCH 08/16] 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,7 +33,7 @@ index 00000000000..1a52327ae6f + set(Fontconfig_FOUND 1) +endif() diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt -index 3207244afd2..b0cbee37bbb 100644 +index 8ea68087cf9..c012c82d71d 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -736,7 +736,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_fre @@ -59,5 +59,5 @@ index 4affd7b30a5..141675b5e6e 100644 qt_find_package(gbm PROVIDED_TARGETS gbm::gbm MODULE_NAME gui QMAKE_LIB gbm) qt_find_package(WrapSystemHarfbuzz 2.6.0 PROVIDED_TARGETS WrapSystemHarfbuzz::WrapSystemHarfbuzz MODULE_NAME gui QMAKE_LIB harfbuzz) -- -2.44.0 +2.45.1 diff --git a/0009-Fix-dependency-of-xcb-image-on-xcb-util.patch b/0009-Fix-dependency-of-xcb-image-on-xcb-util.patch index 3fcb413906d8..d999feb6895a 100644 --- a/0009-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 0dbe526b2008f4ceadf5d64f5727c56f186dee20 Mon Sep 17 00:00:00 2001 +From 08893acbdaa85ee224d8303abb398539e3dca857 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 24 Apr 2022 23:49:36 +0200 -Subject: [PATCH 09/17] Fix dependency of xcb-image on xcb-util +Subject: [PATCH 09/16] Fix dependency of xcb-image on xcb-util Considering this linker error, xcb-image apparently depends on xcb-util: ``` @@ -44,5 +44,5 @@ index 26b9bf89633..0ae21f774c6 100644 set(XCB_XFIXES_component_deps XCB RENDER SHAPE) set(XCB_XVMC_component_deps XCB XV) -- -2.44.0 +2.45.1 diff --git a/0010-Allow-using-properties-of-PkgConfig-targets-for-glib.patch b/0010-Allow-using-properties-of-PkgConfig-targets-for-glib.patch index 894c7ab3ae37..0b5d3d46065e 100644 --- a/0010-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 d4755a76385f7168f2571be3e10604579c51e505 Mon Sep 17 00:00:00 2001 +From 23900fb9e7b62120bffe4bc99dd77b12ab272124 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Tue, 26 Apr 2022 20:16:31 +0200 -Subject: [PATCH 10/17] Allow using properties of PkgConfig targets for glib2 +Subject: [PATCH 10/16] Allow using properties of PkgConfig targets for glib2 to handle deps of static glib2 Change-Id: I37d20256d17ae9cc0775e32aa479f1e433ece908 @@ -70,5 +70,5 @@ index a6a16b494fd..a5da57824c9 100644 set_package_properties(GLIB2 PROPERTIES URL "https://wiki.gnome.org/Projects/GLib" -- -2.44.0 +2.45.1 diff --git a/0011-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch b/0011-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch index 56b52abc27d6..872efaf1db07 100644 --- a/0011-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 ffc4949b3ef9aba745c39fe137d04ebeb7218e27 Mon Sep 17 00:00:00 2001 +From 9f9fc15f32ba7d4cd7c334f7632b4c5ec85c4453 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 1 May 2022 23:28:26 +0200 -Subject: [PATCH 11/17] Allow using properties of PkgConfig targets for Wayland +Subject: [PATCH 11/16] Allow using properties of PkgConfig targets for Wayland to handle deps of static libs Change-Id: I2a4acf0acaf5a363d551384bb4c33c48a3792f27 @@ -49,5 +49,5 @@ index 233cc88d020..875c71377c6 100644 set_package_properties(Wayland PROPERTIES URL "http://wayland.freedesktop.org" -- -2.44.0 +2.45.1 diff --git a/0012-Allow-overriding-preference-for-shared-libzstd-libra.patch b/0012-Allow-overriding-preference-for-shared-libzstd-libra.patch index 3023aa823104..473c9861b7ac 100644 --- a/0012-Allow-overriding-preference-for-shared-libzstd-libra.patch +++ b/0012-Allow-overriding-preference-for-shared-libzstd-libra.patch @@ -1,7 +1,7 @@ -From 76d4c957cc1bc010b95a1fd755edd8d5a9b0b5ca Mon Sep 17 00:00:00 2001 +From 7287405108f6ef2f33dd7c47898de3dd58d575bc Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Tue, 7 Nov 2023 23:58:54 +0100 -Subject: [PATCH 12/17] Allow overriding preference for shared libzstd library +Subject: [PATCH 12/16] 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 @@ -34,5 +34,5 @@ index fb424236b89..12a3178518e 100644 if(NOT TARGET WrapZSTD::WrapZSTD) add_library(WrapZSTD::WrapZSTD INTERFACE IMPORTED) -- -2.44.0 +2.45.1 diff --git a/0013-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch b/0013-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch index 42bde496d8b3..8979bacc3efe 100644 --- a/0013-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 4c0319dc229bec434f0ac6df9eff6826d3d06f91 Mon Sep 17 00:00:00 2001 +From f838b97cceb50456b7140e24559aaee7c0eb0ab7 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sat, 17 Feb 2024 20:31:12 +0100 -Subject: [PATCH 13/17] Fix errors due to disabled exceptions with cpp_winrt +Subject: [PATCH 13/16] Fix errors due to disabled exceptions with cpp_winrt support The winrt headers use exceptions so code using them must be compiled @@ -25,5 +25,5 @@ index ea119bfb1e2..4cc9b87ced7 100644 main.cpp qtwindowsglobal.h -- -2.44.0 +2.45.1 diff --git a/0014-Fix-setting-exception-flags-of-plugin-targets.patch b/0014-Fix-setting-exception-flags-of-plugin-targets.patch index 8a8593860eba..f4fc9231ff0e 100644 --- a/0014-Fix-setting-exception-flags-of-plugin-targets.patch +++ b/0014-Fix-setting-exception-flags-of-plugin-targets.patch @@ -1,7 +1,7 @@ -From 5c025309750ea1093f46b2227d76348de5c0d4aa Mon Sep 17 00:00:00 2001 +From 262422d6f0440586eba990847575312c217c2b31 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sat, 17 Feb 2024 20:48:21 +0100 -Subject: [PATCH 14/17] Fix setting exception flags of plugin targets +Subject: [PATCH 14/16] Fix setting exception flags of plugin targets Change-Id: I93b1b5fa55f3e35e13351d9c981409f1593bf8a8 --- @@ -9,10 +9,10 @@ Change-Id: I93b1b5fa55f3e35e13351d9c981409f1593bf8a8 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake -index bc0f651b99c..0a832a71f08 100644 +index dbda32c6c53..63636616b2d 100644 --- a/cmake/QtPluginHelpers.cmake +++ b/cmake/QtPluginHelpers.cmake -@@ -376,8 +376,11 @@ function(qt_internal_add_plugin target) +@@ -381,8 +381,11 @@ function(qt_internal_add_plugin target) qt_internal_add_repo_local_defines("${target}") @@ -27,5 +27,5 @@ index bc0f651b99c..0a832a71f08 100644 set(qt_libs_private "") qt_internal_get_qt_all_known_modules(known_modules) -- -2.44.0 +2.45.1 diff --git a/0015-Link-corelib-correctly-against-runtimeobject-when-co.patch b/0015-Link-corelib-correctly-against-runtimeobject-when-co.patch index 2e0dba6786a5..fcb5fd6d0618 100644 --- a/0015-Link-corelib-correctly-against-runtimeobject-when-co.patch +++ b/0015-Link-corelib-correctly-against-runtimeobject-when-co.patch @@ -1,7 +1,7 @@ -From 7ac1996bcf302e058b3537c1fa09b443523fe4e3 Mon Sep 17 00:00:00 2001 +From ad906387f486d196bfe083bd98dcfe7b1359594c Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sat, 17 Feb 2024 21:39:39 +0100 -Subject: [PATCH 15/17] Link corelib correctly against runtimeobject when +Subject: [PATCH 15/16] Link corelib correctly against runtimeobject when compiling for Windows This library is included by mingw-w64 and also needs to be linked against @@ -9,12 +9,11 @@ for code in `qlocale_win.cpp` enabled via the `cpp_winrt` feature flag. Change-Id: I9f06f3845165afaf305a0fc7771a1093cba08811 --- - src/corelib/CMakeLists.txt | 3 +-- - .../networkinformation/networklistmanager/CMakeLists.txt | 2 +- - 2 files changed, 2 insertions(+), 3 deletions(-) + src/corelib/CMakeLists.txt | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt -index bf24eec2cfb..7816b9e37b0 100644 +index bbe8ba84890..06ede966852 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -819,8 +819,7 @@ qt_internal_extend_target(Core CONDITION WASM @@ -27,19 +26,6 @@ index bf24eec2cfb..7816b9e37b0 100644 LIBRARIES runtimeobject ) -diff --git a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt -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 MSVC -+qt_internal_extend_target(QNLMNIPlugin CONDITION WIN32 - LIBRARIES - runtimeobject - oleaut32 -- -2.44.0 +2.45.1 diff --git a/0016-Workaround-linker-error-about-missing-symbol-__sync_.patch b/0016-Workaround-linker-error-about-missing-symbol-__sync_.patch index 9ff13a8df043..d640f7ad1b2c 100644 --- a/0016-Workaround-linker-error-about-missing-symbol-__sync_.patch +++ b/0016-Workaround-linker-error-about-missing-symbol-__sync_.patch @@ -1,7 +1,7 @@ -From 3176558331d11327354603618f6bb6a26705c50c Mon Sep 17 00:00:00 2001 +From 05f08b29ebb960c76ceb7375b22005557fcbb8d2 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sat, 17 Feb 2024 23:11:18 +0100 -Subject: [PATCH 16/17] Workaround linker error about missing symbol +Subject: [PATCH 16/16] 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 @@ -19,7 +19,7 @@ Change-Id: I1b96a6dc44c5f7d527dbed9db58b4f030f175721 4 files changed, 20 insertions(+) diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt -index 7816b9e37b0..6f908c9fa75 100644 +index 06ede966852..ae036b97ca7 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -819,6 +819,11 @@ qt_internal_extend_target(Core CONDITION WASM @@ -83,5 +83,5 @@ index 4cc9b87ced7..d767b2a2659 100644 set_source_files_properties("openglblacklists/default.json" PROPERTIES QT_RESOURCE_ALIAS "default.json" -- -2.44.0 +2.45.1 diff --git a/0017-Fix-wrong-cpp-conditional-in-qspan.h.patch b/0017-Fix-wrong-cpp-conditional-in-qspan.h.patch deleted file mode 100644 index 97fd63d72b20..000000000000 --- a/0017-Fix-wrong-cpp-conditional-in-qspan.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -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-static -_qtver=6.7.0 +_qtver=6.7.1 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -46,26 +46,24 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm '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') + '0016-Workaround-linker-error-about-missing-symbol-__sync_.patch') +sha256sums=('b7338da1bdccb4d861e714efffaa83f174dfe37e194916bfd7ec82279a6ace19' + '305745c1effeb20fd63411342cf308d7f518b63f8e14b2c55d1ba31c45ae068f' + '6113d9c8392f0e7a34e8220bbfb01d6af63543e260e7ed4f65029fd859212b0f' + '220f32dc67cd256f706a135b072f639d88440ad8d5943ec7b311510eb7531cb7' + '2b6e95199698bc1af539ea39c37620b1170ddf77fa45c9120c3f0a59f58d8af1' + 'ccb04d5ca4b09cc8c19fab5427dcee8b4de6aaa4489f99e323830f66207318f6' + 'a8c1636dbf1480cbb3c56227e8b53dfd309293576cacefe689894dd6aaa8b597' + '48f6b23b2f34ce6158132b7b7ee6e7e527d65b26ec950777592dc0b80d1b96b0' + 'd2441d85329e70205532f8483a3e30b346861e44949b9803849677e61af496dd' + '3dd924f235a129e8c008d6fe4d92dbeb1875eed74db0add801538584438e6629' + '5721ddde57dc808f99183cfca29491a014ff29b0bd6ed1397d189c3af3c20198' + 'bf658085615d03333bb44e30ba11760e27556844d5731b3f92a17bb6e5ff1c42' + '5c8b7919222b3df5c5ff92a4baebb2130100ddc11c0d6743816347cc2509597b' + '1b2dad7aaabdc9922be87e2e90e49a270690c5935818efa8a7bd15a54de7cd73' + '863b60f362f477a48a2be440563f0f547db7102d8c79961fd9fa2295d35f2b0a' + '29af07b430f2a416b8fd0a8241c07205232cb4eb31626c9444256d03ebdba92c' + 'd1cbb46c443c64fe477fe5a6d9e0fd450e3f5c9f9423ce75c310659caef4d8db') # disable i686 build because 32-bit Windows is generally not supported by upstream and # it does not build anymore as of GCC 14 (probably due to commit 9a19fa8b616f83474c35cc5b34a3865073ced829) diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt index 7f03d3a380dc..60906d5b2068 100644 --- a/qtbase-sha256.txt +++ b/qtbase-sha256.txt @@ -1 +1 @@ -11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254 +b7338da1bdccb4d861e714efffaa83f174dfe37e194916bfd7ec82279a6ace19 |