diff options
author | Martchus | 2022-04-10 23:28:15 +0200 |
---|---|---|
committer | Martchus | 2022-04-10 23:28:15 +0200 |
commit | 527c2f220a2cebc7545aade418bdb9d9c323c88c (patch) | |
tree | 03843ef031c34a2628d473fd8d277fd907186dae | |
parent | f7f312707dfb0dd46a8c9ad76267847aeb39547e (diff) | |
download | aur-527c2f220a2cebc7545aade418bdb9d9c323c88c.tar.gz |
Update to 6.3.0
-rw-r--r-- | .SRCINFO | 22 | ||||
-rw-r--r-- | 0001-Use-CMake-s-default-import-library-suffix.patch | 8 | ||||
-rw-r--r-- | 0002-Fix-finding-D-Bus.patch | 2 | ||||
-rw-r--r-- | 0003-Fix-using-static-PCRE2-and-DBus-1.patch | 4 | ||||
-rw-r--r-- | 0004-Fix-transitive-dependencies-of-static-libraries.patch | 6 | ||||
-rw-r--r-- | 0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch | 2 | ||||
-rw-r--r-- | 0006-Support-finding-static-MariaDB-client-library.patch | 2 | ||||
-rw-r--r-- | 0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch | 4 | ||||
-rw-r--r-- | 0008-Fix-crashes-in-rasterization-code-using-setjmp.patch | 8 | ||||
-rw-r--r-- | PKGBUILD | 20 | ||||
-rw-r--r-- | qtbase-sha256.txt | 2 |
11 files changed, 40 insertions, 40 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-qt6-base pkgdesc = A cross-platform application and UI framework (mingw-w64) - pkgver = 6.2.4 + pkgver = 6.3.0 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.2/6.2.4/submodules/qtbase-everywhere-src-6.2.4.tar.xz + source = https://download.qt.io/official_releases/qt/6.3/6.3.0/submodules/qtbase-everywhere-src-6.3.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,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 = d9924d6fd4fa5f8e24458c87f73ef3dfc1e7c9b877a5407c040d89e6736e2634 - sha256sums = fbe69e74e323464ef9f47947fab599ae856427836c540f7aecb0658632ced136 - sha256sums = c53aa6a55d02d0574c9cefd1228d44ed264ed2c1a00d1117dc201114a64e26f8 - sha256sums = e94d874958913c80a4863dfafc68a6c9c9fa9bf6a0b64a47051951221328d1db - sha256sums = 8a00b5de194b1118f41eeeb0d82989f71d2e833064053130201e1d253afff37e - sha256sums = 10fb54c70f78cc5da75f115d3ad7508ae5aa21dfacaa87e30635dfce94476a73 - sha256sums = fc3d7916c72ae949bb8a79350ba79e5c0255a4423c881eec4055adede19202f7 - sha256sums = 60d954158b2afd5767373444a2f027fe4d8259c42bd509169b46de0e44bc86e6 - sha256sums = 7c8b68c72802f4d8c87e0d58e443fdcd711a45034333700343af58264225bf50 + sha256sums = b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99 + sha256sums = bff8b8af7b4eec0961890190bc1d31d98c2270985698a8071b5ee1434a12f13a + sha256sums = bdc4834c7c88176113770356e24104040622c30779a770da3292e487d0b451c8 + sha256sums = 08647a0b4f3beef39a2308cea4ed7b63887e58ef7b8f53294ba8d136eaf32109 + sha256sums = e1f619607afca17031c3eebdc01a95a7de4296b8ce01b15c9797475a4e7918f1 + sha256sums = 1994ab8f69ac4146c9332aff1bbaacecb87fcfc1d2c521ddfa0f6fd7e3b1aa63 + sha256sums = e9170a6b158b500e34913b0ee78641bf95fcfb5f84d27934a8a7c08b7a45e345 + sha256sums = 45a0bf8e485d0c21e916c8260ebbf4a1869d9902f4d749a41804535f05ef54b4 + sha256sums = a018bb72f3424c30c04f1f72429d891dd6b615566c98642d55a9a72e6110fd76 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 6a8d16a3fa69..662bd92bebf0 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 891c21a58a3ae6b649d54feb81c1bed15cbd768c Mon Sep 17 00:00:00 2001 +From 9636662a15e67ba2a1e9f1374537d3b390e9d04d 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,7 +13,7 @@ Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake -index 85767fadbe..4f1978bab1 100644 +index 61080da7ef..173c6743ba 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -507,9 +507,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features @@ -31,7 +31,7 @@ index 85767fadbe..4f1978bab1 100644 ${CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES} ${CMAKE_STATIC_LIBRARY_SUFFIX}) if(MSVC) -@@ -934,9 +938,13 @@ CONFIG += ${private_config_joined} +@@ -936,9 +940,13 @@ CONFIG += ${private_config_joined} list(APPEND inputs "${preliminary_pri_root}/${cfg}/${pri_data_cmake_file}") endforeach() @@ -98,7 +98,7 @@ index 24ed125f12..73ebe453d3 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 ba1bf5c28c..7777364536 100644 +index b0a5fad15f..a81297e03f 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -495,7 +495,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 917f124faed2..46bda6a66a95 100644 --- a/0002-Fix-finding-D-Bus.patch +++ b/0002-Fix-finding-D-Bus.patch @@ -1,4 +1,4 @@ -From 72409b1135172ea0a802c6011ce6867e7d95adb4 Mon Sep 17 00:00:00 2001 +From 0ee959c716f76b22e32bbcd74d4d3c27c45054eb 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 4bc7f6a82594..e4bbed146952 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 3073fd5aa7d6251b4c66b1fa114cdb3eaa6bae1a Mon Sep 17 00:00:00 2001 +From c32b8866da5b01a75b61c26a288d4c1497bd197b 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 @@ -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 b0728bca4a..2bfe48bd21 100644 +index 1db27fc4e4..0438d1401a 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp @@ -57,6 +57,11 @@ diff --git a/0004-Fix-transitive-dependencies-of-static-libraries.patch b/0004-Fix-transitive-dependencies-of-static-libraries.patch index 957bbb81939f..44ec62394850 100644 --- a/0004-Fix-transitive-dependencies-of-static-libraries.patch +++ b/0004-Fix-transitive-dependencies-of-static-libraries.patch @@ -1,4 +1,4 @@ -From 37bf424036f912d433c76af752aea89477a72b7c Mon Sep 17 00:00:00 2001 +From ffdf568ee684a97d59e4668eea92d9e3cedaed30 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) @@ -23,10 +23,10 @@ Change-Id: I3baec612ee071eec77f756b18bbb9af87663527c 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake -index 8f873c1b45..831ca8e624 100644 +index 24a194c9cb..a6a16b494f 100644 --- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake +++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake -@@ -95,7 +95,7 @@ if(GLIB2_FOUND AND NOT TARGET GLIB2::GLIB2) +@@ -135,7 +135,7 @@ if(GLIB2_FOUND AND NOT TARGET GLIB2::GLIB2) add_library(GLIB2::GLIB2 UNKNOWN IMPORTED) set_target_properties(GLIB2::GLIB2 PROPERTIES IMPORTED_LOCATION "${GLIB2_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 1537ebcdc6c1..ce493d443c68 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 a51400ce845484b44aea004d144f6b22b7295518 Mon Sep 17 00:00:00 2001 +From dda151c4601c0f5453ffa7b80f4c77f65ae04bcd 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 60b829d69405..109b78895bbc 100644 --- a/0006-Support-finding-static-MariaDB-client-library.patch +++ b/0006-Support-finding-static-MariaDB-client-library.patch @@ -1,4 +1,4 @@ -From bac2beb56ed38a878cda23906b1ab138987bbe76 Mon Sep 17 00:00:00 2001 +From d0bbc1ae7e19e0622d1015f9d773a0d5d2d891f6 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 97d434edf6a6..f38bf9f8a53a 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 07bd9df2162db5dba418b3b372d1a762363c1f3d Mon Sep 17 00:00:00 2001 +From f2f0f4c188747c95a80317e95c71a1c75ccc9bd3 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 @@ -10,7 +10,7 @@ Change-Id: I4c617e0706044d31da1bd56ae51615dc8ed37099 1 file changed, 4 insertions(+) diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake -index cd36934f71..84f0f0b91c 100644 +index a515fcd43d..75fb3f6e9b 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -1,6 +1,10 @@ diff --git a/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch b/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch index 6636682c4e03..ea99ad926ba6 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 bc1d5f5f195f9b80f092e531aa566e1e95fb114f Mon Sep 17 00:00:00 2001 +From 3a7e6c01e86ff8b4ffaec5a7690d680198d59f57 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 e3062561df..4d64d1588d 100644 +index 43a2366063..4c5c42abb6 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -165,7 +165,7 @@ qt_internal_add_module(Gui @@ -40,8 +40,8 @@ index e3062561df..4d64d1588d 100644 painting/qicc.cpp painting/qicc_p.h painting/qimagescale.cpp painting/qmemrotate.cpp painting/qmemrotate_p.h -@@ -272,6 +272,11 @@ qt_internal_add_module(Gui - "kernel/qt_gui_pch.h" +@@ -273,6 +273,11 @@ qt_internal_add_module(Gui + GENERATE_CPP_EXPORTS ) +# enable exceptions for painting/qgrayraster.cpp @@ -11,7 +11,7 @@ # All patches are managed at https://github.com/Martchus/qtbase pkgname=mingw-w64-qt6-base -_qtver=6.2.4 +_qtver=6.3.0 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=('d9924d6fd4fa5f8e24458c87f73ef3dfc1e7c9b877a5407c040d89e6736e2634' - 'fbe69e74e323464ef9f47947fab599ae856427836c540f7aecb0658632ced136' - 'c53aa6a55d02d0574c9cefd1228d44ed264ed2c1a00d1117dc201114a64e26f8' - 'e94d874958913c80a4863dfafc68a6c9c9fa9bf6a0b64a47051951221328d1db' - '8a00b5de194b1118f41eeeb0d82989f71d2e833064053130201e1d253afff37e' - '10fb54c70f78cc5da75f115d3ad7508ae5aa21dfacaa87e30635dfce94476a73' - 'fc3d7916c72ae949bb8a79350ba79e5c0255a4423c881eec4055adede19202f7' - '60d954158b2afd5767373444a2f027fe4d8259c42bd509169b46de0e44bc86e6' - '7c8b68c72802f4d8c87e0d58e443fdcd711a45034333700343af58264225bf50') +sha256sums=('b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99' + 'bff8b8af7b4eec0961890190bc1d31d98c2270985698a8071b5ee1434a12f13a' + 'bdc4834c7c88176113770356e24104040622c30779a770da3292e487d0b451c8' + '08647a0b4f3beef39a2308cea4ed7b63887e58ef7b8f53294ba8d136eaf32109' + 'e1f619607afca17031c3eebdc01a95a7de4296b8ce01b15c9797475a4e7918f1' + '1994ab8f69ac4146c9332aff1bbaacecb87fcfc1d2c521ddfa0f6fd7e3b1aa63' + 'e9170a6b158b500e34913b0ee78641bf95fcfb5f84d27934a8a7c08b7a45e345' + '45a0bf8e485d0c21e916c8260ebbf4a1869d9902f4d749a41804535f05ef54b4' + 'a018bb72f3424c30c04f1f72429d891dd6b615566c98642d55a9a72e6110fd76') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt index b440388010dd..c7e682d6fd1f 100644 --- a/qtbase-sha256.txt +++ b/qtbase-sha256.txt @@ -1 +1 @@ -d9924d6fd4fa5f8e24458c87f73ef3dfc1e7c9b877a5407c040d89e6736e2634 +b865aae43357f792b3b0a162899d9bf6a1393a55c4e5e4ede5316b157b1a0f99 |