From 0a2957aed3430acf7a663b6f0011c96f4e778acf Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 2 Jan 2022 13:29:53 +0100 Subject: [PATCH] Update Qt 5 packages --- devel/generator/generate.pl | 7 +- devel/qt5/rebase-patches.sh | 1 + qt5-base/mingw-w64-static/PKGBUILD | 68 +++++++++---------- ...rofile-for-cross-compilation-with-mi.patch | 4 +- ...is-defined-when-using-dynamic-OpenGL.patch | 4 +- ...tions-assemler-error-in-OpenGL-facto.patch | 4 +- ...re-.pc-files-are-installed-correctly.patch | 4 +- ...add-resource-files-to-LIBS-parameter.patch | 4 +- ...ug-library-names-in-pkg-config-files.patch | 4 +- ...linking-against-shared-static-libpng.patch | 6 +- ...008-Fix-linking-against-static-D-Bus.patch | 4 +- ...o-use-debug-version-of-D-Bus-library.patch | 4 +- ...Fix-linking-against-static-freetype2.patch | 6 +- ...-Fix-linking-against-static-harfbuzz.patch | 6 +- ...0012-Fix-linking-against-static-pcre.patch | 4 +- ...inking-against-shared-static-MariaDB.patch | 4 +- ...ing-against-shared-static-PostgreSQL.patch | 4 +- .../0015-Rename-qtmain-to-qt5main.patch | 4 +- .../0016-Enable-rpath-for-build-tools.patch | 4 +- ...0017-Use-system-zlib-for-build-tools.patch | 4 +- ...erge-shared-and-static-library-trees.patch | 4 +- ...9-Use-.dll.a-as-import-lib-extension.patch | 4 +- ...s-of-static-libraries-in-CMake-modul.patch | 4 +- ...w-usage-of-static-version-with-CMake.patch | 4 +- ...ags-for-static-build-with-cmake-ming.patch | 4 +- ...3-Use-correct-pkg-config-static-flag.patch | 4 +- ...4-Fix-macro-invoking-moc-rcc-and-uic.patch | 4 +- ...-errors-about-missing-feature-static.patch | 4 +- .../0026-Enable-and-fix-use-of-iconv.patch | 4 +- .../0027-Ignore-failing-pkg-config-test.patch | 4 +- ...from-messing-static-lib-dependencies.patch | 4 +- ...de-linker-flags-for-platform-plugins.patch | 4 +- ...ng-against-static-plugins-with-qmake.patch | 4 +- ...nnot-find-feature-windows_vulkan_sdk.patch | 4 +- ...s-in-rasterization-code-using-setjmp.patch | 4 +- qt5-base/mingw-w64/PKGBUILD | 68 +++++++++---------- qt5-declarative/mingw-w64-static/PKGBUILD | 10 +-- ...1-Ensure-static-plugins-are-exported.patch | 4 +- ...g-QML-parser-symbols-on-static-build.patch | 4 +- ...0003-Disable-d3d12-requiring-fxc.exe.patch | 4 +- qt5-declarative/mingw-w64/PKGBUILD | 10 +-- qt5-svg/mingw-w64-static/PKGBUILD | 4 +- qt5-svg/mingw-w64/PKGBUILD | 4 +- 43 files changed, 160 insertions(+), 158 deletions(-) diff --git a/devel/generator/generate.pl b/devel/generator/generate.pl index da6401d8..9aff451f 100755 --- a/devel/generator/generate.pl +++ b/devel/generator/generate.pl @@ -76,12 +76,13 @@ $mojolicious->helper(expand_libs => sub { # define revisions of Qt modules from KDE fork my %kde_fork_revisions = ( # module => [rev, 'commit on KDE fork', 'version bump to be reverted' ], - base => [222, 'd2bd04d9fe03912097d3246b7d03ef14f425256b', '6344955d17e17e2398720fe60c34cfc2a4a95208'], - declarative => [26, '4f08a2da5b0da675cf6a75683a43a106f5a1e7b8', '568763928a78b52373932b01be17e040f7c3fa50'], + base => [274, '98aa64af7e1e677bd107bfb0c432cabf7c3a5e32', '6344955d17e17e2398720fe60c34cfc2a4a95208'], + declarative => [42, '8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4', '568763928a78b52373932b01be17e040f7c3fa50'], tools => [17, '33693a928986006d79c1ee743733cde5966ac402', 'dbe0567470db2b369a9fdb28d9fbac38be3e2d60'], - svg => [7, 'cfc616978b52a396b2ef6900546f7fc086d7cab3', '9aac88424a1b76e0198b52437af58a6d94aff8e9'], + svg => [14, '5b9285c34731e67f9f1d61ec804740991f2a0380', '9aac88424a1b76e0198b52437af58a6d94aff8e9'], wayland => [23, 'fcc2f57cefa66339c8cb6632f45a47fbb99bb60d', '30cb2a87fcc6265232cb5a3ffce9836da6e531d6'], ); +# $rev := git rev-list --count v5.15.2..$commit_on_kde_fork # find templates; populate "pages" array my @pages; diff --git a/devel/qt5/rebase-patches.sh b/devel/qt5/rebase-patches.sh index 46dacde7..25133cc9 100755 --- a/devel/qt5/rebase-patches.sh +++ b/devel/qt5/rebase-patches.sh @@ -64,5 +64,6 @@ if [[ $newversiontag ]]; then else git checkout -b "$newversionbranch" "origin/$newversion" || git checkout -b "$newversionbranch" "v$newversion" fi +echo "Picking range: ${oldversiontag:-v$oldversion}..$oldversionbranch" git cherry-pick "${oldversiontag:-v$oldversion}..$oldversionbranch" git push -u $maybe_remote "$newversionbranch" diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD index 761624ce..5bb85f08 100644 --- a/qt5-base/mingw-w64-static/PKGBUILD +++ b/qt5-base/mingw-w64-static/PKGBUILD @@ -17,9 +17,9 @@ _qt_module=qtbase pkgname=mingw-w64-qt5-base-static -pkgver=5.15.2+kde+r222 +pkgver=5.15.2+kde+r274 pkgrel=1 -_commit=d2bd04d9fe03912097d3246b7d03ef14f425256b +_commit=98aa64af7e1e677bd107bfb0c432cabf7c3a5e32 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)' arch=('any') url='https://www.qt.io/' @@ -70,38 +70,38 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch' '0032-Fix-crashes-in-rasterization-code-using-setjmp.patch') sha256sums=('SKIP' - '673d95d4fff53ef4ebfa1313d5cf5f853ef5eb0b38b357fb3c976f09d2bd7136' - 'a668123b178ff8ef787a9f727faea8ef61fc3eff4495cb24117001a8516f3b2f' - '1fa09d3de43f5bd59322b2215a772bd1e2f5cf417c59280e430b78fdaad0fa59' - 'ee1f130f1de5726918820c02e8aecc735b4586854e1974373e8fc81eb9db5acf' - '85685c1d3b919f1d99f8c270afc649a3440032a498068ab79e1fb18fd61c0557' - '71e75d9cdb87ff24bb26a56ddf27d059b48b16089b3b90a8d5d2d50075503c7e' - '1a602b36ab940ab4e36f1392e80f084847f04bdd0505b66d0534ac9f1cf7a0d2' - '8a4f74e1e072cc768300c97e9ae98ea4843003e6800acc4abd190277c3bc9567' - 'f23ed6dd3092ad25edf75a60cf5874192d258521fa2202d727b8dcecc7d619af' - '01ed0f661eae93bae0b389bfd7e371848944a34884c64a89956f80c66cdf7aad' - '40d9e763f1bb9e64e3ad061c24fddfd4f1f4380ae082cf41cd4cd02c3a9c1e74' - '2b4bf3f6f81aff4a69fb458e0ff20d9ae3bce86f0f5a92ff0f3fdba6f6776d98' - '7eda33569fdcc02c2af234b3195de5a48d9160b67ea855e41dd4ffed09b2fef1' - '8f3584e0c42ada309b8cdbb0925e301b60ce1d7a00e1425e954c8459fec6d0fc' - '7597b1e72c1ac6c04b7f9e7a6f05820ad4f00709542b790981362001aef1eeb7' - '2cb69a4efcb771ccf1a6877eecb56dc934317091cd569c3a6398057a8b279d64' - '382f89931578c6ddf1330dbbc0c1a688d58a6dcaa4308fdf8dffc759dc4323eb' - 'c0517268f755f2c2a35f184e79c62e09ba4c0b29d30f7c510ada2cd974adcc47' - 'efd822a8aed39f243d34e1d0087dc429b03e43351b2dbffdcb765904c8226869' - '43952eed3a78b13e22761bb2b777f2b76a499678bc483d4f0bafc6a42434db74' - 'b09327ffc2ee055a87f577f8523051eb4cfc9d583d99a5e9b394bf20ca1260f6' - '4466cde0c17e5b5406a59dc12f27c57c22d1ce90b03635c20ef3f451e7cbc9be' - '6fc8cc928c9530a5816e37e9a4f433693d047e99a11060778d6693128c3bba7a' - '5d5a473d2020ec13ba100755543fe32bbeca2f328f3a44cf79869b0658fb22a2' - 'eb795b524330baa0bc633ba435ff12a854339035b758427c8cb0811b14591ca5' - 'e934e64bd17db6f2baa21494de77f5a28dfb13b191fbc3160fcc354eb36cba6a' - '1ebb0893fac53610a54e2f38c88e4771b334ea59f79f7af4230fe0049b960513' - '5984d1bf12316884bd26ec19153361ff48b0dc0e1d2c021ac22ae84188306985' - '005a89333608ba1b491f35d877f41590a11cd40813c74227d601fb91c61b3f3d' - '4bd0ef4e5db033a6652e31f68d35ef505a9944e7cc974705bc2322f087d95cd7' - '2d16a3ca82c47ccc3a0b82f9f33b8536bd0159e40410c158ec85936bba7bacd9' - '7880b548f9d3e87aa93a50ef1d411b682cf70d97420969f854db5ce43ee7e1d8') + '8ec72a1bb610e30a06c5bd301e0f502a4b1098e4f7709950d42f8d4f6b4529b1' + '3e2150bf9fd9b7bf4e02a7355b3316f1129159de4523dd56e2e002c17461a06b' + 'e18708d7a35920fff7b366cd98fabf87dda254b940581df2a3768dd22be86989' + '8be908199db7ed2d11dfa5b1a8b037a183e1a331b818e511a62ed366e56e322b' + 'ea9abbd04d03beb28682824750449ec734d0cd5980d18e43ee8c43a081522a39' + 'ede654c3021e9b2b5672fe67e6f3c8841dc3e9f59a16e1119adc5581021b6584' + '238a37d318d46d02e6a0632e58824ec64e323bf1a80f04fd2ca673eeb7eac167' + '1afa605f868eb859192c9e4a36474e2c9d3fd9808b8bbe83bf28fe44a0c5354a' + '3c9c7d80b88d7da333c13b366e0807d3d1bea7641a6e8540142c2197e00fb177' + 'ca065a912f79b3b8bd511d076e8d15e18802a7dc4baeb4f9af2a9ad1b2d65b25' + '519cf065067d7d1a15d02735457576f85d3d32ed2548650e93866e0e903e88bc' + '0811548a8f4c533f3b0df2b6114de673754aa269264a7bc99cc69db4228e24a8' + 'e8e754415d38b286c94f4227a372ef9d875d5f7d5493a88815903d0d9425f198' + 'ddddd2c328870aa66feed1415a34437cdbb6e086e6309fe5ac640cd551fdbc8d' + '9cf7eac11820012cedd0f5da75e7690e83a80e7002af0dec283d4b424142c22d' + '24e7863c621ab360c392b29244fcb2ffc4d116b8a5ef1f4e2a40841218c9bee1' + '790fb8562e2eee0b80bf23d6123e2f2c537021d8bbbec45053b12b8330244f93' + '6ff67b6c2c17478096409a90ee3e00b2a34b3e64dc8ecf24af8c4f33fbe9b083' + '3ce30f710591ba5dddb7c3a5cf0f9743da203ecc84d2e727e6d0f6a2a9502db6' + '80e5af98f00d73ad4210aa4fd4aed5f3259d7b965b2933568c30e539bb8a3fe3' + '9409620a23301e6410310ef9c865f19b185b35fa52593fc75f3674c1c95be81d' + 'd5fe2bcaa51e96ae1254d4596aabd4635d31959d15c2e5e6eefd238f824f1cf2' + '2bfd85eb2dad9ffbd3ca0920208091e85792c3b3673beff3467929ef3f7c399d' + '11d8dc525166ccbbc431fb3ed3a56540bfe26ad69b180c99ab6d3d9322d85ccc' + 'a633e33bf22e33ba549bd7bec1dbb3c1896922ed9041239f70fe13b32162c836' + '0057e150aed1f2119dd7dff27d21ed7f160ba398e9a4630c4f8ff979203dc8c2' + '30395cee07666b2cab06051033e3532140e8c4258ab6d576ef6514b90731bc8d' + 'a7ee924a26424c15f4a639f7e11ef154e70325c67e78d7d9231e7cff51fc01b2' + '431bd1f62600f985a4160fcdb2e44a6d8fec807eadb2f68738f941a649335150' + 'ba978e69e897e5ada1dce268517a5aeb356250052738c61730718f5014a39490' + 'f6c3027f58205167f6a18e51463ee0702c1f4a57106ff6a75dff6c3a9e654ebc' + '0f6796e6c7e0436b61bbc3947197f821732a07db900d440772054cf25a9ca9de') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch index 4bb9c89c..13738b37 100644 --- a/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch +++ b/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch @@ -1,4 +1,4 @@ -From 94179eefc9975b63ce7501d37cc67772e5a1ad19 Mon Sep 17 00:00:00 2001 +From 927aade0a5128c794f2d43c938b4d215061f7019 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/32] Adjust win32-g++ profile for cross compilation with @@ -162,5 +162,5 @@ index 5de482f23b..3c3d22c699 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index c38914c4..8e660843 100644 --- a/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch +++ b/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch @@ -1,4 +1,4 @@ -From 33434b8619105cd5e794232bf862bc65926e3d6b Mon Sep 17 00:00:00 2001 +From e3642b6a82884670a4be3b0ad6921ce513083cb6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/32] Ensure GLdouble is defined when using dynamic OpenGL @@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 70bd3399..11951332 100644 --- a/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From 231d2dc14bced9cd310220637195c9a72c545feb Mon Sep 17 00:00:00 2001 +From 21a3c586ea36240566a19ae97f8f53bbd31a86fc Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 03/32] Fix too many sections assemler error in OpenGL factory @@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch index bd1f6857..8194b394 100644 --- a/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From b9778b9bcd2fd2a1ae8462d68bfbf081de21e003 Mon Sep 17 00:00:00 2001 +From 89b22a5f59e9896363e4903bdcce4b9695b8400b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 04/32] Make sure *.pc files are installed correctly @@ -62,5 +62,5 @@ index 5e446bd7e2..183cef2908 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch index 69ab4b3a..cbaf468a 100644 --- a/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From d42eca13bd890c08813b6fe4b9fdca2f020cb568 Mon Sep 17 00:00:00 2001 +From 92edc381d36a1d6842c5e7369538e9208e87bc0d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 05/32] Don't add resource files to LIBS parameter @@ -24,5 +24,5 @@ index ee9a41838b..8d1dcae85b 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch index 90fdf97e..a1bccf59 100644 --- a/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 4e95a38dac9325acb275190cb51cd52f823fea96 Mon Sep 17 00:00:00 2001 +From 425dab657c6268a8408182dba60429cafff1a237 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 06/32] Prevent debug library names in pkg-config files @@ -29,5 +29,5 @@ index f1e8966123..f45b6c9fd5 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch index 78ce2398..d437a8aa 100644 --- a/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From 69350056a32494fb87219dc002bf29fc38fa5aa8 Mon Sep 17 00:00:00 2001 +From 634a78d7be8e14aa00eaa07315999890539a9bc1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 07/32] Fix linking against shared/static libpng @@ -9,7 +9,7 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 1f08795c57..7a5fc6ce7a 100644 +index 12c95742d2..e0043542ec 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -399,8 +399,10 @@ @@ -26,5 +26,5 @@ index 1f08795c57..7a5fc6ce7a 100644 ], "use": [ -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch index de27ba3c..eb3cbd89 100644 --- a/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From d9cbf72a6707d583bea38d83b5cb81bd535493a4 Mon Sep 17 00:00:00 2001 +From 7babbe2dd76fd091b09b5aae1b5b0e70287a5763 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 08/32] Fix linking against static D-Bus @@ -54,5 +54,5 @@ index accaa4f5ed..4b11c74caa 100644 # include #else -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index 269fe468..2f3cb912 100644 --- a/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 3415803b3ef3de8eadea5372caa3284a7aab9ed6 Mon Sep 17 00:00:00 2001 +From 14db0a00799e773d98f75f70d829047fc9edaedd Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 09/32] Don't try to use debug version of D-Bus library @@ -25,5 +25,5 @@ index fedc80fa18..e308b5b7d7 100644 }, "condition": "config.win32 && features.shared" -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch index ec67d1e7..090ae4f3 100644 --- a/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From f634820aef5904589dc2c4e10a79f87d3f72a323 Mon Sep 17 00:00:00 2001 +From ab442dec4f84e5c206f4dcb17de8b8152dd18e40 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 10/32] Fix linking against static freetype2 @@ -9,7 +9,7 @@ Change-Id: I6e4a2baa25beb5f63b46f25153bd7bac52a2262f 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 7a5fc6ce7a..0ec8cbf876 100644 +index e0043542ec..2fe0a018b1 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -238,8 +238,10 @@ @@ -26,5 +26,5 @@ index 7a5fc6ce7a..0ec8cbf876 100644 { "libs": "-lfreetype" } ], -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch index dda99565..c0e67f54 100644 --- a/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From 0d8428e3978921225f0810a863000d3184c25596 Mon Sep 17 00:00:00 2001 +From ec1db76a3ea8531b253dfec1d3f2e79679691994 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 11/32] Fix linking against static harfbuzz @@ -8,7 +8,7 @@ Subject: [PATCH 11/32] Fix linking against static harfbuzz 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 0ec8cbf876..5fecce5401 100644 +index 2fe0a018b1..ceeee23164 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -305,7 +305,11 @@ @@ -25,5 +25,5 @@ index 0ec8cbf876..5fecce5401 100644 }, "imf": { -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch index 75d56ecf..214304c5 100644 --- a/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From 84b33fe8ea3f8351d2907b2a61cac14282a6a1e0 Mon Sep 17 00:00:00 2001 +From a3cdbe8bf3c7e5ffd6df95ff5859d404ede0989e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 12/32] Fix linking against static pcre @@ -24,5 +24,5 @@ index d7e3cc5ee2..e17c19fbae 100644 #include -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch index f0de9748..215312d6 100644 --- a/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From 7fb7108b51f88ca0a3cc20cb26ee3575d2cd1c76 Mon Sep 17 00:00:00 2001 +From ce8a8e71aa6ab234fd44e1f278c0c9e7bfead9c8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 13/32] Fix linking against shared/static MariaDB @@ -22,5 +22,5 @@ index 28ccbeadcd..7262914c64 100644 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch index 94fe4bdb..00a97c3e 100644 --- a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From f3d9434b92c3df54ecd3a2ce19c51d27960cb2e9 Mon Sep 17 00:00:00 2001 +From 55053533188a4c7bfafc69af8cf3f5f4f85eccaf Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 14/32] Fix linking against shared/static PostgreSQL @@ -24,5 +24,5 @@ index 7262914c64..852ba558be 100644 ] }, -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch index 103d4ba0..814a78ef 100644 --- a/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 05bdef7e0c5ef74172f61ecb463b906ba3b9fbbb Mon Sep 17 00:00:00 2001 +From 03a7c67b5122002ae7a9423a36627cdb5c36f294 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 15/32] Rename qtmain to qt5main @@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644 CONFIG += static -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch index 70a05b91..03805db8 100644 --- a/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From bdeac448c60733a0176326c9580128e79a901660 Mon Sep 17 00:00:00 2001 +From 296a4630e1e2dd947a4d30cb504d8e4b34263470 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 16/32] Enable rpath for build tools @@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644 INSTALLS += target -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch index 047cac87..ecfac5bd 100644 --- a/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 10c03ee2e63995a02965a9e788c51ced69f18509 Mon Sep 17 00:00:00 2001 +From 1cc52bf44db9a74f5173ec793bc61ae85e580fd6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 17/32] Use system zlib for build tools @@ -23,5 +23,5 @@ index 24862a07db..698e6cfb95 100644 } else { CONFIG += no_core_dep -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch index d7a17add..5e7f3914 100644 --- a/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 7fc83ce1124e927403992ab7f3b715f4f57fc22f Mon Sep 17 00:00:00 2001 +From fdf07a6a7323b2ff9117e3d986b893504c747941 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 18/32] Merge shared and static library trees @@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch index 63e9e026..4c59547a 100644 --- a/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From ffa44aca0f4f16a75719bcb70cca2a4c25af0f73 Mon Sep 17 00:00:00 2001 +From a4b41ca8bd9b6bb761212d49ffe72955f7c84f14 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 19/32] Use *.dll.a as import lib extension @@ -94,5 +94,5 @@ index 183cef2908..03732df4a8 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index b9b42c82..d1ed2e89 100644 --- a/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From 9e9dc3a65adefc2e66cc5c685253bf94e309eae8 Mon Sep 17 00:00:00 2001 +From 49bd362a2316a8458d73d8fa7bca69aa3b1ca789 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 20/32] Pull dependencies of static libraries in CMake modules @@ -501,5 +501,5 @@ index b550a52c60..acbe1cc33b 100644 +endif() \ No newline at end of file -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch index 5e9453bc..2d84c4eb 100644 --- a/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From 7c16fa7365745aea90d95d88687bcb6e7e6a9c48 Mon Sep 17 00:00:00 2001 +From 253d977b4ad945380287e2c27c09460490b3a036 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 21/32] Allow usage of static version with CMake @@ -1091,5 +1091,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index 74171dd5..f317cefb 100644 --- a/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From 63bab93ceb6d6d3582614339808baf65fb012938 Mon Sep 17 00:00:00 2001 +From ee27a8ee0036cf79efdab7bb022a8ba2cc63dcb0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 22/32] Adjust linker flags for static build with @@ -27,5 +27,5 @@ index 9da1361c95..5e802dea4c 100644 +set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\") +unset(_isExe) -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch index bc5381d2..1a900a26 100644 --- a/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From d1beab36453a2fef697a99540ca54c3f475ca0d0 Mon Sep 17 00:00:00 2001 +From 088869c4c0cc55d9f2a75fb36381290cb09c6300 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 23/32] Use correct pkg-config --static flag @@ -22,5 +22,5 @@ index 53c67f885b..8934b72291 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch index 0d0dfefe..252f7229 100644 --- a/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From 8eb6dd55514f6c9be8c0ceef874a46b2812416dc Mon Sep 17 00:00:00 2001 +From 0e17318db9342d7a21c224cccbccec6185208291 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 24/32] Fix macro invoking moc, rcc and uic @@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch index 9df28cbc..a0ac34b2 100644 --- a/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From 1b5e0852e54f5423d50710c0dfddbdf380c6f6c9 Mon Sep 17 00:00:00 2001 +From c9793154e618b2ee00bc03295e80315e92549be1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 25/32] Ignore errors about missing feature static @@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch index 616c35ae..072a0d22 100644 --- a/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 92a3c211751ca20bb19781593482400735ed5ec1 Mon Sep 17 00:00:00 2001 +From f365c9f8672ae6b7e19db3162eef755a83e61161 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 26/32] Enable and fix use of iconv @@ -74,5 +74,5 @@ index 9b5d19d41b..f649a9f6ef 100644 }, "icu": { -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch index 1bf3edb9..5c50d46d 100644 --- a/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From cd96a8e745f032e99d6ae925876023fe3a11bede Mon Sep 17 00:00:00 2001 +From fb0caa03adc05ad835990a4a6e0829ce6ce50d09 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 27/32] Ignore failing pkg-config test @@ -21,5 +21,5 @@ index e308b5b7d7..928ee2afa1 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch index 3e7a3fcb..1c1be4f9 100644 --- a/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From 87e93f22eb181ef34e5a655ccdb112152174b118 Mon Sep 17 00:00:00 2001 +From e7b960e2af57c99d6843be5b8a59f8b72ce426a7 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 28/32] Prevent qmake from messing static lib dependencies @@ -41,5 +41,5 @@ index 03732df4a8..602f7609f5 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch index 91b69efb..e346d631 100644 --- a/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch +++ b/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From f6480d499b8c6681c8930856b6900a8cde4fd77b Mon Sep 17 00:00:00 2001 +From 59b05394ef1d6577319aee506d40764e8766c822 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 29/32] Hardcode linker flags for platform plugins @@ -174,5 +174,5 @@ index 50a3bb41a9..02f74650a9 100644 include(windows.pri) -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch index 530f6b23..33ac1e99 100644 --- a/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch +++ b/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From 9873f7b3644bfd7427f5329b04624c4931ac4a09 Mon Sep 17 00:00:00 2001 +From 213ff75ecdc5a996f799adbd595e612fa9a817dd Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 30/32] Fix linking against static plugins with qmake @@ -33,5 +33,5 @@ index b79b324b88..6a03b7a74b 100644 # Check if the plugin is known to Qt. We can use this to determine # the plugin path. Unknown plugins must rely on the default link path. -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch index dfe4379c..7207a168 100644 --- a/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch +++ b/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch @@ -1,4 +1,4 @@ -From 3c1281d85bffc86c2f66721101f60e9023f46b59 Mon Sep 17 00:00:00 2001 +From c0198cc36d39682324b1b22b0f54827fdf0311de Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 24 Jun 2019 13:51:02 +0200 Subject: [PATCH 31/32] Prevent 'Cannot find feature windows_vulkan_sdk' @@ -33,5 +33,5 @@ index 8475e4111a..c0eb8faa17 100644 LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD) for (nu, LD_USES) { -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch b/qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch index 9cfc997c..5d6f7af1 100644 --- a/qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch +++ b/qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch @@ -1,4 +1,4 @@ -From e05de09d529448fb34ad2255650cf2dba2d8d199 Mon Sep 17 00:00:00 2001 +From 1ee9945ed930848e333ac5b12767cf42a7281fc8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 26 Jun 2021 22:24:12 +0200 Subject: [PATCH 32/32] Fix crashes in rasterization code using setjmp @@ -244,5 +244,5 @@ index 7b16e8c211..38f03b73d8 100644 "Description": "FreeType is a freely available software library to render fonts.", "Homepage": "http://www.freetype.org", -- -2.33.0 +2.34.1 diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD index d86524a4..6478427c 100644 --- a/qt5-base/mingw-w64/PKGBUILD +++ b/qt5-base/mingw-w64/PKGBUILD @@ -17,9 +17,9 @@ _qt_module=qtbase pkgname=mingw-w64-qt5-base -pkgver=5.15.2+kde+r222 +pkgver=5.15.2+kde+r274 pkgrel=1 -_commit=d2bd04d9fe03912097d3246b7d03ef14f425256b +_commit=98aa64af7e1e677bd107bfb0c432cabf7c3a5e32 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)' arch=('i686' 'x86_64') url='https://www.qt.io/' @@ -69,38 +69,38 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch' '0032-Fix-crashes-in-rasterization-code-using-setjmp.patch') sha256sums=('SKIP' - '673d95d4fff53ef4ebfa1313d5cf5f853ef5eb0b38b357fb3c976f09d2bd7136' - 'a668123b178ff8ef787a9f727faea8ef61fc3eff4495cb24117001a8516f3b2f' - '1fa09d3de43f5bd59322b2215a772bd1e2f5cf417c59280e430b78fdaad0fa59' - 'ee1f130f1de5726918820c02e8aecc735b4586854e1974373e8fc81eb9db5acf' - '85685c1d3b919f1d99f8c270afc649a3440032a498068ab79e1fb18fd61c0557' - '71e75d9cdb87ff24bb26a56ddf27d059b48b16089b3b90a8d5d2d50075503c7e' - '1a602b36ab940ab4e36f1392e80f084847f04bdd0505b66d0534ac9f1cf7a0d2' - '8a4f74e1e072cc768300c97e9ae98ea4843003e6800acc4abd190277c3bc9567' - 'f23ed6dd3092ad25edf75a60cf5874192d258521fa2202d727b8dcecc7d619af' - '01ed0f661eae93bae0b389bfd7e371848944a34884c64a89956f80c66cdf7aad' - '40d9e763f1bb9e64e3ad061c24fddfd4f1f4380ae082cf41cd4cd02c3a9c1e74' - '2b4bf3f6f81aff4a69fb458e0ff20d9ae3bce86f0f5a92ff0f3fdba6f6776d98' - '7eda33569fdcc02c2af234b3195de5a48d9160b67ea855e41dd4ffed09b2fef1' - '8f3584e0c42ada309b8cdbb0925e301b60ce1d7a00e1425e954c8459fec6d0fc' - '7597b1e72c1ac6c04b7f9e7a6f05820ad4f00709542b790981362001aef1eeb7' - '2cb69a4efcb771ccf1a6877eecb56dc934317091cd569c3a6398057a8b279d64' - '382f89931578c6ddf1330dbbc0c1a688d58a6dcaa4308fdf8dffc759dc4323eb' - 'c0517268f755f2c2a35f184e79c62e09ba4c0b29d30f7c510ada2cd974adcc47' - 'efd822a8aed39f243d34e1d0087dc429b03e43351b2dbffdcb765904c8226869' - '43952eed3a78b13e22761bb2b777f2b76a499678bc483d4f0bafc6a42434db74' - 'b09327ffc2ee055a87f577f8523051eb4cfc9d583d99a5e9b394bf20ca1260f6' - '4466cde0c17e5b5406a59dc12f27c57c22d1ce90b03635c20ef3f451e7cbc9be' - '6fc8cc928c9530a5816e37e9a4f433693d047e99a11060778d6693128c3bba7a' - '5d5a473d2020ec13ba100755543fe32bbeca2f328f3a44cf79869b0658fb22a2' - 'eb795b524330baa0bc633ba435ff12a854339035b758427c8cb0811b14591ca5' - 'e934e64bd17db6f2baa21494de77f5a28dfb13b191fbc3160fcc354eb36cba6a' - '1ebb0893fac53610a54e2f38c88e4771b334ea59f79f7af4230fe0049b960513' - '5984d1bf12316884bd26ec19153361ff48b0dc0e1d2c021ac22ae84188306985' - '005a89333608ba1b491f35d877f41590a11cd40813c74227d601fb91c61b3f3d' - '4bd0ef4e5db033a6652e31f68d35ef505a9944e7cc974705bc2322f087d95cd7' - '2d16a3ca82c47ccc3a0b82f9f33b8536bd0159e40410c158ec85936bba7bacd9' - '7880b548f9d3e87aa93a50ef1d411b682cf70d97420969f854db5ce43ee7e1d8') + '8ec72a1bb610e30a06c5bd301e0f502a4b1098e4f7709950d42f8d4f6b4529b1' + '3e2150bf9fd9b7bf4e02a7355b3316f1129159de4523dd56e2e002c17461a06b' + 'e18708d7a35920fff7b366cd98fabf87dda254b940581df2a3768dd22be86989' + '8be908199db7ed2d11dfa5b1a8b037a183e1a331b818e511a62ed366e56e322b' + 'ea9abbd04d03beb28682824750449ec734d0cd5980d18e43ee8c43a081522a39' + 'ede654c3021e9b2b5672fe67e6f3c8841dc3e9f59a16e1119adc5581021b6584' + '238a37d318d46d02e6a0632e58824ec64e323bf1a80f04fd2ca673eeb7eac167' + '1afa605f868eb859192c9e4a36474e2c9d3fd9808b8bbe83bf28fe44a0c5354a' + '3c9c7d80b88d7da333c13b366e0807d3d1bea7641a6e8540142c2197e00fb177' + 'ca065a912f79b3b8bd511d076e8d15e18802a7dc4baeb4f9af2a9ad1b2d65b25' + '519cf065067d7d1a15d02735457576f85d3d32ed2548650e93866e0e903e88bc' + '0811548a8f4c533f3b0df2b6114de673754aa269264a7bc99cc69db4228e24a8' + 'e8e754415d38b286c94f4227a372ef9d875d5f7d5493a88815903d0d9425f198' + 'ddddd2c328870aa66feed1415a34437cdbb6e086e6309fe5ac640cd551fdbc8d' + '9cf7eac11820012cedd0f5da75e7690e83a80e7002af0dec283d4b424142c22d' + '24e7863c621ab360c392b29244fcb2ffc4d116b8a5ef1f4e2a40841218c9bee1' + '790fb8562e2eee0b80bf23d6123e2f2c537021d8bbbec45053b12b8330244f93' + '6ff67b6c2c17478096409a90ee3e00b2a34b3e64dc8ecf24af8c4f33fbe9b083' + '3ce30f710591ba5dddb7c3a5cf0f9743da203ecc84d2e727e6d0f6a2a9502db6' + '80e5af98f00d73ad4210aa4fd4aed5f3259d7b965b2933568c30e539bb8a3fe3' + '9409620a23301e6410310ef9c865f19b185b35fa52593fc75f3674c1c95be81d' + 'd5fe2bcaa51e96ae1254d4596aabd4635d31959d15c2e5e6eefd238f824f1cf2' + '2bfd85eb2dad9ffbd3ca0920208091e85792c3b3673beff3467929ef3f7c399d' + '11d8dc525166ccbbc431fb3ed3a56540bfe26ad69b180c99ab6d3d9322d85ccc' + 'a633e33bf22e33ba549bd7bec1dbb3c1896922ed9041239f70fe13b32162c836' + '0057e150aed1f2119dd7dff27d21ed7f160ba398e9a4630c4f8ff979203dc8c2' + '30395cee07666b2cab06051033e3532140e8c4258ab6d576ef6514b90731bc8d' + 'a7ee924a26424c15f4a639f7e11ef154e70325c67e78d7d9231e7cff51fc01b2' + '431bd1f62600f985a4160fcdb2e44a6d8fec807eadb2f68738f941a649335150' + 'ba978e69e897e5ada1dce268517a5aeb356250052738c61730718f5014a39490' + 'f6c3027f58205167f6a18e51463ee0702c1f4a57106ff6a75dff6c3a9e654ebc' + '0f6796e6c7e0436b61bbc3947197f821732a07db900d440772054cf25a9ca9de') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-declarative/mingw-w64-static/PKGBUILD b/qt5-declarative/mingw-w64-static/PKGBUILD index 77083e08..1e05d5b2 100755 --- a/qt5-declarative/mingw-w64-static/PKGBUILD +++ b/qt5-declarative/mingw-w64-static/PKGBUILD @@ -21,8 +21,8 @@ pkgdesc='Classes for QML and JavaScript languages (mingw-w64)' depends=('mingw-w64-qt5-base-static') makedepends=('mingw-w64-gcc' 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'python') license=('GPL3' 'LGPL3' 'FDL' 'custom') -_commit=4f08a2da5b0da675cf6a75683a43a106f5a1e7b8 -pkgver+=+kde+r26 +_commit=8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 +pkgver+=+kde+r42 makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') @@ -33,9 +33,9 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch' '0003-Disable-d3d12-requiring-fxc.exe.patch') sha256sums=('SKIP' - '05e6f881e3c327025bb7693b3622652e37cc0acd1a4c4efebbb8b39d0391e568' - '451dd25d86f64c641048eda8a6ab7f74c0ffcf99436ca32b149f96e44060a119' - 'bc4b056d159920124bd007086a791d657b41ec4d22213fd59200524c386400ab') + '70473beee156c9c2a5b3a0f60f18dc3b5662d818b999aad9c9273a5284b3be90' + '15f121f1569d3fbb131d853ecf14d9e4f573ed94008131144f617ffaf81ae9a9' + 'ac1ce1293a54cbfb8a9ffee43272346b8d71676f4cf93f2a1a00878fff47fd7a') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch b/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch index c0b76679..0e096dbc 100644 --- a/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch +++ b/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch @@ -1,4 +1,4 @@ -From 5b23d07532d7622129bdf5093b80d24fd0e72cbe Mon Sep 17 00:00:00 2001 +From d84477262d512fad230ad098d8ca33306ad3d047 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 23 Oct 2016 01:18:13 +0200 Subject: [PATCH 1/3] Ensure static plugins are exported @@ -19,5 +19,5 @@ index 4242143bca..bccb7b3146 100644 foreach(_other_plugin ${_qt5qml_other_plugins}) include(${_other_plugin} OPTIONAL) -- -2.31.1 +2.34.1 diff --git a/qt5-declarative/mingw-w64/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch b/qt5-declarative/mingw-w64/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch index a64dff92..b47915fc 100644 --- a/qt5-declarative/mingw-w64/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch +++ b/qt5-declarative/mingw-w64/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch @@ -1,4 +1,4 @@ -From 3ff37757918247a848198d205d03b8a1f0760b48 Mon Sep 17 00:00:00 2001 +From 8b9f3277047ae6a69ee89766414ed3e03f4d10b3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 4 Feb 2017 01:59:59 +0100 Subject: [PATCH 2/3] Prevent exporting QML parser symbols on static build @@ -33,5 +33,5 @@ index bf8155c6ec..2bfa230bcc 100644 # define QML_PARSER_EXPORT # elif defined(QT_BUILD_QML_LIB) -- -2.31.1 +2.34.1 diff --git a/qt5-declarative/mingw-w64/0003-Disable-d3d12-requiring-fxc.exe.patch b/qt5-declarative/mingw-w64/0003-Disable-d3d12-requiring-fxc.exe.patch index a7bffb55..d68f68b0 100644 --- a/qt5-declarative/mingw-w64/0003-Disable-d3d12-requiring-fxc.exe.patch +++ b/qt5-declarative/mingw-w64/0003-Disable-d3d12-requiring-fxc.exe.patch @@ -1,4 +1,4 @@ -From c08f46e4b43ae0635df976fa0933f499e141b168 Mon Sep 17 00:00:00 2001 +From e2f490c9a1caa3618c983d111dae33a618ee04b8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 20 Nov 2020 18:32:31 +0100 Subject: [PATCH 3/3] Disable d3d12 requiring fxc.exe @@ -29,5 +29,5 @@ index 39c0c0815c..9cc521a191 100644 qtConfig(openvg): SUBDIRS += openvg -- -2.31.1 +2.34.1 diff --git a/qt5-declarative/mingw-w64/PKGBUILD b/qt5-declarative/mingw-w64/PKGBUILD index 03c23535..2558ebc6 100644 --- a/qt5-declarative/mingw-w64/PKGBUILD +++ b/qt5-declarative/mingw-w64/PKGBUILD @@ -21,8 +21,8 @@ pkgdesc='Classes for QML and JavaScript languages (mingw-w64)' depends=('mingw-w64-qt5-base') makedepends=('mingw-w64-gcc' 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'python') license=('GPL3' 'LGPL3' 'FDL' 'custom') -_commit=4f08a2da5b0da675cf6a75683a43a106f5a1e7b8 -pkgver+=+kde+r26 +_commit=8aa1164f1bb6a5dfb5527bcfbf128ab6f2c73ed4 +pkgver+=+kde+r42 makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') @@ -33,9 +33,9 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch' '0003-Disable-d3d12-requiring-fxc.exe.patch') sha256sums=('SKIP' - '05e6f881e3c327025bb7693b3622652e37cc0acd1a4c4efebbb8b39d0391e568' - '451dd25d86f64c641048eda8a6ab7f74c0ffcf99436ca32b149f96e44060a119' - 'bc4b056d159920124bd007086a791d657b41ec4d22213fd59200524c386400ab') + '70473beee156c9c2a5b3a0f60f18dc3b5662d818b999aad9c9273a5284b3be90' + '15f121f1569d3fbb131d853ecf14d9e4f573ed94008131144f617ffaf81ae9a9' + 'ac1ce1293a54cbfb8a9ffee43272346b8d71676f4cf93f2a1a00878fff47fd7a') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-svg/mingw-w64-static/PKGBUILD b/qt5-svg/mingw-w64-static/PKGBUILD index 08dc7ca5..55409498 100644 --- a/qt5-svg/mingw-w64-static/PKGBUILD +++ b/qt5-svg/mingw-w64-static/PKGBUILD @@ -17,8 +17,8 @@ pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)" depends=('mingw-w64-qt5-base-static') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') -_commit=cfc616978b52a396b2ef6900546f7fc086d7cab3 -pkgver+=+kde+r7 +_commit=5b9285c34731e67f9f1d61ec804740991f2a0380 +pkgver+=+kde+r14 makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5') diff --git a/qt5-svg/mingw-w64/PKGBUILD b/qt5-svg/mingw-w64/PKGBUILD index c5131fe2..9b1d4dd8 100644 --- a/qt5-svg/mingw-w64/PKGBUILD +++ b/qt5-svg/mingw-w64/PKGBUILD @@ -17,8 +17,8 @@ pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)" depends=('mingw-w64-qt5-base') makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config') license=('GPL3' 'LGPL' 'FDL' 'custom') -_commit=cfc616978b52a396b2ef6900546f7fc086d7cab3 -pkgver+=+kde+r7 +_commit=5b9285c34731e67f9f1d61ec804740991f2a0380 +pkgver+=+kde+r14 makedepends+=('git') options=('!strip' '!buildflags' 'staticlibs') groups=('mingw-w64-qt5')