diff options
| -rw-r--r-- | .SRCINFO | 30 | ||||
| -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 | 10 | ||||
| -rw-r--r-- | 0004-Fix-transitive-dependencies-of-static-libraries.patch | 2 | ||||
| -rw-r--r-- | 0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch | 6 | ||||
| -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 | 50 | ||||
| -rw-r--r-- | 0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch | 8 | ||||
| -rw-r--r-- | 0010-Fix-dependency-of-xcb-image-on-xcb-util.patch | 2 | ||||
| -rw-r--r-- | 0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch | 2 | ||||
| -rw-r--r-- | 0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch | 2 | ||||
| -rw-r--r-- | PKGBUILD | 30 | ||||
| -rw-r--r-- | qtbase-sha256.txt | 2 |
15 files changed, 80 insertions, 80 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-qt6-base pkgdesc = A cross-platform application and UI framework (mingw-w64) - pkgver = 6.3.2 + pkgver = 6.4.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.3/6.3.2/submodules/qtbase-everywhere-src-6.3.2.tar.xz + source = https://download.qt.io/official_releases/qt/6.4/6.4.0/submodules/qtbase-everywhere-src-6.4.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 @@ -48,18 +48,18 @@ pkgbase = mingw-w64-qt6-base 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 - sha256sums = 7929ba4df870b6b30870bc0aed2525cfc606ed7091107b23cf7ed7e434caa9a6 - sha256sums = 44447564d76f656f78dcebbd9015f87cc5ab89caf1984909f32c8a57168ebfc6 - sha256sums = 62efb1cbd52b852115df5887c4653c39dce9e695470c3577f58388a8493964dc - sha256sums = ac185df12dafaa5b2a35b05ae0fa5ff05b6e885525c6159c89589028081b1285 - sha256sums = 454f758469ed0dc03278e851cc6dc19424fc8147396b3a54640c284e7085277c - sha256sums = 7ceaa7fa65a73d2ae60a93cce1cb68e85bd486ac5529e3456c696fc2a3098749 - sha256sums = b493577b3b524383312d6f093c7d41b621daea7e82f6efb7d219b2796e217a81 - sha256sums = fc29185f66f3b9a288bdd7e36a363d3f573d9602d7b01588f58c352a54dfed8f - sha256sums = 7b00f18dc4ebd42194f853acd1bee4fb4fcb586086ce6c2be7996df058c6dbb6 - sha256sums = 4e29919b6692be949164f47a929178dcff0e0075f51f3aa54d617795291cd31f - sha256sums = 37a0951bec45840157275c0e79fc1882143b6152069cde93be193128c22e5d2d - sha256sums = 9969dd32b3f8e5f6f67396a98a676a1d50a7beaf9fb150aa3c3127c8835086cd - sha256sums = 0d1b83a7ab41a6f4d52c48c215949b7204e880531df0f1dd395a08f615b43faa + sha256sums = cb6475a0bd8567c49f7ffbb072a05516ee6671171bed55db75b22b94ead9b37d + sha256sums = 500986910d9a17eb189458c55e1930c264673597b85079b8289c5190f818f093 + sha256sums = 3e72ad7c7dba0d5bce851378d37df627322a8cee00e6048223ab6719b309a5d8 + sha256sums = 9b888e9ea827dd218f79b3d0828a61a43ead41744bac4513224030a7990e02f2 + sha256sums = 192e7332c3b087312de3c01d32ed59f60c7b0ebeb395e91c0d6e595a63b18ea0 + sha256sums = 66a4d740264d6aa72c6f249dcae20c723cba31d8987b2e46b354af37e6109bfc + sha256sums = 7e58bb55e7e7af40e7e5492fc9e452dec574b216bd1a33739f1505d5fec24566 + sha256sums = 83d0248c3839285e3c8f2629f7d6525c11650b232dbcdfb0230151d51e6a0138 + sha256sums = e9917a03214cb8fd0bdaabe5c47edd387c90b275780e9644ac657ac96c358c77 + sha256sums = ea5bb116968d06b542e0b8e40e256c5d26d2caad496fb37f625d19274af064ec + sha256sums = dfad5479c5c0029806c929b7149e16120ec0cb05b0c08aaf4ec9ed23baa7aad2 + sha256sums = b43ed68d0288676ed59c493b73a0916f818de90491390753de6e17e857ea3368 + sha256sums = fa4986c24fa8eba1c956e78c6d8be4d0e11680364a6f30739ed347f4bca8c711 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 25da7a7f04b1..17abb767da90 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 d497d34c8ee77ae39c05fdb8726751f604f191a0 Mon Sep 17 00:00:00 2001 +From 6a7960f983c4e21c0501fdfb7ee59acfe751f158 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Thu, 5 Nov 2020 22:08:10 +0100 Subject: [PATCH 01/12] 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 61080da7ef..173c6743ba 100644 +index 71164c6718..616f1f8ce1 100644 --- a/cmake/QtPriHelpers.cmake +++ b/cmake/QtPriHelpers.cmake @@ -507,9 +507,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features @@ -98,10 +98,10 @@ 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 9e0cd1fc66..56ca69a911 100644 +index 7d3230594a..04683633b9 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake -@@ -509,7 +509,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target) +@@ -522,7 +522,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target) # This should cover both MINGW with GCC and CLANG. if(NOT MSVC) diff --git a/0002-Fix-finding-D-Bus.patch b/0002-Fix-finding-D-Bus.patch index 928ce676f627..624b4af2ff2b 100644 --- a/0002-Fix-finding-D-Bus.patch +++ b/0002-Fix-finding-D-Bus.patch @@ -1,4 +1,4 @@ -From 28ed7e6f52866424988bcce0fc520f33c96f18d4 Mon Sep 17 00:00:00 2001 +From a21037155aab6aaed09e8bc12682a264908a331c Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 7 Oct 2020 12:13:37 +0200 Subject: [PATCH 02/12] 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 cb0fbb4e0302..5794b2d3f6df 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 232614cab51bf6b18b42f37305ab65992d347be6 Mon Sep 17 00:00:00 2001 +From e650eac962da69b5ec93b249902f78bfc734dc18 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Thu, 5 Nov 2020 21:13:19 +0100 Subject: [PATCH 03/12] Fix using static PCRE2 and DBus-1 @@ -13,10 +13,10 @@ Change-Id: I2387b79462b6d183b71f9433dd937f63fc7ef26e 2 files changed, 9 insertions(+) diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp -index a39977a34b..1b26a1e00e 100644 +index a9b7f99975..063de6d9e2 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp -@@ -57,6 +57,11 @@ +@@ -20,6 +20,11 @@ #endif #define PCRE2_CODE_UNIT_WIDTH 16 @@ -29,10 +29,10 @@ index a39977a34b..1b26a1e00e 100644 #include <pcre2.h> diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h -index accaa4f5ed..4b11c74caa 100644 +index e3008be761..9c745c16c4 100644 --- a/src/dbus/qdbus_symbols_p.h +++ b/src/dbus/qdbus_symbols_p.h -@@ -57,6 +57,10 @@ +@@ -21,6 +21,10 @@ #ifndef QT_NO_DBUS diff --git a/0004-Fix-transitive-dependencies-of-static-libraries.patch b/0004-Fix-transitive-dependencies-of-static-libraries.patch index 10da416cb62c..035de45f3219 100644 --- a/0004-Fix-transitive-dependencies-of-static-libraries.patch +++ b/0004-Fix-transitive-dependencies-of-static-libraries.patch @@ -1,4 +1,4 @@ -From 53b2a57128ec0c67be3eb865c7a749ddf9d72f76 Mon Sep 17 00:00:00 2001 +From 6b9d5d74b641e257c660805ef8260eae1d53429c Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Thu, 5 Nov 2020 21:59:33 +0100 Subject: [PATCH 04/12] Fix transitive dependencies (of static libraries) diff --git a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch index 041c0eef5c6f..e5df8852fd4f 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 34aa224d3b4f53b9076e76b29c33fe35890642c7 Mon Sep 17 00:00:00 2001 +From 74a7eb79146690104cf70daa05fd4494522d31dc Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Mon, 2 Nov 2020 13:47:45 +0100 Subject: [PATCH 05/12] Fix libjpeg workaround for conflict with rpcndr.h @@ -13,10 +13,10 @@ 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 6d88438c47..a16dae28b1 100644 +index eebc5940ce..b03d08fe2e 100644 --- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp +++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp -@@ -62,6 +62,7 @@ +@@ -26,6 +26,7 @@ // including jpeglib.h seems to be a little messy extern "C" { #define XMD_H // shut JPEGlib up diff --git a/0006-Support-finding-static-MariaDB-client-library.patch b/0006-Support-finding-static-MariaDB-client-library.patch index c76a3a6aae2a..a6a3fc4cda8e 100644 --- a/0006-Support-finding-static-MariaDB-client-library.patch +++ b/0006-Support-finding-static-MariaDB-client-library.patch @@ -1,4 +1,4 @@ -From f7173fa91ccb9f2677baa8ab886a64d6aaceb777 Mon Sep 17 00:00:00 2001 +From 1882b898872ccdb2b907e9156dbea1b99c18ab01 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 8 Nov 2020 00:33:12 +0100 Subject: [PATCH 06/12] 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 e92a347cc83d..b63b26818b00 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 16e29d2a36fc8784c7ab3041a7e5e4c34be675c4 Mon Sep 17 00:00:00 2001 +From df6149b47dc40dbb49686374e915cabd05e492e1 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 8 Nov 2020 00:34:09 +0100 Subject: [PATCH 07/12] 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 7416655a3c..4f6d59a6cc 100644 +index 9731eda061..396d4c26ec 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 8275c70c5532..2bd64d1b8ccf 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 41659efdf7aefba5212f703c52def4e5ccec871c Mon Sep 17 00:00:00 2001 +From e496032b1d5474cd57cb361d8e0ad1f9865b4fdd Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sat, 26 Jun 2021 22:24:12 +0200 Subject: [PATCH 08/12] Fix crashes in rasterization code using setjmp @@ -28,19 +28,19 @@ 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 8eb4e5b605..b9f4e96671 100644 +index 36dae764d7..0aa24cca77 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt -@@ -165,7 +165,7 @@ qt_internal_add_module(Gui +@@ -167,7 +167,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/qmemrotate.cpp painting/qmemrotate_p.h -@@ -273,6 +273,11 @@ qt_internal_add_module(Gui + painting/qimagescale.cpp painting/qimagescale_p.h + painting/qmath_p.h +@@ -274,6 +274,11 @@ qt_internal_add_module(Gui GENERATE_CPP_EXPORTS ) @@ -56,10 +56,10 @@ 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 c6b9aa679e..8952343922 100644 +index 3c222c49e1..813cfc08dc 100644 --- a/src/gui/painting/qgrayraster.c +++ b/src/gui/painting/qgrayraster.cpp -@@ -39,7 +39,7 @@ +@@ -3,7 +3,7 @@ /***************************************************************************/ /* */ @@ -68,7 +68,7 @@ index c6b9aa679e..8952343922 100644 /* */ /* A new `perfect' anti-aliasing renderer (body). */ /* */ -@@ -157,17 +157,12 @@ +@@ -121,17 +121,12 @@ # include <vxWorksCommon.h> /* needed for setjmp.h */ #endif #include <string.h> /* for qt_ft_memcpy() */ @@ -86,7 +86,7 @@ index c6b9aa679e..8952343922 100644 #include <stddef.h> typedef ptrdiff_t QT_FT_PtrDist; -@@ -177,6 +172,8 @@ 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 @@ -95,7 +95,7 @@ index c6b9aa679e..8952343922 100644 #define QT_FT_BEGIN_HEADER #define QT_FT_END_HEADER -@@ -310,8 +307,6 @@ QT_FT_END_STMNT +@@ -274,8 +271,6 @@ QT_FT_END_STMNT int band_size; int band_shoot; @@ -104,7 +104,7 @@ index c6b9aa679e..8952343922 100644 void* buffer; long buffer_size; -@@ -333,12 +328,14 @@ QT_FT_END_STMNT +@@ -297,12 +292,14 @@ QT_FT_END_STMNT } TRaster, *PRaster; @@ -119,7 +119,7 @@ index c6b9aa679e..8952343922 100644 /*************************************************************************/ /* */ -@@ -404,7 +401,6 @@ QT_FT_END_STMNT +@@ -368,7 +365,6 @@ QT_FT_END_STMNT ras.max_ey = ( ras.max_ey + 63 ) >> 6; } @@ -127,7 +127,7 @@ index c6b9aa679e..8952343922 100644 /*************************************************************************/ /* */ /* Record the current cell in the table. */ -@@ -433,7 +429,7 @@ QT_FT_END_STMNT +@@ -397,7 +393,7 @@ QT_FT_END_STMNT } if ( ras.num_cells >= ras.max_cells ) @@ -136,7 +136,7 @@ index c6b9aa679e..8952343922 100644 cell = ras.cells + ras.num_cells++; cell->x = x; -@@ -1506,7 +1502,7 @@ QT_FT_END_STMNT +@@ -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 )); @@ -145,7 +145,7 @@ index c6b9aa679e..8952343922 100644 if ( error ) goto Exit; -@@ -1528,7 +1524,7 @@ QT_FT_END_STMNT +@@ -1492,7 +1488,7 @@ QT_FT_END_STMNT QT_FT_TRACE5(( " line to (%.2f, %.2f)\n", vec.x / 64.0, vec.y / 64.0 )); @@ -154,7 +154,7 @@ index c6b9aa679e..8952343922 100644 continue; } -@@ -1557,7 +1553,7 @@ QT_FT_END_STMNT +@@ -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 )); @@ -163,7 +163,7 @@ index c6b9aa679e..8952343922 100644 continue; } -@@ -1571,7 +1567,7 @@ QT_FT_END_STMNT +@@ -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 )); @@ -172,7 +172,7 @@ index c6b9aa679e..8952343922 100644 v_control = vec; goto Do_Conic; -@@ -1581,7 +1577,7 @@ QT_FT_END_STMNT +@@ -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 )); @@ -181,7 +181,7 @@ index c6b9aa679e..8952343922 100644 goto Close; } -@@ -1616,7 +1612,7 @@ QT_FT_END_STMNT +@@ -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 )); @@ -190,7 +190,7 @@ index c6b9aa679e..8952343922 100644 continue; } -@@ -1625,7 +1621,7 @@ QT_FT_END_STMNT +@@ -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 )); @@ -199,7 +199,7 @@ index c6b9aa679e..8952343922 100644 goto Close; } } -@@ -1634,7 +1630,7 @@ QT_FT_END_STMNT +@@ -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 )); @@ -208,7 +208,7 @@ index c6b9aa679e..8952343922 100644 Close: first = last + 1; -@@ -1662,14 +1658,11 @@ QT_FT_END_STMNT +@@ -1626,14 +1622,11 @@ QT_FT_END_STMNT { volatile int error = 0; @@ -225,7 +225,7 @@ index c6b9aa679e..8952343922 100644 error = ErrRaster_Memory_Overflow; } -@@ -1934,7 +1927,7 @@ QT_FT_END_STMNT +@@ -1898,7 +1891,7 @@ QT_FT_END_STMNT static int gray_raster_new( QT_FT_Raster* araster ) { @@ -235,7 +235,7 @@ index c6b9aa679e..8952343922 100644 *araster = 0; return ErrRaster_Memory_Overflow; diff --git a/src/gui/painting/qt_attribution.json b/src/gui/painting/qt_attribution.json -index 94e748aee7..64c694964d 100644 +index 488daf07bf..24ef353da8 100644 --- a/src/gui/painting/qt_attribution.json +++ b/src/gui/painting/qt_attribution.json @@ -4,7 +4,7 @@ diff --git a/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch b/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch index 20e5eb15ddfd..4f7269a6341c 100644 --- a/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch +++ b/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch @@ -1,4 +1,4 @@ -From b0f8a6b432e1576774679fbf54dc2d1424590bbe Mon Sep 17 00:00:00 2001 +From 5a7cf8cdcbd88c83ceb76060464a9b4631eb5c18 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 24 Apr 2022 23:00:27 +0200 Subject: [PATCH 09/12] Find fontconfig via pkg-config for correct handling of @@ -33,10 +33,10 @@ index 0000000000..1a52327ae6 + set(Fontconfig_FOUND 1) +endif() diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt -index b9f4e96671..768bb14cb0 100644 +index 0aa24cca77..d144d000fb 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt -@@ -737,7 +737,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_fre +@@ -750,7 +750,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 b9f4e96671..768bb14cb0 100644 qt_internal_extend_target(Gui CONDITION APPLE AND NOT MACOS diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake -index 42ab041f99..044c90a0d1 100644 +index 6b05d4cce3..62f48ddf0c 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -39,7 +39,7 @@ qt_find_package(WrapSystemFreetype 2.2.0 PROVIDED_TARGETS WrapSystemFreetype::Wr diff --git a/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch b/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch index e3d3c87e0a01..a6d542b36ed4 100644 --- a/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch +++ b/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch @@ -1,4 +1,4 @@ -From fdd24c98ad35bd527ee3a435e72c86bfef741dc1 Mon Sep 17 00:00:00 2001 +From 1147260dc4bf7a19b05c44fa32ffdc7810fd6c2a Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 24 Apr 2022 23:49:36 +0200 Subject: [PATCH 10/12] Fix dependency of xcb-image on xcb-util diff --git a/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch b/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch index 134b39efc3dd..8ede79b72526 100644 --- a/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch +++ b/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch @@ -1,4 +1,4 @@ -From 3c62f8d712bdc63818f80f0d70a864e46a8feec9 Mon Sep 17 00:00:00 2001 +From 3df7febd497f345222ea05159571aff0facb6915 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Tue, 26 Apr 2022 20:16:31 +0200 Subject: [PATCH 11/12] Allow using properties of PkgConfig targets for glib2 diff --git a/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch b/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch index 8c094ad832a0..efebb5f4d5e9 100644 --- a/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch +++ b/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch @@ -1,4 +1,4 @@ -From 9782387b6a2e37bc3ac6e3df6b5b2447f734a706 Mon Sep 17 00:00:00 2001 +From e4d8de8a4d1428eaa827b757f5b99239e1574bae Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 1 May 2022 23:28:26 +0200 Subject: [PATCH 12/12] Allow using properties of PkgConfig targets for Wayland @@ -11,7 +11,7 @@ # All patches are managed at https://github.com/Martchus/qtbase pkgname=mingw-w64-qt6-base -_qtver=6.3.2 +_qtver=6.4.0 pkgver=${_qtver/-/} pkgrel=1 arch=(any) @@ -43,19 +43,19 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm '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') -sha256sums=('7929ba4df870b6b30870bc0aed2525cfc606ed7091107b23cf7ed7e434caa9a6' - '44447564d76f656f78dcebbd9015f87cc5ab89caf1984909f32c8a57168ebfc6' - '62efb1cbd52b852115df5887c4653c39dce9e695470c3577f58388a8493964dc' - 'ac185df12dafaa5b2a35b05ae0fa5ff05b6e885525c6159c89589028081b1285' - '454f758469ed0dc03278e851cc6dc19424fc8147396b3a54640c284e7085277c' - '7ceaa7fa65a73d2ae60a93cce1cb68e85bd486ac5529e3456c696fc2a3098749' - 'b493577b3b524383312d6f093c7d41b621daea7e82f6efb7d219b2796e217a81' - 'fc29185f66f3b9a288bdd7e36a363d3f573d9602d7b01588f58c352a54dfed8f' - '7b00f18dc4ebd42194f853acd1bee4fb4fcb586086ce6c2be7996df058c6dbb6' - '4e29919b6692be949164f47a929178dcff0e0075f51f3aa54d617795291cd31f' - '37a0951bec45840157275c0e79fc1882143b6152069cde93be193128c22e5d2d' - '9969dd32b3f8e5f6f67396a98a676a1d50a7beaf9fb150aa3c3127c8835086cd' - '0d1b83a7ab41a6f4d52c48c215949b7204e880531df0f1dd395a08f615b43faa') +sha256sums=('cb6475a0bd8567c49f7ffbb072a05516ee6671171bed55db75b22b94ead9b37d' + '500986910d9a17eb189458c55e1930c264673597b85079b8289c5190f818f093' + '3e72ad7c7dba0d5bce851378d37df627322a8cee00e6048223ab6719b309a5d8' + '9b888e9ea827dd218f79b3d0828a61a43ead41744bac4513224030a7990e02f2' + '192e7332c3b087312de3c01d32ed59f60c7b0ebeb395e91c0d6e595a63b18ea0' + '66a4d740264d6aa72c6f249dcae20c723cba31d8987b2e46b354af37e6109bfc' + '7e58bb55e7e7af40e7e5492fc9e452dec574b216bd1a33739f1505d5fec24566' + '83d0248c3839285e3c8f2629f7d6525c11650b232dbcdfb0230151d51e6a0138' + 'e9917a03214cb8fd0bdaabe5c47edd387c90b275780e9644ac657ac96c358c77' + 'ea5bb116968d06b542e0b8e40e256c5d26d2caad496fb37f625d19274af064ec' + 'dfad5479c5c0029806c929b7149e16120ec0cb05b0c08aaf4ec9ed23baa7aad2' + 'b43ed68d0288676ed59c493b73a0916f818de90491390753de6e17e857ea3368' + 'fa4986c24fa8eba1c956e78c6d8be4d0e11680364a6f30739ed347f4bca8c711') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -94,7 +94,7 @@ package() { for _arch in ${_architectures}; do DESTDIR="$pkgdir" cmake --install build-$_arch - install -Dm644 $_pkgfqn/LICENSE* -t "$pkgdir"/usr/share/licenses/$pkgname + install -Dm644 $_pkgfqn/LICENSES/* -t "$pkgdir"/usr/share/licenses/$pkgname # Add symlinks of DLLs in usual bin directory mkdir -p "$pkgdir/usr/bin" "$pkgdir/usr/$_arch/bin" diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt index 12487544b8d3..41068924899d 100644 --- a/qtbase-sha256.txt +++ b/qtbase-sha256.txt @@ -1 +1 @@ -7929ba4df870b6b30870bc0aed2525cfc606ed7091107b23cf7ed7e434caa9a6 +cb6475a0bd8567c49f7ffbb072a05516ee6671171bed55db75b22b94ead9b37d |