diff options
35 files changed, 146 insertions, 146 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-qt5-base pkgdesc = A cross-platform application and UI framework, native OpenGL backend (mingw-w64) - pkgver = 5.15.13+kde+r138 + pkgver = 5.15.14+kde+r140 pkgrel = 1 url = https://www.qt.io/ arch = i686 @@ -33,7 +33,7 @@ pkgbase = mingw-w64-qt5-base options = !buildflags options = staticlibs options = !emptydirs - source = git+https://invent.kde.org/qt/qt/qtbase#commit=b9906b5233a80cab372c95ac4dd68b25bdca0646 + source = git+https://invent.kde.org/qt/qt/qtbase#commit=1c13ef067ea3c97342f98039931ea18b3992014f source = 0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch source = 0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch source = 0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -66,38 +66,38 @@ pkgbase = mingw-w64-qt5-base source = 0030-Fix-linking-against-static-plugins-with-qmake.patch source = 0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch source = 0032-Fix-crashes-in-rasterization-code-using-setjmp.patch - sha256sums = 06e49a14145574834d4d04f73e6baf662ee5e72e78973e1d7d0fe614472a80a4 - sha256sums = 11c2b54df2b5ea031c2103366d0b27d0786c3420b29cca391cc0015fd35264d7 - sha256sums = 2b00e98c8c8acb1a453191be77a2f7a9188e030480864e58ac39b517bb63ffb5 - sha256sums = 5131dff4db6f63e36ea364ce59b2fdb047fbb6d55e6543316054f6ebcd76711b - sha256sums = 3147a21ccad3026a06d8b622db96949d51f32b6a1d25c8aae5fe5a95c3e95625 - sha256sums = 4bd74cc1d78da412faac71b5357fd86fea3f1781d0b554f8f7fd3684c833e8ce - sha256sums = e566e5cdd5bc077c35054be1465148acd5ee209e609690c670b78df88cc9295b - sha256sums = 7fe1dc6c1251c16c4236924cb5a03ac55d1dca051bd9d99fbf7b35f91454fda3 - sha256sums = c054851c46036710ff6f025a48d4b5b2d6e5d5d54c74b73c2cb81b00bdfa029a - sha256sums = a2702d6ca3f696ca3c77b00df7bb512f5f3430fce109048c62c97d294758efd8 - sha256sums = 395339c3dde4115283db948899980e536a355422190bc90850efdc3438c527d8 - sha256sums = c386790a879e68b9d00bfe9f14afa67d8a374de57bdea164a5252499ec34cbcb - sha256sums = 576177950e99f62d05bee487dd5ae1b731fe4acf438553c74e7c48631dd8789b - sha256sums = 02bc0ce27d7835829d4e84580fb0a0b864b36b14331a166dba88f1942a6414a3 - sha256sums = 736de6cd28c8efb1729f926c1fa42c963c7f1d3a9e4b56b098906b570473320f - sha256sums = 294f3ab13a546a1bfeae472cf7342e2bce6c058a6867d19038ba1c194fb33b8d - sha256sums = 8f202adf905ebce78dd2942d17c0d935f0de7014ffa75840310edc0bd790ff03 - sha256sums = 129b4667c5e3cfe68040cbae2fce487e2d016bcbe2380a5ba410b225279f71b9 - sha256sums = fbd8cd4680e10074f90bf79d9d08ad787b483cf7c21250d1db1c8a5c829a1d83 - sha256sums = 05a29084b9bc3324beefb9ae6d00ea68c3b3c51a0b4595c024300949c906d7fd - sha256sums = 7843f5be44b9b367cb81c143c6d670e6a5be40510848c09a1448d921c3437639 - sha256sums = 7002db8f819bf34cafda04dc4d288fef58aec9e409230dc68fcb542cb48f09bb - sha256sums = 57607c662e6d68f2ca856617c8d7cfaa05ba8332ea70b67ab628a8f0cf2ca032 - sha256sums = 5910c4567348101d0a87197b2e52e59673467247ca4ffc89cba5701d98373435 - sha256sums = 0181986547b7c70bf2bc8de31198240f99a92e4cfdb1db81c7b99b849c416c1f - sha256sums = 9e692f956dffa5c936a2911d8418746b19197962111b4f0f45b33972ed3890f2 - sha256sums = 1d5e09034c9c903653d10c3983e4dcb710ebe8f08694e5e55199a3e4acb8f629 - sha256sums = 5379cea6fd54a16e7f67b617bf3582c08f8934ae8d699e85ad21f20dcf192424 - sha256sums = 82d1db9d4536350fe2549c400487018a8477a15da83a568240a013a6d82dfe92 - sha256sums = 01413344603a8e99f7b0280e7f297de4ea415e0c5011b1dac116eaf25082220b - sha256sums = 4f88801a586c35515fd982f8e465fb4546ef38765c6a2abe1e8ca69e3700d799 - sha256sums = b4dad74bbe2731aaa8711408fe509344e7e6049def897389f7e2a86423f3377e - sha256sums = 17f251d456713c920c6581659c54b9c372e1a329081b2ed9d9826e9e0ddd317a + sha256sums = SKIP + sha256sums = 5b9f3f36e05a029181ca72b83683c119adbfba625ad98ba3fb02113d75d35d44 + sha256sums = ccab6d5fdce7809281c05c1b0b8ec65aab6db1112283fc69ba10bb05e664d545 + sha256sums = 9d4c8bfde02f7e77ea194f1e1ea724baaf947dcd72adca815559e43070df2938 + sha256sums = b6921b9b00542a4afad0f9f97f36b9d45c619bafa06a93576bed6545aea8dd3b + sha256sums = d76628f9395f8b7813e058ebbb8b87d380d490d2e2e67d5d59218082330b3a65 + sha256sums = e909ab659266bc65fd14e16231855b3cf209a3a03965f934f5d81771d4a0191d + sha256sums = 06fc346c7299fb31f0cbebb55c3749d533b48e99fd59e8a3ed3c068fcda03a2f + sha256sums = edd73dc56259afdc8865417974b8956697954aad22844522554fe83c665a3ac8 + sha256sums = 41ffca5bd37d020a3edc56c0b9949e466026fb8c8d935defd9e66a71b779934c + sha256sums = d869ae862fd3251c478e14fdb614185c81e5defb5b00f31161ff5497c66823e2 + sha256sums = 7ac6575b691ed70dde02182aec6f81aaad4aca8a041ab594868d113a913c9e41 + sha256sums = 0dba86fae79ae7368b504ae7d297359f4448f160a42b20b3857d81d2cde91ab5 + sha256sums = ddce558f74a1cdcb673e9a1e9df75442ea71fc6e2503fc85d779c5d8b948784a + sha256sums = 48ee9c592f17400f37e958a59f3605c97d335dec18537b0d730601bb9787a07b + sha256sums = 7e242c398740eabed1c437498e04744fda8a413ce6e668a2a654741d5900dd42 + sha256sums = 7cf8f198fe0348aa5c97c85bfcf868be62fec0fa0148570565c48ef1d91aa0e9 + sha256sums = 6ed70651c02399a407ffa4d8e76da46d5765983034d1e0644686f599b865b68f + sha256sums = 9edc35b11aa19b10ddd7ced57b3b0d035755a4c443ba3b6c6755810a0ecd338f + sha256sums = e4cc92c85debb106bf8ebc899729f8dc17a94a062ffa1c9e6f7fd4cc1c17f91e + sha256sums = 2e9ac0244ca938fc547db038b5d72a31b82e155c84050bf0e3407300bf7eaecb + sha256sums = a46f82235cfc8a6644b425061a7e923fa4468623974ddf75a46ec45802654cd0 + sha256sums = cdad591ba62797d930b5121eef39fa5e2928c76f28b0c32ab35b10ec04e550e4 + sha256sums = 67dec80f21aa819cea23a1b8a267c2724d2fa86e23c69834bc711b381fc03447 + sha256sums = 17320ad851fdf1f7282bb2215429aff12617096b0b82dfc689f3832766f5436e + sha256sums = 3cb80c51dda4e79b5480e0417678c751d0f5b762014939593d9f9c1b645080be + sha256sums = ecc72af327991945a6076790aadd5309aa8ac06891a14ed080fa49632e50b0b0 + sha256sums = efb16ee563478711ca027074494b0cbb1c4f3054028dedd5bcf2b3da91c0797c + sha256sums = 6247074166f5d9a97fb60597b15a80a65cfb2ea5dffc31dcb739cbaa9a95ac62 + sha256sums = 29062bf991b8eab0c65a5ecf09f9a69673757653aacb48269033e5ad8d4f652f + sha256sums = d0d8703d6ec5b960da6a537a3903804ef4366693125b0a31e5cd59954e348888 + sha256sums = 422b67821c2cb1025e3a230965ef664eabb05a9c6d623bc67fc0daaa0fd57262 + sha256sums = 5be2fe99912d1f905aac9a5c1de48e130a3e364bb97fa47fd81f66f26c7c9296 pkgname = mingw-w64-qt5-base diff --git a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch index eb7f5cf67103..d4873371dd97 100644 --- a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch +++ b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch @@ -1,4 +1,4 @@ -From c134da249ee5459358292e1665b69aede5035c5b Mon Sep 17 00:00:00 2001 +From 59185445811e7e53c6301fb041012991e313688f Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> 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 5de482f23b5..3c3d22c6993 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.44.0 +2.45.1 diff --git a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index 8d45fa0b914a..6f34e864d87d 100644 --- a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch +++ b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch @@ -1,4 +1,4 @@ -From acadba49c80804a908477f9a367c645fdf4300cc Mon Sep 17 00:00:00 2001 +From c35f9705a2382167db2ed0cf2f5d8af5118d3534 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> 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 4554291bbd9..23d55bddebd 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include <stdio.h> -- -2.44.0 +2.45.1 diff --git a/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index c860bc808f61..8a0101649594 100644 --- a/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From d3cb4d3b96c01f151e15dc1017f2687f7d8102c3 Mon Sep 17 00:00:00 2001 +From 9d6f369f80da45624cac856c60b9abb3c9ea30b2 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> 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 24758afdeb3..aa04b4a672e 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.44.0 +2.45.1 diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch index ab7ade7f8599..6bd4e699d35d 100644 --- a/0004-Make-sure-.pc-files-are-installed-correctly.patch +++ b/0004-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From ed34f597de640c8ef123db60931353894564aa8d Mon Sep 17 00:00:00 2001 +From 9b0772d1085b410d1e11816de607f88df648518d Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> 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 5e446bd7e2b..183cef29089 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.44.0 +2.45.1 diff --git a/0005-Don-t-add-resource-files-to-LIBS-parameter.patch b/0005-Don-t-add-resource-files-to-LIBS-parameter.patch index 8d3fb47348ce..2148eaf21b2c 100644 --- a/0005-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/0005-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From a99587c177203e31c8cfbc825be56866c5a4f747 Mon Sep 17 00:00:00 2001 +From 181646ede776937ac769f4cbacb2d16e71d08c6a Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> 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 ee9a41838bc..8d1dcae85bb 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.44.0 +2.45.1 diff --git a/0006-Prevent-debug-library-names-in-pkg-config-files.patch b/0006-Prevent-debug-library-names-in-pkg-config-files.patch index b49319e68781..5c80a7c13fbf 100644 --- a/0006-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/0006-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 6456e33a0b4797be08898dce2ce4ccce1c07bef8 Mon Sep 17 00:00:00 2001 +From 32b01780c19554e1b2950fa841525dcb17f4f5ff Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> 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 fc996663d8d..23ac736fc06 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.44.0 +2.45.1 diff --git a/0007-Fix-linking-against-shared-static-libpng.patch b/0007-Fix-linking-against-shared-static-libpng.patch index 87bcd9bf43c5..4c6228c42c73 100644 --- a/0007-Fix-linking-against-shared-static-libpng.patch +++ b/0007-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From 6979ca5c02d202597cf516cab889babbb9f74acc Mon Sep 17 00:00:00 2001 +From b7593425c07e0584a64b86a6c96ef48c25e1edf4 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 07/32] Fix linking against shared/static libpng @@ -26,5 +26,5 @@ index 95e8955b510..bc3eae90872 100644 ], "use": [ -- -2.44.0 +2.45.1 diff --git a/0008-Fix-linking-against-static-D-Bus.patch b/0008-Fix-linking-against-static-D-Bus.patch index 27e30094ad7d..7184b6eeb1dd 100644 --- a/0008-Fix-linking-against-static-D-Bus.patch +++ b/0008-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From a1cd8b87b57eee2b9724d64a2c3b2c949981c544 Mon Sep 17 00:00:00 2001 +From 4d7ece6b41e514620379181ca2e19e2cb21fb3c7 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 08/32] Fix linking against static D-Bus @@ -54,5 +54,5 @@ index accaa4f5ed5..4b11c74caa7 100644 # include <dbus/dbus.h> #else -- -2.44.0 +2.45.1 diff --git a/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index 4f2deb073fcc..179baa413e37 100644 --- a/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 33ff3ba65c06a02136208b80567a0ba0c8db844a Mon Sep 17 00:00:00 2001 +From dce1b9b945c9f5a528cf21f3fba9bb7bab69c134 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> 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 e97969ab25c..b75f8a8033c 100644 }, "condition": "config.win32 && features.shared" -- -2.44.0 +2.45.1 diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch index df45a37bd830..49e99bd4c8eb 100644 --- a/0010-Fix-linking-against-static-freetype2.patch +++ b/0010-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From c1019300eed7fabb7c2c73d5510e5a83e06a89b2 Mon Sep 17 00:00:00 2001 +From a191eac4e7eb82ebe3f7627163d3942b13ec60f4 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 10/32] Fix linking against static freetype2 @@ -25,5 +25,5 @@ index bc3eae90872..d9b540ce428 100644 { "libs": "-lfreetype" } ], -- -2.44.0 +2.45.1 diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch index a3fc79e0754b..31602c4d3fb9 100644 --- a/0011-Fix-linking-against-static-harfbuzz.patch +++ b/0011-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From d5ca57cecd935d1475d5b5677391e703a9733989 Mon Sep 17 00:00:00 2001 +From ed77c71d51c933ecce2af067b9d3ce898a9811b3 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 11/32] Fix linking against static harfbuzz @@ -25,5 +25,5 @@ index d9b540ce428..69cb564e868 100644 }, "imf": { -- -2.44.0 +2.45.1 diff --git a/0012-Fix-linking-against-static-pcre.patch b/0012-Fix-linking-against-static-pcre.patch index 0be57cdea0e2..1d41ff5e97c8 100644 --- a/0012-Fix-linking-against-static-pcre.patch +++ b/0012-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From 2189baae3ddff3bdba3f8d8480fa313e50432093 Mon Sep 17 00:00:00 2001 +From 41ea62c42fc5386e3956d55cf2e7726aa257f335 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 12/32] Fix linking against static pcre @@ -24,5 +24,5 @@ index 1f10150435d..6a97b47773e 100644 #include <pcre2.h> -- -2.44.0 +2.45.1 diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch index 62a25589aaf6..7cc288853806 100644 --- a/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From 5cdbce5a33f7881eee348250b1b9867c64ea686d Mon Sep 17 00:00:00 2001 +From 3561a46f89b20bb55fd73f71efee00cac7c347b8 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 13/32] Fix linking against shared/static MariaDB @@ -22,5 +22,5 @@ index 28ccbeadcde..a5e3001bf60 100644 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.44.0 +2.45.1 diff --git a/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/0014-Fix-linking-against-shared-static-PostgreSQL.patch index 2cce773a6550..5553365b6e96 100644 --- a/0014-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/0014-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From d95435227c24ef2b1be37561a55751e8ff3cfd0e Mon Sep 17 00:00:00 2001 +From 0a4e4c57620b8224531f1d6e8ef0db3ce066857b Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 14/32] Fix linking against shared/static PostgreSQL @@ -24,5 +24,5 @@ index a5e3001bf60..5768d3b9a97 100644 ] }, -- -2.44.0 +2.45.1 diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch index 08a71116e005..d05ed6df2f36 100644 --- a/0015-Rename-qtmain-to-qt5main.patch +++ b/0015-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 41e6e4c93cc8cbe45305458bc87573ad5a630601 Mon Sep 17 00:00:00 2001 +From 243c90ced35cc231bd16a344da759db3f12131dd Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 15/32] Rename qtmain to qt5main @@ -76,5 +76,5 @@ index 1f54c846eca..162e7a4b1b4 100644 CONFIG += static -- -2.44.0 +2.45.1 diff --git a/0016-Enable-rpath-for-build-tools.patch b/0016-Enable-rpath-for-build-tools.patch index 5919447ebb08..fe1218b4438e 100644 --- a/0016-Enable-rpath-for-build-tools.patch +++ b/0016-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From 0dc529641264921bd859fabdf4a6d082b253fcdc Mon Sep 17 00:00:00 2001 +From 731606af0cded31a76af9c5835c4746aa4738260 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 16/32] Enable rpath for build tools @@ -33,5 +33,5 @@ index 8354f30eea2..30e8cf18c51 100644 INSTALLS += target -- -2.44.0 +2.45.1 diff --git a/0017-Use-system-zlib-for-build-tools.patch b/0017-Use-system-zlib-for-build-tools.patch index 3e8814e569ca..c864615e252b 100644 --- a/0017-Use-system-zlib-for-build-tools.patch +++ b/0017-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From c8b4c96da58bf20d982f5142ac0f218a2abeeb90 Mon Sep 17 00:00:00 2001 +From 88e72a2c464f041a4ab238a90016edce35ceebbe Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 17/32] Use system zlib for build tools @@ -23,5 +23,5 @@ index 24862a07dbc..698e6cfb95d 100644 } else { CONFIG += no_core_dep -- -2.44.0 +2.45.1 diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch index 7e35a741d883..6c73ee0e9188 100644 --- a/0018-Merge-shared-and-static-library-trees.patch +++ b/0018-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 2029f79155af8b3fdff3b9a66ee25b7ff274c327 Mon Sep 17 00:00:00 2001 +From fb7f2ab8ec627a62ded0f6c5965fef132ccc3db0 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 18/32] Merge shared and static library trees @@ -204,5 +204,5 @@ index c0ce0972ef4..5a2deaf31d2 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.44.0 +2.45.1 diff --git a/0019-Use-.dll.a-as-import-lib-extension.patch b/0019-Use-.dll.a-as-import-lib-extension.patch index cc8f99287b11..b6af814f7e53 100644 --- a/0019-Use-.dll.a-as-import-lib-extension.patch +++ b/0019-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From d5bbf09f6dd16ada912feae0a1a63cf22ecd5f71 Mon Sep 17 00:00:00 2001 +From 45f282343d32577fb7551144189fde9a01d044de Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 19/32] Use *.dll.a as import lib extension @@ -116,5 +116,5 @@ index 183cef29089..03732df4a84 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.44.0 +2.45.1 diff --git a/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index 2fe1a55d86a5..5a3cd8915594 100644 --- a/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From 8d7db460bee900348d29fb86784de1a79312bc19 Mon Sep 17 00:00:00 2001 +From e8cf5872bad72b833adbe4da4001090fa41b0454 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 20/32] Pull dependencies of static libraries in CMake modules @@ -499,5 +499,5 @@ index b465a7fa898..eaf9011c3d9 100644 set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_CLASS_NAME \"$$CMAKE_PLUGIN_NAME\") +endif() -- -2.44.0 +2.45.1 diff --git a/0021-Allow-usage-of-static-version-with-CMake.patch b/0021-Allow-usage-of-static-version-with-CMake.patch index 96c32ae865da..2d461c43cbd4 100644 --- a/0021-Allow-usage-of-static-version-with-CMake.patch +++ b/0021-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From a32c64f42900b052b017795255511cf5d1ea019d Mon Sep 17 00:00:00 2001 +From 2b2526c3f49b6a1d9e174d68c373a9ae9730d583 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 21/32] Allow usage of static version with CMake @@ -961,7 +961,7 @@ index 00000000000..0091940fd26 +set(OVERRIDE_QT_VARIANT_PREFIX "${ORIGINAL_OVERRIDE_QT_VARIANT_PREFIX}") + diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 0d02edb41c3..9da1361c95a 100644 +index 4ceafb6445e..774d8b6c2f7 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in @@ -2,6 +2,8 @@ if(NOT DEFINED QT_DEFAULT_MAJOR_VERSION) @@ -973,7 +973,7 @@ index 0d02edb41c3..9da1361c95a 100644 if (NOT TARGET Qt5::qmake) add_executable(Qt5::qmake IMPORTED) -@@ -55,12 +57,12 @@ set(Qt5Core_QMAKE_EXECUTABLE Qt5::qmake) +@@ -56,12 +58,12 @@ set(Qt5Core_QMAKE_EXECUTABLE Qt5::qmake) set(Qt5Core_MOC_EXECUTABLE Qt5::moc) set(Qt5Core_RCC_EXECUTABLE Qt5::rcc) @@ -990,7 +990,7 @@ index 0d02edb41c3..9da1361c95a 100644 COMPATIBLE_INTERFACE_STRING QT_MAJOR_VERSION QT_COORD_TYPE ) -@@ -71,7 +73,7 @@ foreach(_dir ${_qt5_corelib_extra_includes}) +@@ -72,7 +74,7 @@ foreach(_dir ${_qt5_corelib_extra_includes}) endforeach() list(APPEND Qt5Core_INCLUDE_DIRS ${_qt5_corelib_extra_includes}) @@ -999,7 +999,7 @@ index 0d02edb41c3..9da1361c95a 100644 set(_qt5_corelib_extra_includes) # Targets using Qt need to use the POSITION_INDEPENDENT_CODE property. The -@@ -86,7 +88,7 @@ set(Qt5_POSITION_INDEPENDENT_CODE True) +@@ -87,7 +89,7 @@ set(Qt5_POSITION_INDEPENDENT_CODE True) # Applications now need to be compiled with the -fPIC option if the Qt option # \"reduce relocations\" is active. For backward compatibility only, Qt accepts # the use of -fPIE for GCC 4.x versions. @@ -1008,7 +1008,7 @@ index 0d02edb41c3..9da1361c95a 100644 # TODO Qt6: Remove set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"\") -@@ -94,7 +96,7 @@ set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"\") +@@ -95,7 +97,7 @@ set(Qt5Core_EXECUTABLE_COMPILE_FLAGS \"\") !!IF !isEmpty(QT_NAMESPACE) list(APPEND Qt5Core_DEFINITIONS -DQT_NAMESPACE=$$QT_NAMESPACE) list(APPEND Qt5Core_COMPILE_DEFINITIONS QT_NAMESPACE=$$QT_NAMESPACE) @@ -1017,7 +1017,7 @@ index 0d02edb41c3..9da1361c95a 100644 !!ENDIF !!IF !isEmpty(CMAKE_DISABLED_FEATURES) -@@ -103,9 +105,9 @@ set(Qt5_DISABLED_FEATURES +@@ -104,9 +106,9 @@ set(Qt5_DISABLED_FEATURES ) !!ENDIF @@ -1029,7 +1029,7 @@ index 0d02edb41c3..9da1361c95a 100644 !!IF qtConfig(reduce_exports) set(QT_VISIBILITY_AVAILABLE \"True\") -@@ -153,14 +155,14 @@ if (NOT TARGET Qt5::WinMain) +@@ -154,14 +156,14 @@ if (NOT TARGET Qt5::WinMain) set(_isWin32 $<BOOL:$<TARGET_PROPERTY:WIN32_EXECUTABLE>>) set(_isNotExcluded $<NOT:$<BOOL:$<TARGET_PROPERTY:Qt5_NO_LINK_QTMAIN>>>) set(_isPolicyNEW $<TARGET_POLICY:CMP0020>) @@ -1091,5 +1091,5 @@ index 2a575958ae4..ca0e3be3b56 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.44.0 +2.45.1 diff --git a/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index 83810470c590..1c548c83d88b 100644 --- a/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From 1e0190cb9b33cd6aaef745da13d8e4de85a50775 Mon Sep 17 00:00:00 2001 +From a36333cb15ec3cc9adc8e7065034715a741ca7aa Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 22/32] Adjust linker flags for static build with @@ -13,10 +13,10 @@ Change-Id: Iad665f18da5b4540f0899829a0165e1d3aa4ea60 1 file changed, 6 insertions(+) diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in -index 9da1361c95a..5e802dea4c5 100644 +index 774d8b6c2f7..d16a0fb18c0 100644 --- a/src/corelib/Qt5CoreConfigExtras.cmake.in +++ b/src/corelib/Qt5CoreConfigExtras.cmake.in -@@ -206,3 +206,9 @@ if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::WinMain) +@@ -207,3 +207,9 @@ if(NOT \"${QT_NO_CREATE_VERSIONLESS_TARGETS}\" AND NOT TARGET Qt::WinMain) ) endif() !!ENDIF @@ -27,5 +27,5 @@ index 9da1361c95a..5e802dea4c5 100644 +set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\") +unset(_isExe) -- -2.44.0 +2.45.1 diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch index 39a8e626d249..80e8f235f4a7 100644 --- a/0023-Use-correct-pkg-config-static-flag.patch +++ b/0023-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From 4d24aaff9e4e144e320a964c2c21060b41c3039f Mon Sep 17 00:00:00 2001 +From 4af65a7ec4c2ddb51b87b03d7351c8b7a9f13d2a Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 23/32] Use correct pkg-config --static flag @@ -22,5 +22,5 @@ index 85acb3757aa..0a4db10dfca 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.44.0 +2.45.1 diff --git a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch index ccb734bcded2..766911f0e2f3 100644 --- a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From bfe19d4efc3d2102f6132231a3d41b4940ba2ecf Mon Sep 17 00:00:00 2001 +From 19c277e150d5d12b5eb1bd80ce8a1f6863fafbb2 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> 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 35d2a2dc546..99f061f1b82 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.44.0 +2.45.1 diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch index f28e1c84689c..31c4ebc18f8c 100644 --- a/0025-Ignore-errors-about-missing-feature-static.patch +++ b/0025-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From b4037f482107b0bde253b487487501b8bc82db55 Mon Sep 17 00:00:00 2001 +From f4d043d78ddb2a497e8623a282510271dec3a39b Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 25/32] Ignore errors about missing feature static @@ -32,5 +32,5 @@ index 7777e615bda..5f30366660b 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.44.0 +2.45.1 diff --git a/0026-Enable-and-fix-use-of-iconv.patch b/0026-Enable-and-fix-use-of-iconv.patch index 2bf44dfba747..49d657437d63 100644 --- a/0026-Enable-and-fix-use-of-iconv.patch +++ b/0026-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 5f1d71631402760aa75df7b0ea8c9be7608f51a2 Mon Sep 17 00:00:00 2001 +From 0c129a2729d3332ce66e7f987076d789aec7d763 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 26/32] Enable and fix use of iconv @@ -74,5 +74,5 @@ index a9025a2dd29..ffb6f50fbe1 100644 }, "icu": { -- -2.44.0 +2.45.1 diff --git a/0027-Ignore-failing-pkg-config-test.patch b/0027-Ignore-failing-pkg-config-test.patch index ca55df914ba3..6800a531873c 100644 --- a/0027-Ignore-failing-pkg-config-test.patch +++ b/0027-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From 341d9fb7080be076b2dbeb5d1b714eff08060327 Mon Sep 17 00:00:00 2001 +From 36508b49514d17ba00eafd15dd21202dfbec5092 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 27/32] Ignore failing pkg-config test @@ -21,5 +21,5 @@ index b75f8a8033c..72a963a6793 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.44.0 +2.45.1 diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch index 9776e1a11cbc..5d629e413c5c 100644 --- a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From 2095dda5640e16c678173355a2d39910701d8fc3 Mon Sep 17 00:00:00 2001 +From aab538b9ed39da73b7d12f46a64fde01cc646883 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> 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 03732df4a84..602f7609f58 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.44.0 +2.45.1 diff --git a/0029-Hardcode-linker-flags-for-platform-plugins.patch b/0029-Hardcode-linker-flags-for-platform-plugins.patch index e1a952761d31..3cdf8c138678 100644 --- a/0029-Hardcode-linker-flags-for-platform-plugins.patch +++ b/0029-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From c08a720e1cd51c0015ec02143cd65b17e5e69b64 Mon Sep 17 00:00:00 2001 +From cac5077627da94fdd50cf5fba443608639a98d57 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 29/32] Hardcode linker flags for platform plugins @@ -174,5 +174,5 @@ index 50a3bb41a92..02f74650a9b 100644 include(windows.pri) -- -2.44.0 +2.45.1 diff --git a/0030-Fix-linking-against-static-plugins-with-qmake.patch b/0030-Fix-linking-against-static-plugins-with-qmake.patch index 576bc94d219b..c603cfdd18ef 100644 --- a/0030-Fix-linking-against-static-plugins-with-qmake.patch +++ b/0030-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From bd80f6a8310a4e9d3d91d4fc242cccc3718977b1 Mon Sep 17 00:00:00 2001 +From 50f9630adc9205f5fdc5e45b04f5c116ad64776f Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> 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 b79b324b887..6a03b7a74bf 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.44.0 +2.45.1 diff --git a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch index 5fc03ed8d76e..de1455872c62 100644 --- a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch +++ b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch @@ -1,4 +1,4 @@ -From 5a1f5a3b43cfc29cd8ec1ce8791ef4029f5e2f96 Mon Sep 17 00:00:00 2001 +From 87e11456be77dba3965fc9bac3a3b6d3ea16012a Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> 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 8475e4111a7..c0eb8faa17d 100644 LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD) for (nu, LD_USES) { -- -2.44.0 +2.45.1 diff --git a/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch b/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch index c5673e401b3f..c39140dde5b9 100644 --- a/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch +++ b/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch @@ -1,4 +1,4 @@ -From 1690bb85bf77a77a80abf2d369b6ec17b87ab4f8 Mon Sep 17 00:00:00 2001 +From 8179dcecafdbaa987228042b6b958af3da091f0d Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> 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 1a2b907606a..746a41efa8e 100644 "Description": "FreeType is a freely available software library to render fonts.", "Homepage": "http://www.freetype.org", -- -2.44.0 +2.45.1 @@ -17,10 +17,10 @@ _qt_module=qtbase pkgname=mingw-w64-qt5-base -pkgver=5.15.13+kde+r138 +pkgver=5.15.14+kde+r140 pkgrel=1 _basever=${pkgver%%+*} -_commit=b9906b5233a80cab372c95ac4dd68b25bdca0646 +_commit=1c13ef067ea3c97342f98039931ea18b3992014f pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)' arch=('i686' 'x86_64') url='https://www.qt.io/' @@ -69,39 +69,39 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit '0030-Fix-linking-against-static-plugins-with-qmake.patch' '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch' '0032-Fix-crashes-in-rasterization-code-using-setjmp.patch') -sha256sums=('06e49a14145574834d4d04f73e6baf662ee5e72e78973e1d7d0fe614472a80a4' - '11c2b54df2b5ea031c2103366d0b27d0786c3420b29cca391cc0015fd35264d7' - '2b00e98c8c8acb1a453191be77a2f7a9188e030480864e58ac39b517bb63ffb5' - '5131dff4db6f63e36ea364ce59b2fdb047fbb6d55e6543316054f6ebcd76711b' - '3147a21ccad3026a06d8b622db96949d51f32b6a1d25c8aae5fe5a95c3e95625' - '4bd74cc1d78da412faac71b5357fd86fea3f1781d0b554f8f7fd3684c833e8ce' - 'e566e5cdd5bc077c35054be1465148acd5ee209e609690c670b78df88cc9295b' - '7fe1dc6c1251c16c4236924cb5a03ac55d1dca051bd9d99fbf7b35f91454fda3' - 'c054851c46036710ff6f025a48d4b5b2d6e5d5d54c74b73c2cb81b00bdfa029a' - 'a2702d6ca3f696ca3c77b00df7bb512f5f3430fce109048c62c97d294758efd8' - '395339c3dde4115283db948899980e536a355422190bc90850efdc3438c527d8' - 'c386790a879e68b9d00bfe9f14afa67d8a374de57bdea164a5252499ec34cbcb' - '576177950e99f62d05bee487dd5ae1b731fe4acf438553c74e7c48631dd8789b' - '02bc0ce27d7835829d4e84580fb0a0b864b36b14331a166dba88f1942a6414a3' - '736de6cd28c8efb1729f926c1fa42c963c7f1d3a9e4b56b098906b570473320f' - '294f3ab13a546a1bfeae472cf7342e2bce6c058a6867d19038ba1c194fb33b8d' - '8f202adf905ebce78dd2942d17c0d935f0de7014ffa75840310edc0bd790ff03' - '129b4667c5e3cfe68040cbae2fce487e2d016bcbe2380a5ba410b225279f71b9' - 'fbd8cd4680e10074f90bf79d9d08ad787b483cf7c21250d1db1c8a5c829a1d83' - '05a29084b9bc3324beefb9ae6d00ea68c3b3c51a0b4595c024300949c906d7fd' - '7843f5be44b9b367cb81c143c6d670e6a5be40510848c09a1448d921c3437639' - '7002db8f819bf34cafda04dc4d288fef58aec9e409230dc68fcb542cb48f09bb' - '57607c662e6d68f2ca856617c8d7cfaa05ba8332ea70b67ab628a8f0cf2ca032' - '5910c4567348101d0a87197b2e52e59673467247ca4ffc89cba5701d98373435' - '0181986547b7c70bf2bc8de31198240f99a92e4cfdb1db81c7b99b849c416c1f' - '9e692f956dffa5c936a2911d8418746b19197962111b4f0f45b33972ed3890f2' - '1d5e09034c9c903653d10c3983e4dcb710ebe8f08694e5e55199a3e4acb8f629' - '5379cea6fd54a16e7f67b617bf3582c08f8934ae8d699e85ad21f20dcf192424' - '82d1db9d4536350fe2549c400487018a8477a15da83a568240a013a6d82dfe92' - '01413344603a8e99f7b0280e7f297de4ea415e0c5011b1dac116eaf25082220b' - '4f88801a586c35515fd982f8e465fb4546ef38765c6a2abe1e8ca69e3700d799' - 'b4dad74bbe2731aaa8711408fe509344e7e6049def897389f7e2a86423f3377e' - '17f251d456713c920c6581659c54b9c372e1a329081b2ed9d9826e9e0ddd317a') +sha256sums=('SKIP' + '5b9f3f36e05a029181ca72b83683c119adbfba625ad98ba3fb02113d75d35d44' + 'ccab6d5fdce7809281c05c1b0b8ec65aab6db1112283fc69ba10bb05e664d545' + '9d4c8bfde02f7e77ea194f1e1ea724baaf947dcd72adca815559e43070df2938' + 'b6921b9b00542a4afad0f9f97f36b9d45c619bafa06a93576bed6545aea8dd3b' + 'd76628f9395f8b7813e058ebbb8b87d380d490d2e2e67d5d59218082330b3a65' + 'e909ab659266bc65fd14e16231855b3cf209a3a03965f934f5d81771d4a0191d' + '06fc346c7299fb31f0cbebb55c3749d533b48e99fd59e8a3ed3c068fcda03a2f' + 'edd73dc56259afdc8865417974b8956697954aad22844522554fe83c665a3ac8' + '41ffca5bd37d020a3edc56c0b9949e466026fb8c8d935defd9e66a71b779934c' + 'd869ae862fd3251c478e14fdb614185c81e5defb5b00f31161ff5497c66823e2' + '7ac6575b691ed70dde02182aec6f81aaad4aca8a041ab594868d113a913c9e41' + '0dba86fae79ae7368b504ae7d297359f4448f160a42b20b3857d81d2cde91ab5' + 'ddce558f74a1cdcb673e9a1e9df75442ea71fc6e2503fc85d779c5d8b948784a' + '48ee9c592f17400f37e958a59f3605c97d335dec18537b0d730601bb9787a07b' + '7e242c398740eabed1c437498e04744fda8a413ce6e668a2a654741d5900dd42' + '7cf8f198fe0348aa5c97c85bfcf868be62fec0fa0148570565c48ef1d91aa0e9' + '6ed70651c02399a407ffa4d8e76da46d5765983034d1e0644686f599b865b68f' + '9edc35b11aa19b10ddd7ced57b3b0d035755a4c443ba3b6c6755810a0ecd338f' + 'e4cc92c85debb106bf8ebc899729f8dc17a94a062ffa1c9e6f7fd4cc1c17f91e' + '2e9ac0244ca938fc547db038b5d72a31b82e155c84050bf0e3407300bf7eaecb' + 'a46f82235cfc8a6644b425061a7e923fa4468623974ddf75a46ec45802654cd0' + 'cdad591ba62797d930b5121eef39fa5e2928c76f28b0c32ab35b10ec04e550e4' + '67dec80f21aa819cea23a1b8a267c2724d2fa86e23c69834bc711b381fc03447' + '17320ad851fdf1f7282bb2215429aff12617096b0b82dfc689f3832766f5436e' + '3cb80c51dda4e79b5480e0417678c751d0f5b762014939593d9f9c1b645080be' + 'ecc72af327991945a6076790aadd5309aa8ac06891a14ed080fa49632e50b0b0' + 'efb16ee563478711ca027074494b0cbb1c4f3054028dedd5bcf2b3da91c0797c' + '6247074166f5d9a97fb60597b15a80a65cfb2ea5dffc31dcb739cbaa9a95ac62' + '29062bf991b8eab0c65a5ecf09f9a69673757653aacb48269033e5ad8d4f652f' + 'd0d8703d6ec5b960da6a537a3903804ef4366693125b0a31e5cd59954e348888' + '422b67821c2cb1025e3a230965ef664eabb05a9c6d623bc67fc0daaa0fd57262' + '5be2fe99912d1f905aac9a5c1de48e130a3e364bb97fa47fd81f66f26c7c9296') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -219,7 +219,7 @@ build() { #export LDFLAGS="-L$PWD/lib" msg2 'Build qmake and configure' && ../${_pkgfqn}/configure $qt_configure_args - msg2 'Build Qt libraries' && make -j$(nproc) + msg2 'Build Qt libraries' && make popd done @@ -228,7 +228,7 @@ build() { package() { for _arch in ${_architectures}; do cd "$srcdir/${_pkgfqn}" - make install -j$(nproc) -C ../build-${_arch} INSTALL_ROOT="${pkgdir}" + make install -C ../build-${_arch} INSTALL_ROOT="${pkgdir}" # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE pushd "$srcdir/build-${_arch}/lib" diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt index 2bf4062ff4af..7f9f47113366 100644 --- a/qtbase-sha256.txt +++ b/qtbase-sha256.txt @@ -1 +1 @@ -06e49a14145574834d4d04f73e6baf662ee5e72e78973e1d7d0fe614472a80a4 +cce3b289529f02b1c27a2c6659abb8f6d7ba62545507f17b44d31f15ecdcc109 |