diff --git a/devel/generator/generate.pl b/devel/generator/generate.pl index ea50748e..2325b3e9 100755 --- a/devel/generator/generate.pl +++ b/devel/generator/generate.pl @@ -80,7 +80,7 @@ my %kde_fork_revisions = ( activeqt => [0, '7a04a93e97390de2d91e89dc907e8240dd5a0c4f'], winextras => [0, '5afc77f5347113b607ca0262505f3406e1be5bf4'], '3d' => [0, '01aa0a9cb22ce5ed2b7ead03ed9cbeb5f978e897'], - base => [129, 'e8d9e68d25f4bf305f8b3ca5d678594ee4681baa'], + base => [147, 'e24dc54b2b4054413650904288aa7a363eee23a7'], charts => [0, '7ce22b0633eb9d1eb59854fee4f2f545e1b842e0'], connectivity => [4, 'eeaf42bccd49e8161fbae82d110026d25a5a9a7f'], datavis3d => [0, 'd366b0aad8454355acac79eddbab445c1108b1e9'], diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD index eca01258..ffb00791 100644 --- a/qt5-base/mingw-w64-static/PKGBUILD +++ b/qt5-base/mingw-w64-static/PKGBUILD @@ -17,10 +17,10 @@ _qt_module=qtbase pkgname=mingw-w64-qt5-base-static -pkgver=5.15.10+kde+r129 +pkgver=5.15.10+kde+r147 pkgrel=1 _basever=${pkgver%%+*} -_commit=e8d9e68d25f4bf305f8b3ca5d678594ee4681baa +_commit=e24dc54b2b4054413650904288aa7a363eee23a7 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)' arch=('any') url='https://www.qt.io/' @@ -71,38 +71,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' - '5575a2851d3b14b0cf64541c6094049f539559f3258a82163e447c742eb63ad5' - '25d6cda0799d3c1bb37d0a8e04842918aa01fa35af62750099b65824d002c5bf' - 'e7c22b2c51429cad62ac0e799f44f852c71833f2f863e6436737efd24ee3afb3' - '4a0e39c118a7557254df4ebd76541752aa93c039df1bef09a93cee507756781b' - 'c554e4dcc782a16074345153c699c6580c5dc6e5bd5f419b38b3c0f50c5dd660' - 'eb27e5598c4a234de18a35d3cd4f8e3176acdef28d73d7eee2f3b9ac1b543a73' - '70be0fc5267af9a88abc0e9d0dfb6c361954f075c51a3ae88db5ad47673d9e07' - '3a78fa01d71569952acea141eee92b69c05e33b9222f9526eda5e1050071290f' - 'b7dd6d5039c8bbe185191934113446dd93bbf31c5e37b1014854f345ff537d4d' - 'f1c3ab01d71dacfe223233ca94d0ca6c402869987e735887e54617d0e0b94c26' - 'a949f72ccfd9be7796b2f6504089c932539a25a0c3695659819c5d5e6cbbc7e2' - '49d3b8e852d42e8b817864ba27e68b2dda6d8e1523843355a4284ac52a844f02' - 'd13271708d94fd0daad5d5c6f01c52f393ee723ee9af4231dc2b50ce9c650b35' - '3558735297a33ae56796f82a5b655ad5b0eeb097e0f5caad88751de47e7c7eca' - 'dfbea1bde61b92d4dc7ab7d8253a60dd8af4e3bb655b52ba398ec53c95ffa56e' - '4bf7efe320d267f1a2b4836cfcd5ed0be41660fbbcde3c9d79737e913a824d4d' - 'cb0aa04799c7ba97e22639f6d3002001f3d63a458b334c1a0a8621daf9763ec2' - 'cc33e6907b254c9f304f2adf4baf9a40f1d04551988a403e4ff922b8298ce24c' - '1726007c8b0ce3765cd1eda15a2ebe0e66687de4e674ac1ed688de6498ae88a7' - '4cf9137b1eab21d0eb3f690e821134e2041dd772313a8cb8081cabf2e611baba' - 'e7c046cfeaa424ba7e45b3ac598a31bf06c4900e417db3f47bdf0feb25f6c634' - 'b37f0b55608847e8ad7e551b9b3e1c541ec3cfeb784060af81af65f9d51ea0fa' - 'a4dd3a9dc9aaa6758a1b6e970b6b097624fe92f4b034ee4f0e3d2f2ac4f3ec34' - '0b8baecbae0bad0d9496d522537bac32c6d4914a4c5fb75b82254cfecbf905b0' - '1ae5b15ac4307d319635d24c6227dad58684462b6337f0f5b3e09b898b492010' - '061231bae7cf862f84849f7a176421579141b2dd0080cb12f5b57c9c074b93a7' - 'f34020441b50baeecb7f2a761d5c70bf22ece4818aff31dc96481ade7b5f0e57' - '06ad3bd34589418d8b9bf1bc96731585f339b3078e2d5b0106f9fbb5d45eeb44' - 'af0336853112a291ae85cb8a1e5e40ee43cb23ec1a6d1683610f5e6a36346550' - '7d953e963bdf0595c17712991fe0d71b128c06e4f8e00d9eb0657b2e9d44b121' - '2334c6b78f97ac2636f66b96b380cee137c8da08fa451f97b274f64c29fd8f38' - 'e0daf561153e0758467fd902d69c30c1a6449580cc13e378c498bd35e8589394') + '01185644beafce338d629deec99795259efe12ba8d6b190c6c3a98218709d2e0' + 'ebae2c1921c7c6200387257a09fa5fdcefe676e9c03e48e03d9551a1426e1d2d' + '37f244bdda8968dabb01d6e09b18a6b12b43de6547df8862876c080cd969a02d' + '7f8951ca79c221744d2db1f87dc7290fc7a7137145db490703f6ee1aa332354c' + 'd171a78c0457674cc1c062775d7c7f005b4f128131564f4fc98461545bf70f94' + '8b1993e1d6ff11bdf19b11abb07f09b59545ef71fdb5c273cf2d675ea0a008db' + 'e06ae3fea6d0861b67fbfa3df4a8af62c61f92528225bffc1bbc89ebf44533aa' + 'e91f981419e9a5ccd606c7522ea622659dd54b719a1089b0f39c2c9a4644f5dc' + '395dff70a563d4a4c22e8b694053c7f4126f6d3ed6bb68fa050441645d5828f6' + '5a89ed682c6e6d4f04e4d538a2d67a52861e73b12a77095d2646893c9f5a27aa' + '674887bf599c22ccf5fa8e1ed9af78c69f75dc6a92d779e368949cc7abf03d78' + 'be747199fac810ba4e177d7a339fdb67e37018e40c96015442b093ba393c435e' + '560f1ca401802b5768043a165c52b595a5ad50642f79d6dc9ae34d6ef367053e' + 'aacebe3a2eae997f9d118e7e332e2a2f36121362d169acea019c1017e27eba3a' + 'afd1f5f1bbf9ddc24484df10a49a68338beea727b1f3016b7423bb31a883c3a4' + 'eb299571b41d9ad999c1e74ef979a3804b54e9680705e255c5554622b9b36f48' + 'a4f1deee515f6e76616092cd5b29236007d3050af2361dcd9401bb588092d613' + '42f2895f03bcf196c7f4e3e41d68d5e0196645291ec9f27705c1ccbd386fe5b2' + '151b0094b7e50392e8c9b5226ce2a6db3a76a4daae3a1decfd35b9a0738f14d1' + 'fd2af0030ce93ca93d14778461f8e738b91fcc8a37414902f0bdbdd4a3a4232e' + 'd5a89d52fac9118f3e6107015863bfcf3592bed858a5159c2010bdca363b06fc' + '9c362e5508f717feb0577d2fc7882a088e8c981dd1b0a3f19bf06663819e89e8' + 'fcde7e40a7709abc17fbf37db3a649b326f6c6dde96c8f4e48f887f59c7485c3' + '43c808091ce13470596bc3f8d1719a215ef51fe8ec1417c8086525415b74c3e6' + '80eafdb90c2602b0984fa603a78ef398a142b85e3c1eda4bacf626be23f7799e' + '136c4b294eeeaf71ae3fd26715f0af9966705dd861ed7f1c48194ad1dca73803' + 'a7116e2b07a5f7eb25aed6aefcc3a5a72a6da4a9d532b8cdf72ce6aac1935393' + 'e4b56d99f0815dc67d05926c0127e65ecd1c9c1f3ff6077d4588a8f331575d79' + 'aa803f2083fb77ba86a41b8cfd51cbc33880e7cba44584ddbd725a349dcef68b' + 'a44077d097e39690220ab5eda173382b6b66c13c2f93854dbcf299c5caadd15e' + 'd17ad5ba095239c35f9320327c85b772ef955eaf9de8e8b2cee864f67ceb2c96' + '0077e058b78d75e83ee33a1659a297c48b060838d226945156769f17473fae95') _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 6d8cb814..9bb72965 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 4b44fc8d6eb08a8d650fa7f9a0ad8d2daee8c8e1 Mon Sep 17 00:00:00 2001 +From 2858bbfee0626ad84ba2c6510c8f894692d6eb94 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 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 2dbf9891..c5e74ab1 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 a386f2ffcf46ed410bc1b780c08761b71c3c99ca Mon Sep 17 00:00:00 2001 +From 52ed89a36a143e4faff7c0e60d74a7be81da4e8d 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 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 f3b14be1..516fa9fd 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 511c391c08975f57d70995cde493894c50024ac5 Mon Sep 17 00:00:00 2001 +From 50b2aa4666bfcfaec24cd6e0540c9df1f5b282a9 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 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 a6740708..992e7f53 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 4dcb5b8f76d0d5c8f11277c0fcba0b4544624b32 Mon Sep 17 00:00:00 2001 +From b3b267999721a46db6fda3958af92eb2c1a2fb7e 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 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 ea90e978..6d3b3eb4 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 511dc70a41721926177d5429b928dae0d9766f70 Mon Sep 17 00:00:00 2001 +From 27875f68422e87a7a5d52483da44fb7162421c47 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 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 d8a34121..f3b8de7b 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 9c387ee325280dc9f634876c54d0295ad9038efb Mon Sep 17 00:00:00 2001 +From a34bc79d263bd415f183c345f86a29dec8966e24 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 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 c1521317..008a673a 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 f5ffb39a0a52f163591a995274845fac82ae8517 Mon Sep 17 00:00:00 2001 +From 374aff9f47b12816a2bcc564b5d03dad97e7bd80 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 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 bd47d9ec..be9ddb5a 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 a58a8c47e247696eb9061c949ad1567de5307afd Mon Sep 17 00:00:00 2001 +From c77c21a60d4923e962ea29239d0b8cbdd832961f 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 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 32ccc9f0..aded6b3b 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 236c7ca8f3706821e3ca98dbc2a2a8bb21776c32 Mon Sep 17 00:00:00 2001 +From a87e4119557a9e11d97d983d077c137dcaf66440 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 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 7884d79a..195aee99 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 ec2bf09c0ebb132f09650e68d042545923ea8777 Mon Sep 17 00:00:00 2001 +From f9cc266be4c7f3c3079dd1486a64b7a35bb83414 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 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 c4a8f934..a749a6e8 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 cff1619ac4e1e7f190357dc5b6f9a569c9e22914 Mon Sep 17 00:00:00 2001 +From 9c05ceb56c99d297b8760b4ea4e608a43e7cfda1 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 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 d63ef7d7..4eb1ba09 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 8b62c9e283b295574bab6dfb09f6a21a62310fc6 Mon Sep 17 00:00:00 2001 +From 73945aac03e0c1a218d95c58ae6043e4a713d6ed 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 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 00ed9eaf..0c077c33 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 1bed841db4ffc9375f0688a0ceb1597844d9ed02 Mon Sep 17 00:00:00 2001 +From 73cee8f5302302c0cea7b799f6886eaa3de74009 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 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 097010ed..8270faf7 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 6465bbecacd50596f4eef4f2846ae5f3105348d2 Mon Sep 17 00:00:00 2001 +From 179aa12d6f86bd8191806c35e4495cacadc0a78f 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 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 b98ce0ed..d41c48bc 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 4004f593210513e2283c866c179389d565825ed3 Mon Sep 17 00:00:00 2001 +From 7ca61e42a45702147f8a330d4fe4b05695492d2a 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 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 78ecbdc3..3325c1ee 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 37aa04c1e28bef2c8b92019a636d17c3b32e001f Mon Sep 17 00:00:00 2001 +From 4138237d397ab4e6e568fcd44a14f30279514f09 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 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 be974feb..e74d0662 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 d9d5f9908c72e4b8fb3f4a73129d9cd1b1bd3ca7 Mon Sep 17 00:00:00 2001 +From 013bf4e8e6eeaba369cae168425c501af774148d 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 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 d2f49e43..6dc7d4ab 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 bf9698f5703d4d6d6da8a627766054e7e682f3ae Mon Sep 17 00:00:00 2001 +From 8fed38146db1dc54a3b47d3e1d15c26684fd2526 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 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 afb552bf..1a33df9d 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 6f08bbee92af46e9c93fe5a364ef122885ba18c2 Mon Sep 17 00:00:00 2001 +From c565c98d128ed850b10ddb37696bd66a6370b20d 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 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 189fb348..a1c8926a 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 4ee89f7cb286a1b85f9a7834bc245529d5bb610e Mon Sep 17 00:00:00 2001 +From 271b9dbe73f6a588cab8bc37b116038eff910312 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 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 d92d2a13..0972dc1a 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 49e14061fa7b828779878fcde4e70b0b031086fd Mon Sep 17 00:00:00 2001 +From 967093fb90793e18fb0121f5370474329c3f90b8 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 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 3bed788a..29b9cd7a 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 93129b13c5864f10b3f8fd135dc91ee91b2daa4f Mon Sep 17 00:00:00 2001 +From a076aa5b3c0f76ffd6cdb2676af59aae87ebb8c3 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 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 c88d5760..138a95b7 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 f55ebd797d5e32793a6792e7af9fff7f5fb0bfe0 Mon Sep 17 00:00:00 2001 +From 802418548469aef0786dcc7a0f5ea558be1fb531 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 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 e034a7e2..84901777 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 c67b271876e27226cb9b3b05e641097cb3812a7a Mon Sep 17 00:00:00 2001 +From 01ba1834d878308636460452d21fd19fb97acf75 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 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 d7d2b97e..8356dce8 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 4af504e31a8053f8255592b300590de57d67939d Mon Sep 17 00:00:00 2001 +From 03dcb78a55013e1d5cf3544b7b626bdd99570cb0 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 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 f93a3993..3923bb43 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 78a3832857278ccfa3d170fa673cb4b5a4717af3 Mon Sep 17 00:00:00 2001 +From 3ae78f69a30b56d29c5807339153cac8f1873dbc 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 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 33e8e1d8..69e76554 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 92f8d50f4c7dfc8654abc4b27e5fe16be70bbd93 Mon Sep 17 00:00:00 2001 +From d7cb1055db6a80a089915190c12434f6d96ecff0 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 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 e2fac914..5b51b495 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 abe28499dde072fd6041c44ccd2b94cb32c609b7 Mon Sep 17 00:00:00 2001 +From aa48569879407584b038a9356ea39ba39c3d8ef5 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 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 2be7afcb..21a4581b 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 1bb703668a845d8de0b909e9adf9655ea7075abf Mon Sep 17 00:00:00 2001 +From 55191d32380daeaea66eb8c8f0b7775b5d0d33d5 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 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 9ee03432..9270421e 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 84d660b4aa42d811b092b933340d29c6fc8092b5 Mon Sep 17 00:00:00 2001 +From 00b7b85a199cec674b6163f2c53abf35d8bbf26c 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 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 b0d55ea9..19f8950d 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 78b25c64b0b8375d1f3db12d2f892ecbef2d4949 Mon Sep 17 00:00:00 2001 +From 20b36b2a46eb7ceb350c15277731359ce6dce7ab 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' 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 e0b3343d..5e9e1591 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 958d0705b8a8faed9d8a07b3e1ea3949317211f9 Mon Sep 17 00:00:00 2001 +From c1f0e9b693f65942319e8b93be6b2089d4019b17 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 diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD index 5b8bff70..0bd8eff1 100644 --- a/qt5-base/mingw-w64/PKGBUILD +++ b/qt5-base/mingw-w64/PKGBUILD @@ -17,10 +17,10 @@ _qt_module=qtbase pkgname=mingw-w64-qt5-base -pkgver=5.15.10+kde+r129 +pkgver=5.15.10+kde+r147 pkgrel=1 _basever=${pkgver%%+*} -_commit=e8d9e68d25f4bf305f8b3ca5d678594ee4681baa +_commit=e24dc54b2b4054413650904288aa7a363eee23a7 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)' arch=('i686' 'x86_64') 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' - '5575a2851d3b14b0cf64541c6094049f539559f3258a82163e447c742eb63ad5' - '25d6cda0799d3c1bb37d0a8e04842918aa01fa35af62750099b65824d002c5bf' - 'e7c22b2c51429cad62ac0e799f44f852c71833f2f863e6436737efd24ee3afb3' - '4a0e39c118a7557254df4ebd76541752aa93c039df1bef09a93cee507756781b' - 'c554e4dcc782a16074345153c699c6580c5dc6e5bd5f419b38b3c0f50c5dd660' - 'eb27e5598c4a234de18a35d3cd4f8e3176acdef28d73d7eee2f3b9ac1b543a73' - '70be0fc5267af9a88abc0e9d0dfb6c361954f075c51a3ae88db5ad47673d9e07' - '3a78fa01d71569952acea141eee92b69c05e33b9222f9526eda5e1050071290f' - 'b7dd6d5039c8bbe185191934113446dd93bbf31c5e37b1014854f345ff537d4d' - 'f1c3ab01d71dacfe223233ca94d0ca6c402869987e735887e54617d0e0b94c26' - 'a949f72ccfd9be7796b2f6504089c932539a25a0c3695659819c5d5e6cbbc7e2' - '49d3b8e852d42e8b817864ba27e68b2dda6d8e1523843355a4284ac52a844f02' - 'd13271708d94fd0daad5d5c6f01c52f393ee723ee9af4231dc2b50ce9c650b35' - '3558735297a33ae56796f82a5b655ad5b0eeb097e0f5caad88751de47e7c7eca' - 'dfbea1bde61b92d4dc7ab7d8253a60dd8af4e3bb655b52ba398ec53c95ffa56e' - '4bf7efe320d267f1a2b4836cfcd5ed0be41660fbbcde3c9d79737e913a824d4d' - 'cb0aa04799c7ba97e22639f6d3002001f3d63a458b334c1a0a8621daf9763ec2' - 'cc33e6907b254c9f304f2adf4baf9a40f1d04551988a403e4ff922b8298ce24c' - '1726007c8b0ce3765cd1eda15a2ebe0e66687de4e674ac1ed688de6498ae88a7' - '4cf9137b1eab21d0eb3f690e821134e2041dd772313a8cb8081cabf2e611baba' - 'e7c046cfeaa424ba7e45b3ac598a31bf06c4900e417db3f47bdf0feb25f6c634' - 'b37f0b55608847e8ad7e551b9b3e1c541ec3cfeb784060af81af65f9d51ea0fa' - 'a4dd3a9dc9aaa6758a1b6e970b6b097624fe92f4b034ee4f0e3d2f2ac4f3ec34' - '0b8baecbae0bad0d9496d522537bac32c6d4914a4c5fb75b82254cfecbf905b0' - '1ae5b15ac4307d319635d24c6227dad58684462b6337f0f5b3e09b898b492010' - '061231bae7cf862f84849f7a176421579141b2dd0080cb12f5b57c9c074b93a7' - 'f34020441b50baeecb7f2a761d5c70bf22ece4818aff31dc96481ade7b5f0e57' - '06ad3bd34589418d8b9bf1bc96731585f339b3078e2d5b0106f9fbb5d45eeb44' - 'af0336853112a291ae85cb8a1e5e40ee43cb23ec1a6d1683610f5e6a36346550' - '7d953e963bdf0595c17712991fe0d71b128c06e4f8e00d9eb0657b2e9d44b121' - '2334c6b78f97ac2636f66b96b380cee137c8da08fa451f97b274f64c29fd8f38' - 'e0daf561153e0758467fd902d69c30c1a6449580cc13e378c498bd35e8589394') + '01185644beafce338d629deec99795259efe12ba8d6b190c6c3a98218709d2e0' + 'ebae2c1921c7c6200387257a09fa5fdcefe676e9c03e48e03d9551a1426e1d2d' + '37f244bdda8968dabb01d6e09b18a6b12b43de6547df8862876c080cd969a02d' + '7f8951ca79c221744d2db1f87dc7290fc7a7137145db490703f6ee1aa332354c' + 'd171a78c0457674cc1c062775d7c7f005b4f128131564f4fc98461545bf70f94' + '8b1993e1d6ff11bdf19b11abb07f09b59545ef71fdb5c273cf2d675ea0a008db' + 'e06ae3fea6d0861b67fbfa3df4a8af62c61f92528225bffc1bbc89ebf44533aa' + 'e91f981419e9a5ccd606c7522ea622659dd54b719a1089b0f39c2c9a4644f5dc' + '395dff70a563d4a4c22e8b694053c7f4126f6d3ed6bb68fa050441645d5828f6' + '5a89ed682c6e6d4f04e4d538a2d67a52861e73b12a77095d2646893c9f5a27aa' + '674887bf599c22ccf5fa8e1ed9af78c69f75dc6a92d779e368949cc7abf03d78' + 'be747199fac810ba4e177d7a339fdb67e37018e40c96015442b093ba393c435e' + '560f1ca401802b5768043a165c52b595a5ad50642f79d6dc9ae34d6ef367053e' + 'aacebe3a2eae997f9d118e7e332e2a2f36121362d169acea019c1017e27eba3a' + 'afd1f5f1bbf9ddc24484df10a49a68338beea727b1f3016b7423bb31a883c3a4' + 'eb299571b41d9ad999c1e74ef979a3804b54e9680705e255c5554622b9b36f48' + 'a4f1deee515f6e76616092cd5b29236007d3050af2361dcd9401bb588092d613' + '42f2895f03bcf196c7f4e3e41d68d5e0196645291ec9f27705c1ccbd386fe5b2' + '151b0094b7e50392e8c9b5226ce2a6db3a76a4daae3a1decfd35b9a0738f14d1' + 'fd2af0030ce93ca93d14778461f8e738b91fcc8a37414902f0bdbdd4a3a4232e' + 'd5a89d52fac9118f3e6107015863bfcf3592bed858a5159c2010bdca363b06fc' + '9c362e5508f717feb0577d2fc7882a088e8c981dd1b0a3f19bf06663819e89e8' + 'fcde7e40a7709abc17fbf37db3a649b326f6c6dde96c8f4e48f887f59c7485c3' + '43c808091ce13470596bc3f8d1719a215ef51fe8ec1417c8086525415b74c3e6' + '80eafdb90c2602b0984fa603a78ef398a142b85e3c1eda4bacf626be23f7799e' + '136c4b294eeeaf71ae3fd26715f0af9966705dd861ed7f1c48194ad1dca73803' + 'a7116e2b07a5f7eb25aed6aefcc3a5a72a6da4a9d532b8cdf72ce6aac1935393' + 'e4b56d99f0815dc67d05926c0127e65ecd1c9c1f3ff6077d4588a8f331575d79' + 'aa803f2083fb77ba86a41b8cfd51cbc33880e7cba44584ddbd725a349dcef68b' + 'a44077d097e39690220ab5eda173382b6b66c13c2f93854dbcf299c5caadd15e' + 'd17ad5ba095239c35f9320327c85b772ef955eaf9de8e8b2cee864f67ceb2c96' + '0077e058b78d75e83ee33a1659a297c48b060838d226945156769f17473fae95') _architectures='i686-w64-mingw32 x86_64-w64-mingw32'