From 2319ff960692cdf6dcba5e21dba59bac709952fd Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 15 Dec 2017 22:49:20 +0100 Subject: [PATCH] Fix libraries for static Qt platform plugins --- ...for-cross-compilation-with-mingw-w64.patch | 6 +- ...is-defined-when-using-dynamic-OpenGL.patch | 2 +- .../0003-Use-external-ANGLE-library.patch | 2 +- ...tions-assemler-error-in-OpenGL-facto.patch | 2 +- ...re-.pc-files-are-installed-correctly.patch | 2 +- ...add-resource-files-to-LIBS-parameter.patch | 2 +- ...ug-library-names-in-pkg-config-files.patch | 2 +- ...linking-against-shared-static-libpng.patch | 2 +- ...009-Fix-linking-against-static-D-Bus.patch | 2 +- ...o-use-debug-version-of-D-Bus-library.patch | 2 +- ...Fix-linking-against-static-freetype2.patch | 2 +- ...-Fix-linking-against-static-harfbuzz.patch | 2 +- ...0013-Fix-linking-against-static-pcre.patch | 2 +- ...inking-against-shared-static-MariaDB.patch | 2 +- ...ing-against-shared-static-PostgreSQL.patch | 2 +- .../0016-Rename-qtmain-to-qt5main.patch | 2 +- .../0017-Build-dynamic-host-libraries.patch | 2 +- .../0018-Enable-rpath-for-build-tools.patch | 2 +- ...0019-Use-system-zlib-for-build-tools.patch | 2 +- ...g-default-include-and-lib-dirs-at-qm.patch | 2 +- ...1-Use-.dll.a-as-import-lib-extension.patch | 2 +- ...erge-shared-and-static-library-trees.patch | 2 +- ...s-of-static-libraries-in-CMake-modul.patch | 6 +- ...w-usage-of-static-version-with-CMake.patch | 4 +- ...ags-for-static-build-with-cmake-ming.patch | 2 +- ...6-Use-correct-pkg-config-static-flag.patch | 2 +- ...7-Fix-macro-invoking-moc-rcc-and-uic.patch | 2 +- ...-errors-about-missing-feature-static.patch | 2 +- .../0029-Enable-and-fix-use-of-iconv.patch | 2 +- .../0030-Ignore-failing-pkg-config-test.patch | 2 +- ...from-messing-static-lib-dependencies.patch | 2 +- ...de-linker-flags-for-platform-plugins.patch | 2 +- ...ng-against-static-plugins-with-qmake.patch | 2 +- .../0034-Don-t-use-the-statx-syscall.patch | 2 +- qt5-base/mingw-w64-angle/PKGBUILD | 70 +++++++++---------- ...for-cross-compilation-with-mingw-w64.patch | 6 +- ...is-defined-when-using-dynamic-OpenGL.patch | 2 +- .../0003-Use-external-ANGLE-library.patch | 2 +- ...tions-assemler-error-in-OpenGL-facto.patch | 2 +- ...re-.pc-files-are-installed-correctly.patch | 2 +- ...add-resource-files-to-LIBS-parameter.patch | 2 +- ...ug-library-names-in-pkg-config-files.patch | 2 +- ...linking-against-shared-static-libpng.patch | 2 +- ...009-Fix-linking-against-static-D-Bus.patch | 2 +- ...o-use-debug-version-of-D-Bus-library.patch | 2 +- ...Fix-linking-against-static-freetype2.patch | 2 +- ...-Fix-linking-against-static-harfbuzz.patch | 2 +- ...0013-Fix-linking-against-static-pcre.patch | 2 +- ...inking-against-shared-static-MariaDB.patch | 2 +- ...ing-against-shared-static-PostgreSQL.patch | 2 +- .../0016-Rename-qtmain-to-qt5main.patch | 2 +- .../0017-Build-dynamic-host-libraries.patch | 2 +- .../0018-Enable-rpath-for-build-tools.patch | 2 +- ...0019-Use-system-zlib-for-build-tools.patch | 2 +- ...g-default-include-and-lib-dirs-at-qm.patch | 2 +- ...1-Use-.dll.a-as-import-lib-extension.patch | 2 +- ...erge-shared-and-static-library-trees.patch | 2 +- ...s-of-static-libraries-in-CMake-modul.patch | 6 +- ...w-usage-of-static-version-with-CMake.patch | 4 +- ...ags-for-static-build-with-cmake-ming.patch | 2 +- ...6-Use-correct-pkg-config-static-flag.patch | 2 +- ...7-Fix-macro-invoking-moc-rcc-and-uic.patch | 2 +- ...-errors-about-missing-feature-static.patch | 2 +- .../0029-Enable-and-fix-use-of-iconv.patch | 2 +- .../0030-Ignore-failing-pkg-config-test.patch | 2 +- ...from-messing-static-lib-dependencies.patch | 2 +- ...de-linker-flags-for-platform-plugins.patch | 2 +- ...ng-against-static-plugins-with-qmake.patch | 2 +- .../0034-Don-t-use-the-statx-syscall.patch | 2 +- qt5-base/mingw-w64-dynamic/PKGBUILD | 70 +++++++++---------- ...for-cross-compilation-with-mingw-w64.patch | 6 +- ...is-defined-when-using-dynamic-OpenGL.patch | 2 +- .../0003-Use-external-ANGLE-library.patch | 2 +- ...tions-assemler-error-in-OpenGL-facto.patch | 2 +- ...re-.pc-files-are-installed-correctly.patch | 2 +- ...add-resource-files-to-LIBS-parameter.patch | 2 +- ...ug-library-names-in-pkg-config-files.patch | 2 +- ...linking-against-shared-static-libpng.patch | 2 +- ...009-Fix-linking-against-static-D-Bus.patch | 2 +- ...o-use-debug-version-of-D-Bus-library.patch | 2 +- ...Fix-linking-against-static-freetype2.patch | 2 +- ...-Fix-linking-against-static-harfbuzz.patch | 2 +- ...0013-Fix-linking-against-static-pcre.patch | 2 +- ...inking-against-shared-static-MariaDB.patch | 2 +- ...ing-against-shared-static-PostgreSQL.patch | 2 +- .../0016-Rename-qtmain-to-qt5main.patch | 2 +- .../0017-Build-dynamic-host-libraries.patch | 2 +- .../0018-Enable-rpath-for-build-tools.patch | 2 +- ...0019-Use-system-zlib-for-build-tools.patch | 2 +- ...g-default-include-and-lib-dirs-at-qm.patch | 2 +- ...1-Use-.dll.a-as-import-lib-extension.patch | 2 +- ...erge-shared-and-static-library-trees.patch | 2 +- ...s-of-static-libraries-in-CMake-modul.patch | 6 +- ...w-usage-of-static-version-with-CMake.patch | 4 +- ...ags-for-static-build-with-cmake-ming.patch | 2 +- ...6-Use-correct-pkg-config-static-flag.patch | 2 +- ...7-Fix-macro-invoking-moc-rcc-and-uic.patch | 2 +- ...-errors-about-missing-feature-static.patch | 2 +- .../0029-Enable-and-fix-use-of-iconv.patch | 2 +- .../0030-Ignore-failing-pkg-config-test.patch | 2 +- ...from-messing-static-lib-dependencies.patch | 2 +- ...de-linker-flags-for-platform-plugins.patch | 2 +- ...ng-against-static-plugins-with-qmake.patch | 2 +- .../0034-Don-t-use-the-statx-syscall.patch | 2 +- qt5-base/mingw-w64-static/PKGBUILD | 70 +++++++++---------- ...for-cross-compilation-with-mingw-w64.patch | 6 +- ...is-defined-when-using-dynamic-OpenGL.patch | 2 +- .../0003-Use-external-ANGLE-library.patch | 2 +- ...tions-assemler-error-in-OpenGL-facto.patch | 2 +- ...re-.pc-files-are-installed-correctly.patch | 2 +- ...add-resource-files-to-LIBS-parameter.patch | 2 +- ...ug-library-names-in-pkg-config-files.patch | 2 +- ...linking-against-shared-static-libpng.patch | 2 +- ...009-Fix-linking-against-static-D-Bus.patch | 2 +- ...o-use-debug-version-of-D-Bus-library.patch | 2 +- ...Fix-linking-against-static-freetype2.patch | 2 +- ...-Fix-linking-against-static-harfbuzz.patch | 2 +- ...0013-Fix-linking-against-static-pcre.patch | 2 +- ...inking-against-shared-static-MariaDB.patch | 2 +- ...ing-against-shared-static-PostgreSQL.patch | 2 +- .../0016-Rename-qtmain-to-qt5main.patch | 2 +- .../0017-Build-dynamic-host-libraries.patch | 2 +- .../0018-Enable-rpath-for-build-tools.patch | 2 +- ...0019-Use-system-zlib-for-build-tools.patch | 2 +- ...g-default-include-and-lib-dirs-at-qm.patch | 2 +- ...1-Use-.dll.a-as-import-lib-extension.patch | 2 +- ...erge-shared-and-static-library-trees.patch | 2 +- ...s-of-static-libraries-in-CMake-modul.patch | 6 +- ...w-usage-of-static-version-with-CMake.patch | 4 +- ...ags-for-static-build-with-cmake-ming.patch | 2 +- ...6-Use-correct-pkg-config-static-flag.patch | 2 +- ...7-Fix-macro-invoking-moc-rcc-and-uic.patch | 2 +- ...-errors-about-missing-feature-static.patch | 2 +- .../0029-Enable-and-fix-use-of-iconv.patch | 2 +- .../0030-Ignore-failing-pkg-config-test.patch | 2 +- ...from-messing-static-lib-dependencies.patch | 2 +- ...de-linker-flags-for-platform-plugins.patch | 2 +- ...ng-against-static-plugins-with-qmake.patch | 2 +- .../0034-Don-t-use-the-statx-syscall.patch | 2 +- qt5-base/mingw-w64/PKGBUILD | 70 +++++++++---------- 140 files changed, 296 insertions(+), 296 deletions(-) diff --git a/qt5-base/mingw-w64-angle/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch b/qt5-base/mingw-w64-angle/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch index 15ca6ec5..341ba7ca 100644 --- a/qt5-base/mingw-w64-angle/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch +++ b/qt5-base/mingw-w64-angle/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch @@ -1,4 +1,4 @@ -From af6803389ebba50abfe7ad299bbf99c9c8d1a8aa Mon Sep 17 00:00:00 2001 +From ae97e360a3e6402957a7e72d89adf71b94fc5730 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/34] Add profile for cross compilation with mingw-w64 @@ -12,7 +12,7 @@ Subject: [PATCH 01/34] Add profile for cross compilation with mingw-w64 diff --git a/mkspecs/mingw-w64-g++/qmake.conf b/mkspecs/mingw-w64-g++/qmake.conf new file mode 100644 -index 0000000000..0979611a53 +index 0000000000..c49336845b --- /dev/null +++ b/mkspecs/mingw-w64-g++/qmake.conf @@ -0,0 +1,126 @@ @@ -128,7 +128,7 @@ index 0000000000..0979611a53 +QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config + +QMAKE_LIBS = -+QMAKE_LIBS_CORE = -lz -lpcre2-16 -lversion -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 ++QMAKE_LIBS_CORE = -lz -lpcre2-16 -lversion -lnetapi32 -luserenv -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 +QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \ + $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \ + $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2) diff --git a/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index 91acfc8f..28de9e20 100644 --- a/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch +++ b/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch @@ -1,4 +1,4 @@ -From b8e324aa1716e50bdb66772bab2442e5b7c7afe8 Mon Sep 17 00:00:00 2001 +From 009da5ac781ce0657808571538d6611166d0b4d9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL diff --git a/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch index 94419690..000082da 100644 --- a/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch +++ b/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch @@ -1,4 +1,4 @@ -From 036909a4c082a17bee90c451842ebaee896e1893 Mon Sep 17 00:00:00 2001 +From 3f183dac766bbaa507ff90dc7286e0c693f2dab1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:41:38 +0200 Subject: [PATCH 03/34] Use external ANGLE library diff --git a/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 7619c55f..13521b6f 100644 --- a/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From d67f33383fde286f9c8e77bbd686a5c335473645 Mon Sep 17 00:00:00 2001 +From 2b0ac418d4007e8bbda1e2a4aacc508bd7a931a9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory diff --git a/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch index c685ba02..3d9c3cbc 100644 --- a/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 1c595c81473d93a87b339df137820624cafdc373 Mon Sep 17 00:00:00 2001 +From 4e1350167ef79add7df24dd7ce0c84851465529c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 05/34] Make sure *.pc files are installed correctly diff --git a/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch index d5221ecb..099c3d83 100644 --- a/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From 50b56803c962a656211021e50cd3e7df57722726 Mon Sep 17 00:00:00 2001 +From 53088193a95b50d2bd88bf8a017a152e180404c9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 06/34] Don't add resource files to LIBS parameter diff --git a/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch index a3e93271..5543c88f 100644 --- a/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From b02e8af19e3d94f9c39bbcaf94e91ab6dc6ca3f8 Mon Sep 17 00:00:00 2001 +From 08fec3af6cd36be649cbab317ded9e2ff4a5a4c4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 07/34] Prevent debug library names in pkg-config files diff --git a/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch index a5eef160..b51544fd 100644 --- a/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From e48d371cf5b0b98f91fca0fe38a5dd0479fcdfca Mon Sep 17 00:00:00 2001 +From 2e8a2b07a1b9ba68f0836fe9d1f6e88f55e362ac Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 08/34] Fix linking against shared/static libpng diff --git a/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch index 4b897989..58f37072 100644 --- a/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From 6785fbf99c08ef26967bcd064941b7bd692afb41 Mon Sep 17 00:00:00 2001 +From 25273fb108f1e3a239d200570053ca3630461289 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 09/34] Fix linking against static D-Bus diff --git a/qt5-base/mingw-w64-angle/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64-angle/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index ebdc33ce..4b1175f3 100644 --- a/qt5-base/mingw-w64-angle/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/qt5-base/mingw-w64-angle/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 94ba6e5a623a81ee02f6b7a46b7e82f4ea505f4f Mon Sep 17 00:00:00 2001 +From 54e71f3f648c24958924ee52b427e777b979b47b Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library diff --git a/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-freetype2.patch index a45279cf..4da1971a 100644 --- a/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From 6e4e751d6f39c6869cacb6d4148f5358f58bb54e Mon Sep 17 00:00:00 2001 +From 0d67a3dc557e4b4cc77e9c667dc427539a60c2af Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 11/34] Fix linking against static freetype2 diff --git a/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-harfbuzz.patch index 71e2a90b..75177fa4 100644 --- a/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From e05dcf0fb89c0ab64aba0f3a53986daa6a0bed76 Mon Sep 17 00:00:00 2001 +From bfb366d5d8746979429e89251993e1b4a4040e7d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 12/34] Fix linking against static harfbuzz diff --git a/qt5-base/mingw-w64-angle/0013-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-angle/0013-Fix-linking-against-static-pcre.patch index 6e3e18c9..38c77dd9 100644 --- a/qt5-base/mingw-w64-angle/0013-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64-angle/0013-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From 9e7f8734086cc4a2dd7f6e713076af64648802f7 Mon Sep 17 00:00:00 2001 +From b14796dc6a28a880c99f838e180c0398399d6418 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 13/34] Fix linking against static pcre diff --git a/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-MariaDB.patch index 6185fe92..366c143b 100644 --- a/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From 8d8e5c1df2e366ba3c595970813caf98768a140f Mon Sep 17 00:00:00 2001 +From 08683d4d220af8b00fd28d841d0027c2f830f3c9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 14/34] Fix linking against shared/static MariaDB diff --git a/qt5-base/mingw-w64-angle/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64-angle/0015-Fix-linking-against-shared-static-PostgreSQL.patch index abe072c4..99525fa1 100644 --- a/qt5-base/mingw-w64-angle/0015-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64-angle/0015-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From fd736054ec03ad328b1e8c4195184f286655040e Mon Sep 17 00:00:00 2001 +From 7f17b25b356d542355b1457b3eea211219768694 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL diff --git a/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch index 26b8cf2f..2b57ab9b 100644 --- a/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 15f3d49456695caeb91f1e861730883aea04ca5f Mon Sep 17 00:00:00 2001 +From 69c2a140953c4958dd59892bde8f4283e4ee2b35 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 16/34] Rename qtmain to qt5main diff --git a/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch index 184aff91..285b35e6 100644 --- a/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch +++ b/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch @@ -1,4 +1,4 @@ -From 366c764b927e568c75968ae92ec16caca54c0d31 Mon Sep 17 00:00:00 2001 +From 06c0f7930559066186bbb79876843f5cdf425a4a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:27:28 +0200 Subject: [PATCH 17/34] Build dynamic host libraries diff --git a/qt5-base/mingw-w64-angle/0018-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64-angle/0018-Enable-rpath-for-build-tools.patch index c8636ff4..9a086a70 100644 --- a/qt5-base/mingw-w64-angle/0018-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64-angle/0018-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From b6dfc4016e7f61c1eb178b051387b08219652484 Mon Sep 17 00:00:00 2001 +From 3e78a026458bf55398ec4c6cc31a66d2cca8b124 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 18/34] Enable rpath for build tools diff --git a/qt5-base/mingw-w64-angle/0019-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64-angle/0019-Use-system-zlib-for-build-tools.patch index e76fce8a..52eb3921 100644 --- a/qt5-base/mingw-w64-angle/0019-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64-angle/0019-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 012d6961a9ffbaeabf1742243b23ee092b915af2 Mon Sep 17 00:00:00 2001 +From f88dd77ef98c92070659ff5d3371ae39779e630c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 19/34] Use system zlib for build tools diff --git a/qt5-base/mingw-w64-angle/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch b/qt5-base/mingw-w64-angle/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch index cf2e1d82..de3ebbdf 100644 --- a/qt5-base/mingw-w64-angle/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch +++ b/qt5-base/mingw-w64-angle/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch @@ -1,4 +1,4 @@ -From 81a6a9a34e71a08fd5a8b87f44c71803d7f07797 Mon Sep 17 00:00:00 2001 +From 440c61802ae80ceda51ed8d405ab922dddaa2d45 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:20:25 +0200 Subject: [PATCH 20/34] Disable determing default include and lib dirs at qmake diff --git a/qt5-base/mingw-w64-angle/0021-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64-angle/0021-Use-.dll.a-as-import-lib-extension.patch index 4f2ee4c6..c5c35927 100644 --- a/qt5-base/mingw-w64-angle/0021-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64-angle/0021-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From 834b94ccb1897cd5325557fa6051ef2cb4bb70a0 Mon Sep 17 00:00:00 2001 +From 4798537f28bb206f5dc4469d67dfe18f05614506 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 21/34] Use *.dll.a as import lib extension diff --git a/qt5-base/mingw-w64-angle/0022-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64-angle/0022-Merge-shared-and-static-library-trees.patch index 44d0bcb3..e6708dca 100644 --- a/qt5-base/mingw-w64-angle/0022-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64-angle/0022-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 4502d0a9e9102067541a4307e80444a4fb44717c Mon Sep 17 00:00:00 2001 +From 190e710701a41341a07e3a00e5e35429d81053f1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 22/34] Merge shared and static library trees diff --git a/qt5-base/mingw-w64-angle/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64-angle/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index bf2ec7ba..0c629a18 100644 --- a/qt5-base/mingw-w64-angle/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/qt5-base/mingw-w64-angle/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From f73b460094294c7cd9f9d9cd481fbf1cef5a2a49 Mon Sep 17 00:00:00 2001 +From 787ef35985d51e5ce1f48fae320c8998b29654b7 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 23/34] Pull dependencies of static libraries in CMake modules @@ -13,7 +13,7 @@ the final application. 3 files changed, 128 insertions(+), 38 deletions(-) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 55c74aad66..85a0ae4307 100644 +index 55c74aad66..b401db5ac2 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -55,35 +55,52 @@ but not all the files it references. @@ -97,7 +97,7 @@ index 55c74aad66..85a0ae4307 100644 + macro(_populate_plugin_target_dependencies_from_prl_file PLUGIN_TARGET_NAME PRL_FILE_LOCATION CONFIGURATION LIB_DIRECTORY LIB_LOCATION) + file(STRINGS "${PRL_FILE_LOCATION}" prl_strings REGEX "QMAKE_PRL_LIBS_FOR_CMAKE") + string(REGEX REPLACE \"QMAKE_PRL_LIBS_FOR_CMAKE *= *([^\n]*)\" \"\\\\1\" static_depends ${prl_strings}) -+ string(REGEX REPLACE \"\\\\$\\\\$\\\\[QT_INSTALL_LIBS\\\\]\" \"${_qt5Svg_install_prefix}/lib\" static_depends \"${static_depends}\") ++ string(REGEX REPLACE \"\\\\$\\\\$\\\\[QT_INSTALL_LIBS\\\\]\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" static_depends \"${static_depends}\") + set_property(TARGET ${PLUGIN_TARGET_NAME} PROPERTY + INTERFACE_LINK_LIBRARIES ${static_depends} + ) diff --git a/qt5-base/mingw-w64-angle/0024-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-angle/0024-Allow-usage-of-static-version-with-CMake.patch index c4e60933..3abf04af 100644 --- a/qt5-base/mingw-w64-angle/0024-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64-angle/0024-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From 903ed5730e5a25ea6fda815fcd88cc36e3d8639e Mon Sep 17 00:00:00 2001 +From 169e2241bd5f8a47ff647a2ce1e8af43265fb32f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 24/34] Allow usage of static version with CMake @@ -244,7 +244,7 @@ index 15fc070008..13bd362092 100644 # We are generating cmake files. Most developers of Qt are not aware of cmake, # so we require automatic tests to be available. The only module which should diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 85a0ae4307..42053ac0c0 100644 +index b401db5ac2..e6dd749c9e 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -9,6 +9,33 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) diff --git a/qt5-base/mingw-w64-angle/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64-angle/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index 02432029..263cb9a9 100644 --- a/qt5-base/mingw-w64-angle/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/qt5-base/mingw-w64-angle/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From b3bcf57cfbd152eafa82b9d80183fde0f2bf1f5c Mon Sep 17 00:00:00 2001 +From a256ac2a8e64c8cc404f5c3842e9a1abc76dd840 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 25/34] Adjust linker flags for static build with diff --git a/qt5-base/mingw-w64-angle/0026-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-angle/0026-Use-correct-pkg-config-static-flag.patch index 36498bf7..416943aa 100644 --- a/qt5-base/mingw-w64-angle/0026-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64-angle/0026-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From 1e31f372966581f19bcbd9a39b29cf3dedfe9c5a Mon Sep 17 00:00:00 2001 +From 1a11849c5f8ba28bb0e492df01228d57f63974ff Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 26/34] Use correct pkg-config --static flag diff --git a/qt5-base/mingw-w64-angle/0027-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-angle/0027-Fix-macro-invoking-moc-rcc-and-uic.patch index 3b75e887..11f25e84 100644 --- a/qt5-base/mingw-w64-angle/0027-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/qt5-base/mingw-w64-angle/0027-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From 0f6a4852f4bf5d43aa856f2af475f5f526b76daf Mon Sep 17 00:00:00 2001 +From d585e369c2274af65dc82c53f2ec6ad16c9a124b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 27/34] Fix macro invoking moc, rcc and uic diff --git a/qt5-base/mingw-w64-angle/0028-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-angle/0028-Ignore-errors-about-missing-feature-static.patch index 803dfe38..82a4e031 100644 --- a/qt5-base/mingw-w64-angle/0028-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64-angle/0028-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From 80964e61f1442f4566b6cb1d4a08231ea5942133 Mon Sep 17 00:00:00 2001 +From b605147e73b0b0c36bfd21b94920310b7279898f Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 28/34] Ignore errors about missing feature static diff --git a/qt5-base/mingw-w64-angle/0029-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-angle/0029-Enable-and-fix-use-of-iconv.patch index 128a1cf3..b7847ff8 100644 --- a/qt5-base/mingw-w64-angle/0029-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64-angle/0029-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 3a5569599bd8c5267e41c57917b19e16bba1169c Mon Sep 17 00:00:00 2001 +From 8be581dab1e7b0ebba897ccd5d3c71a7e4c9b74b Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 29/34] Enable and fix use of iconv diff --git a/qt5-base/mingw-w64-angle/0030-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-angle/0030-Ignore-failing-pkg-config-test.patch index 4c8cc8f8..7919bf47 100644 --- a/qt5-base/mingw-w64-angle/0030-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64-angle/0030-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From e9f964d079c6dea6404f01d0d8f1acfa5287ccdc Mon Sep 17 00:00:00 2001 +From 69ce42a2cc5631a99b78c0468d0a4e8f2cb856f4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 30/34] Ignore failing pkg-config test diff --git a/qt5-base/mingw-w64-angle/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-angle/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch index e4349439..99e60333 100644 --- a/qt5-base/mingw-w64-angle/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64-angle/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From d35384a8d6191d68f8cd2b60a2295f5372d67fa4 Mon Sep 17 00:00:00 2001 +From 51684a7002b3da41428107ca80b8c360ce00c0b8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 31/34] Prevent qmake from messing static lib dependencies diff --git a/qt5-base/mingw-w64-angle/0032-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64-angle/0032-Hardcode-linker-flags-for-platform-plugins.patch index 3d82dfff..55c83356 100644 --- a/qt5-base/mingw-w64-angle/0032-Hardcode-linker-flags-for-platform-plugins.patch +++ b/qt5-base/mingw-w64-angle/0032-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From aa947be7429528caf04ad7db6f077fe695bcfe82 Mon Sep 17 00:00:00 2001 +From dd8af708953214aee7128b6448a98fdbea123cd1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 32/34] Hardcode linker flags for platform plugins diff --git a/qt5-base/mingw-w64-angle/0033-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64-angle/0033-Fix-linking-against-static-plugins-with-qmake.patch index d849f3d8..f8bc05fe 100644 --- a/qt5-base/mingw-w64-angle/0033-Fix-linking-against-static-plugins-with-qmake.patch +++ b/qt5-base/mingw-w64-angle/0033-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From 7db753e04de6a458fc10124b7e3b12ac5f4d1623 Mon Sep 17 00:00:00 2001 +From ba94765c0830e114e7b1cd269a04e8abac1ecd6a Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 33/34] Fix linking against static plugins with qmake diff --git a/qt5-base/mingw-w64-angle/0034-Don-t-use-the-statx-syscall.patch b/qt5-base/mingw-w64-angle/0034-Don-t-use-the-statx-syscall.patch index 56e0ca93..bbb8ef81 100644 --- a/qt5-base/mingw-w64-angle/0034-Don-t-use-the-statx-syscall.patch +++ b/qt5-base/mingw-w64-angle/0034-Don-t-use-the-statx-syscall.patch @@ -1,4 +1,4 @@ -From e8cbf42a882706cce93f46142748d252cb492e1c Mon Sep 17 00:00:00 2001 +From 06c69dbc4aa16012b8ab05b586fb2e261405a037 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 9 Dec 2017 00:36:56 +0100 Subject: [PATCH 34/34] Don't use the statx syscall diff --git a/qt5-base/mingw-w64-angle/PKGBUILD b/qt5-base/mingw-w64-angle/PKGBUILD index c67806c0..22ca2188 100644 --- a/qt5-base/mingw-w64-angle/PKGBUILD +++ b/qt5-base/mingw-w64-angle/PKGBUILD @@ -85,7 +85,7 @@ isNoOpenGL() { pkgname=mingw-w64-qt5-base-angle pkgver=5.10.0 -pkgrel=1 +pkgrel=2 pkgdesc='A cross-platform application and UI framework (mingw-w64)' # The static variant doesn't contain any executables which need to be executed on the build machine isStatic && arch=('any') || arch=('i686' 'x86_64') @@ -135,40 +135,40 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0033-Fix-linking-against-static-plugins-with-qmake.patch' '0034-Don-t-use-the-statx-syscall.patch') sha256sums=('fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762' - 'd2784f40a1f8f3f7041c94b89702404a21ef2fd1d6c63bbffe14e26321265745' - 'c695a25e6dc0ddd8b1dd07adba6eee518294ffb69b689f373dde861f935c876b' - '4a7a855fe8abffe0aa3da450981439a1c26f7f65fe456149f627bccd603ad5b7' - '46a42a20a4bed03f9f0b7abd55904be3e560dfd4e10e586d68479a5060ce06e2' - '70550f6cbe95c5a14ccb7e9ba5fab7cb595a0fc49b889c9ac735cca41148ab5b' - 'fa16872915ce6d24bc217ee7c5e42c3c61e29034f832e32f2971da85eb4f3d08' - '19b01e55dd3eb311c182d2ef682f15a2739556d5585d9e19de633e92dba9a788' - 'e13936a6f7d17a6c38c95e9cc9e19209a3d03970cf5157931f309edf45530132' - '978a2f5a53c0fe50780a12c09bbc81ee8efe60d1437425b08b3c5b4a4edb217c' - '8ffb5f68ebe09e99580d45c1279dc39ef811d0de7e4d363173af3be2cf3c9ee8' - '305f18d1b011033fbb12ca544d3af47cb45a1b6d324bf68b671cb007dc2a8a0a' - '53fb05efee9c024643cd607c623eda745a122cddc2880d6554b3168778942316' - '927188133dc2708345f7c831e1253b59338a9554b544c1d2cfdf02493b92573f' - '125f0b758bf2088589a31ced00146dc2cce28fa93bdd84684857ae60850c96b8' - '016c3a2980060365dd7e83a001f274b6a7f736af2519fa7c5263b0def10e2703' - '48930971f0ce225795bd0b6292c4e3ad27843ec0c95113b95be44274435b6623' - 'a6f8e6111b6960b86b347c3927251f41c8fa235aabf90e89965063326c7cedd3' - 'a57e452177fd1aa7f0d22b1a83f29dd18010dfef7b007157a7dc8d6399232471' - '07b1ab8b25a02e1ed369017178847081afe937817e71384dfb17ab56ff278a0e' - '2b426ab2aa774110c2b628c4987748520925e7ebfda2f524407cdc606315696b' - 'a78df9e2a5f3da89f944328a217ae5dd75fabd37f5b5c9ebc8eb75678f31910a' - '8470c121a04702b1a0ef4f52d310e69906bab0c066fcb6c7601bcb678655b959' - 'ac09e38e4f555e5bae1bc0f01b70a67624b15ecf5affc06d85eaccbc85f3c1da' - '0c1939eff41143bc78a6bf6e8b51515f4ba68337b9723674e6e7ab696167edae' - 'ed64b7a36a01d30bc9d35fed47186f9161e5ceba7dd92da7c60d288026fa8856' - '3f42240d83d09c62b8a7d9a98fe2d6a9d9fcf8ba6b5ff3d303a941411ef7d1a4' - 'd44bdc6363d1e5e1cbcdb5b61e0a788a38368ab3090746c165981bd0a5eb0854' - '15c0691f6fd058bf70be79b221ab4ace66cc574728b68d9f15bafe1877f46266' - '05aec6b0c2d9add0e4181246b52096d4cf2f4176f4c0e9f467d5244492844c28' - 'ed1237884607a368190cb1ac4de2a12f00e54ecfcea901c7f1980ac37b94b57b' - '4a83eb1549be9477bc002a6b939e24a6f1b6fd14bfcc804235771d484762aa3e' - 'a100076b67008b64f73fd4fd4b131e1774b84b24b61198cabecdb5916d634887' - 'fe9ecf6e82b64b3a955f688d51c87ca82a4aa4ad59e419c7c284ce18b72e223c' - 'cbc0e2570ca5b52681d99ab15e7a7a79a286e498203d34c2d67493a78dd6b84d') + 'd10d56c65b632d881f79eda8c0caeffb1a53a4829ac886e80038cdc8929b1669' + '524883f46945ab2ce023e9de1144a7eebafdba936ea8c61e035006deff48fa5b' + 'cea0e73f831348e50285ab87149803d4dfb5650c4c96037844b98b3dc1c65159' + 'e333d61821a42710a00f9bd4d003d376f513ba6ca41a3739bfcd414c99b8e7dd' + 'e8b0bdcc39458105dd0e5c569c98ef53a84d2fe4e9e200e1b1c1b7b749e8e758' + 'e14860d560886b600373f639e89e9a60d77de9a536587633ea71e1fd907df3fb' + '447c27f0e87d5cdcbe9883f6d3aac0daefef28e09bd8afe8d07a650375ca8362' + 'e2f98037b93aa2970014c1d185912b49d4ab5506c24fa2410cb0e93d4e0a1f54' + '507537c73995715fa1a4e9e0f1ecfdf4afe409b5397366f551d06c6c406e088b' + '760093a185cd77bacec0d85c0c077370d6044b89a4d6f03944524d1aa2b82dfa' + '6052446a675be39dd663ef69ee5339ab67c2805b29ff4ef19bacf0f677a95182' + '60a6e236334d3950b40dbb0501cc733bc7a672b0c7fbf6e4792c0058bf20a859' + 'f58391f9407742a1543702fe0234a134883046ff99584c1cfa468893264bf5e9' + '9e406b466c2b447da5d44ea37cafe2b3c3caebfa54936eb71e816e60b186c47d' + '870ed7adb78d4f5b396fa9106777aaeefc2a8af406e1aa1655dfe3405974a1ce' + 'b51a2d707a09cce340ca10e4a93c18a0872881889a97dc3ea2aafe73d80dfd46' + 'ed206eef70d57cd1aeb31c9e65ceb46fe926bee462c9b6507d22b6daf9b03aff' + '00ea2ef2f2d8868351d857716e60e8e78ed90a294132cd1fbd8039aae50e7344' + 'f80e166e5a358cc3d0dca5f0a543b30271a1c536ff9ef73105f1e432b10d3afe' + '12c4ce015c5641376dea7a232f0fc9f8feb10ddee06c65f87e0f00ea2574ab15' + 'a3a6a12f94ed4a79b3910623e3a8a11859d7a6a72b4634ff8bd6d1269af615bd' + '6f1f96ec05f049a107f4b5b3fba05e088d47f1c4751fd21851ed48d5f1b5a274' + '2926f77fbab219cb2fe9bb630274b06594a72c9047d374209d96591e481015fd' + 'b36b7fce8e101444d17026002f8052be41de887ccd263188a64faeae31cc1c89' + '7bcfe130f6dc47c9fb4d3db6fe9634596ab2c01e421bfc9a0967463487b4b7f0' + '83f6a3fc2489da2686f035563542478fd01e2849e18ea02478d7850bd68f16be' + '7254445b4cea5e1d7efc25b923e755ab3b19856ee8bce2ebe2900b9bf4717841' + 'd03a3cc5dab9d9a843e73f241fee2778deffe9ee727e493a0052e62b2266923e' + 'd6dc468d67e782b64fbe9ba64dfc3fdf423c5d06205f4a87a0561bb53b35d7fc' + '43c367e31c1560178a1471a80a9e90391c7c93f8dfece8c4c9dfafea4a3ce180' + '2e89aca862a62cbf535faf4b01c00dfed40ad6ccb52ac998913e9e96801491a3' + '8b1402c8ac78c0870af19ccdd8b2603e164cf2ef4fd4446fd03ea40b68a35643' + '81d279b24a508656597fec9bf94bade25cf0d600607febcd35f7fd27d09970eb' + '95a8cd9553ef18e200a85ff6dc5c718525d71be92d4fa49b8cdceae73696e037') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-base/mingw-w64-dynamic/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch b/qt5-base/mingw-w64-dynamic/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch index 15ca6ec5..341ba7ca 100644 --- a/qt5-base/mingw-w64-dynamic/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch +++ b/qt5-base/mingw-w64-dynamic/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch @@ -1,4 +1,4 @@ -From af6803389ebba50abfe7ad299bbf99c9c8d1a8aa Mon Sep 17 00:00:00 2001 +From ae97e360a3e6402957a7e72d89adf71b94fc5730 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/34] Add profile for cross compilation with mingw-w64 @@ -12,7 +12,7 @@ Subject: [PATCH 01/34] Add profile for cross compilation with mingw-w64 diff --git a/mkspecs/mingw-w64-g++/qmake.conf b/mkspecs/mingw-w64-g++/qmake.conf new file mode 100644 -index 0000000000..0979611a53 +index 0000000000..c49336845b --- /dev/null +++ b/mkspecs/mingw-w64-g++/qmake.conf @@ -0,0 +1,126 @@ @@ -128,7 +128,7 @@ index 0000000000..0979611a53 +QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config + +QMAKE_LIBS = -+QMAKE_LIBS_CORE = -lz -lpcre2-16 -lversion -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 ++QMAKE_LIBS_CORE = -lz -lpcre2-16 -lversion -lnetapi32 -luserenv -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 +QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \ + $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \ + $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2) diff --git a/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index 91acfc8f..28de9e20 100644 --- a/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch +++ b/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch @@ -1,4 +1,4 @@ -From b8e324aa1716e50bdb66772bab2442e5b7c7afe8 Mon Sep 17 00:00:00 2001 +From 009da5ac781ce0657808571538d6611166d0b4d9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL diff --git a/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch index 94419690..000082da 100644 --- a/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch +++ b/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch @@ -1,4 +1,4 @@ -From 036909a4c082a17bee90c451842ebaee896e1893 Mon Sep 17 00:00:00 2001 +From 3f183dac766bbaa507ff90dc7286e0c693f2dab1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:41:38 +0200 Subject: [PATCH 03/34] Use external ANGLE library diff --git a/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 7619c55f..13521b6f 100644 --- a/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From d67f33383fde286f9c8e77bbd686a5c335473645 Mon Sep 17 00:00:00 2001 +From 2b0ac418d4007e8bbda1e2a4aacc508bd7a931a9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory diff --git a/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch index c685ba02..3d9c3cbc 100644 --- a/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 1c595c81473d93a87b339df137820624cafdc373 Mon Sep 17 00:00:00 2001 +From 4e1350167ef79add7df24dd7ce0c84851465529c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 05/34] Make sure *.pc files are installed correctly diff --git a/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch index d5221ecb..099c3d83 100644 --- a/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From 50b56803c962a656211021e50cd3e7df57722726 Mon Sep 17 00:00:00 2001 +From 53088193a95b50d2bd88bf8a017a152e180404c9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 06/34] Don't add resource files to LIBS parameter diff --git a/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch index a3e93271..5543c88f 100644 --- a/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From b02e8af19e3d94f9c39bbcaf94e91ab6dc6ca3f8 Mon Sep 17 00:00:00 2001 +From 08fec3af6cd36be649cbab317ded9e2ff4a5a4c4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 07/34] Prevent debug library names in pkg-config files diff --git a/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch index a5eef160..b51544fd 100644 --- a/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From e48d371cf5b0b98f91fca0fe38a5dd0479fcdfca Mon Sep 17 00:00:00 2001 +From 2e8a2b07a1b9ba68f0836fe9d1f6e88f55e362ac Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 08/34] Fix linking against shared/static libpng diff --git a/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch index 4b897989..58f37072 100644 --- a/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From 6785fbf99c08ef26967bcd064941b7bd692afb41 Mon Sep 17 00:00:00 2001 +From 25273fb108f1e3a239d200570053ca3630461289 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 09/34] Fix linking against static D-Bus diff --git a/qt5-base/mingw-w64-dynamic/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64-dynamic/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index ebdc33ce..4b1175f3 100644 --- a/qt5-base/mingw-w64-dynamic/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/qt5-base/mingw-w64-dynamic/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 94ba6e5a623a81ee02f6b7a46b7e82f4ea505f4f Mon Sep 17 00:00:00 2001 +From 54e71f3f648c24958924ee52b427e777b979b47b Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library diff --git a/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-freetype2.patch index a45279cf..4da1971a 100644 --- a/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From 6e4e751d6f39c6869cacb6d4148f5358f58bb54e Mon Sep 17 00:00:00 2001 +From 0d67a3dc557e4b4cc77e9c667dc427539a60c2af Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 11/34] Fix linking against static freetype2 diff --git a/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-harfbuzz.patch index 71e2a90b..75177fa4 100644 --- a/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From e05dcf0fb89c0ab64aba0f3a53986daa6a0bed76 Mon Sep 17 00:00:00 2001 +From bfb366d5d8746979429e89251993e1b4a4040e7d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 12/34] Fix linking against static harfbuzz diff --git a/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-static-pcre.patch index 6e3e18c9..38c77dd9 100644 --- a/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From 9e7f8734086cc4a2dd7f6e713076af64648802f7 Mon Sep 17 00:00:00 2001 +From b14796dc6a28a880c99f838e180c0398399d6418 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 13/34] Fix linking against static pcre diff --git a/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-MariaDB.patch index 6185fe92..366c143b 100644 --- a/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From 8d8e5c1df2e366ba3c595970813caf98768a140f Mon Sep 17 00:00:00 2001 +From 08683d4d220af8b00fd28d841d0027c2f830f3c9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 14/34] Fix linking against shared/static MariaDB diff --git a/qt5-base/mingw-w64-dynamic/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64-dynamic/0015-Fix-linking-against-shared-static-PostgreSQL.patch index abe072c4..99525fa1 100644 --- a/qt5-base/mingw-w64-dynamic/0015-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64-dynamic/0015-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From fd736054ec03ad328b1e8c4195184f286655040e Mon Sep 17 00:00:00 2001 +From 7f17b25b356d542355b1457b3eea211219768694 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL diff --git a/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch index 26b8cf2f..2b57ab9b 100644 --- a/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 15f3d49456695caeb91f1e861730883aea04ca5f Mon Sep 17 00:00:00 2001 +From 69c2a140953c4958dd59892bde8f4283e4ee2b35 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 16/34] Rename qtmain to qt5main diff --git a/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch index 184aff91..285b35e6 100644 --- a/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch +++ b/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch @@ -1,4 +1,4 @@ -From 366c764b927e568c75968ae92ec16caca54c0d31 Mon Sep 17 00:00:00 2001 +From 06c0f7930559066186bbb79876843f5cdf425a4a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:27:28 +0200 Subject: [PATCH 17/34] Build dynamic host libraries diff --git a/qt5-base/mingw-w64-dynamic/0018-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64-dynamic/0018-Enable-rpath-for-build-tools.patch index c8636ff4..9a086a70 100644 --- a/qt5-base/mingw-w64-dynamic/0018-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64-dynamic/0018-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From b6dfc4016e7f61c1eb178b051387b08219652484 Mon Sep 17 00:00:00 2001 +From 3e78a026458bf55398ec4c6cc31a66d2cca8b124 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 18/34] Enable rpath for build tools diff --git a/qt5-base/mingw-w64-dynamic/0019-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64-dynamic/0019-Use-system-zlib-for-build-tools.patch index e76fce8a..52eb3921 100644 --- a/qt5-base/mingw-w64-dynamic/0019-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64-dynamic/0019-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 012d6961a9ffbaeabf1742243b23ee092b915af2 Mon Sep 17 00:00:00 2001 +From f88dd77ef98c92070659ff5d3371ae39779e630c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 19/34] Use system zlib for build tools diff --git a/qt5-base/mingw-w64-dynamic/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch b/qt5-base/mingw-w64-dynamic/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch index cf2e1d82..de3ebbdf 100644 --- a/qt5-base/mingw-w64-dynamic/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch +++ b/qt5-base/mingw-w64-dynamic/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch @@ -1,4 +1,4 @@ -From 81a6a9a34e71a08fd5a8b87f44c71803d7f07797 Mon Sep 17 00:00:00 2001 +From 440c61802ae80ceda51ed8d405ab922dddaa2d45 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:20:25 +0200 Subject: [PATCH 20/34] Disable determing default include and lib dirs at qmake diff --git a/qt5-base/mingw-w64-dynamic/0021-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64-dynamic/0021-Use-.dll.a-as-import-lib-extension.patch index 4f2ee4c6..c5c35927 100644 --- a/qt5-base/mingw-w64-dynamic/0021-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64-dynamic/0021-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From 834b94ccb1897cd5325557fa6051ef2cb4bb70a0 Mon Sep 17 00:00:00 2001 +From 4798537f28bb206f5dc4469d67dfe18f05614506 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 21/34] Use *.dll.a as import lib extension diff --git a/qt5-base/mingw-w64-dynamic/0022-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64-dynamic/0022-Merge-shared-and-static-library-trees.patch index 44d0bcb3..e6708dca 100644 --- a/qt5-base/mingw-w64-dynamic/0022-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64-dynamic/0022-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 4502d0a9e9102067541a4307e80444a4fb44717c Mon Sep 17 00:00:00 2001 +From 190e710701a41341a07e3a00e5e35429d81053f1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 22/34] Merge shared and static library trees diff --git a/qt5-base/mingw-w64-dynamic/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64-dynamic/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index bf2ec7ba..0c629a18 100644 --- a/qt5-base/mingw-w64-dynamic/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/qt5-base/mingw-w64-dynamic/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From f73b460094294c7cd9f9d9cd481fbf1cef5a2a49 Mon Sep 17 00:00:00 2001 +From 787ef35985d51e5ce1f48fae320c8998b29654b7 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 23/34] Pull dependencies of static libraries in CMake modules @@ -13,7 +13,7 @@ the final application. 3 files changed, 128 insertions(+), 38 deletions(-) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 55c74aad66..85a0ae4307 100644 +index 55c74aad66..b401db5ac2 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -55,35 +55,52 @@ but not all the files it references. @@ -97,7 +97,7 @@ index 55c74aad66..85a0ae4307 100644 + macro(_populate_plugin_target_dependencies_from_prl_file PLUGIN_TARGET_NAME PRL_FILE_LOCATION CONFIGURATION LIB_DIRECTORY LIB_LOCATION) + file(STRINGS "${PRL_FILE_LOCATION}" prl_strings REGEX "QMAKE_PRL_LIBS_FOR_CMAKE") + string(REGEX REPLACE \"QMAKE_PRL_LIBS_FOR_CMAKE *= *([^\n]*)\" \"\\\\1\" static_depends ${prl_strings}) -+ string(REGEX REPLACE \"\\\\$\\\\$\\\\[QT_INSTALL_LIBS\\\\]\" \"${_qt5Svg_install_prefix}/lib\" static_depends \"${static_depends}\") ++ string(REGEX REPLACE \"\\\\$\\\\$\\\\[QT_INSTALL_LIBS\\\\]\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" static_depends \"${static_depends}\") + set_property(TARGET ${PLUGIN_TARGET_NAME} PROPERTY + INTERFACE_LINK_LIBRARIES ${static_depends} + ) diff --git a/qt5-base/mingw-w64-dynamic/0024-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-dynamic/0024-Allow-usage-of-static-version-with-CMake.patch index c4e60933..3abf04af 100644 --- a/qt5-base/mingw-w64-dynamic/0024-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64-dynamic/0024-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From 903ed5730e5a25ea6fda815fcd88cc36e3d8639e Mon Sep 17 00:00:00 2001 +From 169e2241bd5f8a47ff647a2ce1e8af43265fb32f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 24/34] Allow usage of static version with CMake @@ -244,7 +244,7 @@ index 15fc070008..13bd362092 100644 # We are generating cmake files. Most developers of Qt are not aware of cmake, # so we require automatic tests to be available. The only module which should diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 85a0ae4307..42053ac0c0 100644 +index b401db5ac2..e6dd749c9e 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -9,6 +9,33 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) diff --git a/qt5-base/mingw-w64-dynamic/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64-dynamic/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index 02432029..263cb9a9 100644 --- a/qt5-base/mingw-w64-dynamic/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/qt5-base/mingw-w64-dynamic/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From b3bcf57cfbd152eafa82b9d80183fde0f2bf1f5c Mon Sep 17 00:00:00 2001 +From a256ac2a8e64c8cc404f5c3842e9a1abc76dd840 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 25/34] Adjust linker flags for static build with diff --git a/qt5-base/mingw-w64-dynamic/0026-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-dynamic/0026-Use-correct-pkg-config-static-flag.patch index 36498bf7..416943aa 100644 --- a/qt5-base/mingw-w64-dynamic/0026-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64-dynamic/0026-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From 1e31f372966581f19bcbd9a39b29cf3dedfe9c5a Mon Sep 17 00:00:00 2001 +From 1a11849c5f8ba28bb0e492df01228d57f63974ff Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 26/34] Use correct pkg-config --static flag diff --git a/qt5-base/mingw-w64-dynamic/0027-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-dynamic/0027-Fix-macro-invoking-moc-rcc-and-uic.patch index 3b75e887..11f25e84 100644 --- a/qt5-base/mingw-w64-dynamic/0027-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/qt5-base/mingw-w64-dynamic/0027-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From 0f6a4852f4bf5d43aa856f2af475f5f526b76daf Mon Sep 17 00:00:00 2001 +From d585e369c2274af65dc82c53f2ec6ad16c9a124b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 27/34] Fix macro invoking moc, rcc and uic diff --git a/qt5-base/mingw-w64-dynamic/0028-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-dynamic/0028-Ignore-errors-about-missing-feature-static.patch index 803dfe38..82a4e031 100644 --- a/qt5-base/mingw-w64-dynamic/0028-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64-dynamic/0028-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From 80964e61f1442f4566b6cb1d4a08231ea5942133 Mon Sep 17 00:00:00 2001 +From b605147e73b0b0c36bfd21b94920310b7279898f Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 28/34] Ignore errors about missing feature static diff --git a/qt5-base/mingw-w64-dynamic/0029-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-dynamic/0029-Enable-and-fix-use-of-iconv.patch index 128a1cf3..b7847ff8 100644 --- a/qt5-base/mingw-w64-dynamic/0029-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64-dynamic/0029-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 3a5569599bd8c5267e41c57917b19e16bba1169c Mon Sep 17 00:00:00 2001 +From 8be581dab1e7b0ebba897ccd5d3c71a7e4c9b74b Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 29/34] Enable and fix use of iconv diff --git a/qt5-base/mingw-w64-dynamic/0030-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-dynamic/0030-Ignore-failing-pkg-config-test.patch index 4c8cc8f8..7919bf47 100644 --- a/qt5-base/mingw-w64-dynamic/0030-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64-dynamic/0030-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From e9f964d079c6dea6404f01d0d8f1acfa5287ccdc Mon Sep 17 00:00:00 2001 +From 69ce42a2cc5631a99b78c0468d0a4e8f2cb856f4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 30/34] Ignore failing pkg-config test diff --git a/qt5-base/mingw-w64-dynamic/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-dynamic/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch index e4349439..99e60333 100644 --- a/qt5-base/mingw-w64-dynamic/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64-dynamic/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From d35384a8d6191d68f8cd2b60a2295f5372d67fa4 Mon Sep 17 00:00:00 2001 +From 51684a7002b3da41428107ca80b8c360ce00c0b8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 31/34] Prevent qmake from messing static lib dependencies diff --git a/qt5-base/mingw-w64-dynamic/0032-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64-dynamic/0032-Hardcode-linker-flags-for-platform-plugins.patch index 3d82dfff..55c83356 100644 --- a/qt5-base/mingw-w64-dynamic/0032-Hardcode-linker-flags-for-platform-plugins.patch +++ b/qt5-base/mingw-w64-dynamic/0032-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From aa947be7429528caf04ad7db6f077fe695bcfe82 Mon Sep 17 00:00:00 2001 +From dd8af708953214aee7128b6448a98fdbea123cd1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 32/34] Hardcode linker flags for platform plugins diff --git a/qt5-base/mingw-w64-dynamic/0033-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64-dynamic/0033-Fix-linking-against-static-plugins-with-qmake.patch index d849f3d8..f8bc05fe 100644 --- a/qt5-base/mingw-w64-dynamic/0033-Fix-linking-against-static-plugins-with-qmake.patch +++ b/qt5-base/mingw-w64-dynamic/0033-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From 7db753e04de6a458fc10124b7e3b12ac5f4d1623 Mon Sep 17 00:00:00 2001 +From ba94765c0830e114e7b1cd269a04e8abac1ecd6a Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 33/34] Fix linking against static plugins with qmake diff --git a/qt5-base/mingw-w64-dynamic/0034-Don-t-use-the-statx-syscall.patch b/qt5-base/mingw-w64-dynamic/0034-Don-t-use-the-statx-syscall.patch index 56e0ca93..bbb8ef81 100644 --- a/qt5-base/mingw-w64-dynamic/0034-Don-t-use-the-statx-syscall.patch +++ b/qt5-base/mingw-w64-dynamic/0034-Don-t-use-the-statx-syscall.patch @@ -1,4 +1,4 @@ -From e8cbf42a882706cce93f46142748d252cb492e1c Mon Sep 17 00:00:00 2001 +From 06c69dbc4aa16012b8ab05b586fb2e261405a037 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 9 Dec 2017 00:36:56 +0100 Subject: [PATCH 34/34] Don't use the statx syscall diff --git a/qt5-base/mingw-w64-dynamic/PKGBUILD b/qt5-base/mingw-w64-dynamic/PKGBUILD index b3bb49ed..98d2e638 100644 --- a/qt5-base/mingw-w64-dynamic/PKGBUILD +++ b/qt5-base/mingw-w64-dynamic/PKGBUILD @@ -85,7 +85,7 @@ isNoOpenGL() { pkgname=mingw-w64-qt5-base-dynamic pkgver=5.10.0 -pkgrel=1 +pkgrel=2 pkgdesc='A cross-platform application and UI framework (mingw-w64)' # The static variant doesn't contain any executables which need to be executed on the build machine isStatic && arch=('any') || arch=('i686' 'x86_64') @@ -135,40 +135,40 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0033-Fix-linking-against-static-plugins-with-qmake.patch' '0034-Don-t-use-the-statx-syscall.patch') sha256sums=('fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762' - 'd2784f40a1f8f3f7041c94b89702404a21ef2fd1d6c63bbffe14e26321265745' - 'c695a25e6dc0ddd8b1dd07adba6eee518294ffb69b689f373dde861f935c876b' - '4a7a855fe8abffe0aa3da450981439a1c26f7f65fe456149f627bccd603ad5b7' - '46a42a20a4bed03f9f0b7abd55904be3e560dfd4e10e586d68479a5060ce06e2' - '70550f6cbe95c5a14ccb7e9ba5fab7cb595a0fc49b889c9ac735cca41148ab5b' - 'fa16872915ce6d24bc217ee7c5e42c3c61e29034f832e32f2971da85eb4f3d08' - '19b01e55dd3eb311c182d2ef682f15a2739556d5585d9e19de633e92dba9a788' - 'e13936a6f7d17a6c38c95e9cc9e19209a3d03970cf5157931f309edf45530132' - '978a2f5a53c0fe50780a12c09bbc81ee8efe60d1437425b08b3c5b4a4edb217c' - '8ffb5f68ebe09e99580d45c1279dc39ef811d0de7e4d363173af3be2cf3c9ee8' - '305f18d1b011033fbb12ca544d3af47cb45a1b6d324bf68b671cb007dc2a8a0a' - '53fb05efee9c024643cd607c623eda745a122cddc2880d6554b3168778942316' - '927188133dc2708345f7c831e1253b59338a9554b544c1d2cfdf02493b92573f' - '125f0b758bf2088589a31ced00146dc2cce28fa93bdd84684857ae60850c96b8' - '016c3a2980060365dd7e83a001f274b6a7f736af2519fa7c5263b0def10e2703' - '48930971f0ce225795bd0b6292c4e3ad27843ec0c95113b95be44274435b6623' - 'a6f8e6111b6960b86b347c3927251f41c8fa235aabf90e89965063326c7cedd3' - 'a57e452177fd1aa7f0d22b1a83f29dd18010dfef7b007157a7dc8d6399232471' - '07b1ab8b25a02e1ed369017178847081afe937817e71384dfb17ab56ff278a0e' - '2b426ab2aa774110c2b628c4987748520925e7ebfda2f524407cdc606315696b' - 'a78df9e2a5f3da89f944328a217ae5dd75fabd37f5b5c9ebc8eb75678f31910a' - '8470c121a04702b1a0ef4f52d310e69906bab0c066fcb6c7601bcb678655b959' - 'ac09e38e4f555e5bae1bc0f01b70a67624b15ecf5affc06d85eaccbc85f3c1da' - '0c1939eff41143bc78a6bf6e8b51515f4ba68337b9723674e6e7ab696167edae' - 'ed64b7a36a01d30bc9d35fed47186f9161e5ceba7dd92da7c60d288026fa8856' - '3f42240d83d09c62b8a7d9a98fe2d6a9d9fcf8ba6b5ff3d303a941411ef7d1a4' - 'd44bdc6363d1e5e1cbcdb5b61e0a788a38368ab3090746c165981bd0a5eb0854' - '15c0691f6fd058bf70be79b221ab4ace66cc574728b68d9f15bafe1877f46266' - '05aec6b0c2d9add0e4181246b52096d4cf2f4176f4c0e9f467d5244492844c28' - 'ed1237884607a368190cb1ac4de2a12f00e54ecfcea901c7f1980ac37b94b57b' - '4a83eb1549be9477bc002a6b939e24a6f1b6fd14bfcc804235771d484762aa3e' - 'a100076b67008b64f73fd4fd4b131e1774b84b24b61198cabecdb5916d634887' - 'fe9ecf6e82b64b3a955f688d51c87ca82a4aa4ad59e419c7c284ce18b72e223c' - 'cbc0e2570ca5b52681d99ab15e7a7a79a286e498203d34c2d67493a78dd6b84d') + 'd10d56c65b632d881f79eda8c0caeffb1a53a4829ac886e80038cdc8929b1669' + '524883f46945ab2ce023e9de1144a7eebafdba936ea8c61e035006deff48fa5b' + 'cea0e73f831348e50285ab87149803d4dfb5650c4c96037844b98b3dc1c65159' + 'e333d61821a42710a00f9bd4d003d376f513ba6ca41a3739bfcd414c99b8e7dd' + 'e8b0bdcc39458105dd0e5c569c98ef53a84d2fe4e9e200e1b1c1b7b749e8e758' + 'e14860d560886b600373f639e89e9a60d77de9a536587633ea71e1fd907df3fb' + '447c27f0e87d5cdcbe9883f6d3aac0daefef28e09bd8afe8d07a650375ca8362' + 'e2f98037b93aa2970014c1d185912b49d4ab5506c24fa2410cb0e93d4e0a1f54' + '507537c73995715fa1a4e9e0f1ecfdf4afe409b5397366f551d06c6c406e088b' + '760093a185cd77bacec0d85c0c077370d6044b89a4d6f03944524d1aa2b82dfa' + '6052446a675be39dd663ef69ee5339ab67c2805b29ff4ef19bacf0f677a95182' + '60a6e236334d3950b40dbb0501cc733bc7a672b0c7fbf6e4792c0058bf20a859' + 'f58391f9407742a1543702fe0234a134883046ff99584c1cfa468893264bf5e9' + '9e406b466c2b447da5d44ea37cafe2b3c3caebfa54936eb71e816e60b186c47d' + '870ed7adb78d4f5b396fa9106777aaeefc2a8af406e1aa1655dfe3405974a1ce' + 'b51a2d707a09cce340ca10e4a93c18a0872881889a97dc3ea2aafe73d80dfd46' + 'ed206eef70d57cd1aeb31c9e65ceb46fe926bee462c9b6507d22b6daf9b03aff' + '00ea2ef2f2d8868351d857716e60e8e78ed90a294132cd1fbd8039aae50e7344' + 'f80e166e5a358cc3d0dca5f0a543b30271a1c536ff9ef73105f1e432b10d3afe' + '12c4ce015c5641376dea7a232f0fc9f8feb10ddee06c65f87e0f00ea2574ab15' + 'a3a6a12f94ed4a79b3910623e3a8a11859d7a6a72b4634ff8bd6d1269af615bd' + '6f1f96ec05f049a107f4b5b3fba05e088d47f1c4751fd21851ed48d5f1b5a274' + '2926f77fbab219cb2fe9bb630274b06594a72c9047d374209d96591e481015fd' + 'b36b7fce8e101444d17026002f8052be41de887ccd263188a64faeae31cc1c89' + '7bcfe130f6dc47c9fb4d3db6fe9634596ab2c01e421bfc9a0967463487b4b7f0' + '83f6a3fc2489da2686f035563542478fd01e2849e18ea02478d7850bd68f16be' + '7254445b4cea5e1d7efc25b923e755ab3b19856ee8bce2ebe2900b9bf4717841' + 'd03a3cc5dab9d9a843e73f241fee2778deffe9ee727e493a0052e62b2266923e' + 'd6dc468d67e782b64fbe9ba64dfc3fdf423c5d06205f4a87a0561bb53b35d7fc' + '43c367e31c1560178a1471a80a9e90391c7c93f8dfece8c4c9dfafea4a3ce180' + '2e89aca862a62cbf535faf4b01c00dfed40ad6ccb52ac998913e9e96801491a3' + '8b1402c8ac78c0870af19ccdd8b2603e164cf2ef4fd4446fd03ea40b68a35643' + '81d279b24a508656597fec9bf94bade25cf0d600607febcd35f7fd27d09970eb' + '95a8cd9553ef18e200a85ff6dc5c718525d71be92d4fa49b8cdceae73696e037') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-base/mingw-w64-static/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch b/qt5-base/mingw-w64-static/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch index 15ca6ec5..341ba7ca 100644 --- a/qt5-base/mingw-w64-static/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch +++ b/qt5-base/mingw-w64-static/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch @@ -1,4 +1,4 @@ -From af6803389ebba50abfe7ad299bbf99c9c8d1a8aa Mon Sep 17 00:00:00 2001 +From ae97e360a3e6402957a7e72d89adf71b94fc5730 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/34] Add profile for cross compilation with mingw-w64 @@ -12,7 +12,7 @@ Subject: [PATCH 01/34] Add profile for cross compilation with mingw-w64 diff --git a/mkspecs/mingw-w64-g++/qmake.conf b/mkspecs/mingw-w64-g++/qmake.conf new file mode 100644 -index 0000000000..0979611a53 +index 0000000000..c49336845b --- /dev/null +++ b/mkspecs/mingw-w64-g++/qmake.conf @@ -0,0 +1,126 @@ @@ -128,7 +128,7 @@ index 0000000000..0979611a53 +QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config + +QMAKE_LIBS = -+QMAKE_LIBS_CORE = -lz -lpcre2-16 -lversion -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 ++QMAKE_LIBS_CORE = -lz -lpcre2-16 -lversion -lnetapi32 -luserenv -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 +QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \ + $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \ + $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2) diff --git a/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index 91acfc8f..28de9e20 100644 --- a/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch +++ b/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch @@ -1,4 +1,4 @@ -From b8e324aa1716e50bdb66772bab2442e5b7c7afe8 Mon Sep 17 00:00:00 2001 +From 009da5ac781ce0657808571538d6611166d0b4d9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL diff --git a/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch index 94419690..000082da 100644 --- a/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch +++ b/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch @@ -1,4 +1,4 @@ -From 036909a4c082a17bee90c451842ebaee896e1893 Mon Sep 17 00:00:00 2001 +From 3f183dac766bbaa507ff90dc7286e0c693f2dab1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:41:38 +0200 Subject: [PATCH 03/34] Use external ANGLE library diff --git a/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 7619c55f..13521b6f 100644 --- a/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From d67f33383fde286f9c8e77bbd686a5c335473645 Mon Sep 17 00:00:00 2001 +From 2b0ac418d4007e8bbda1e2a4aacc508bd7a931a9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory diff --git a/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch index c685ba02..3d9c3cbc 100644 --- a/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 1c595c81473d93a87b339df137820624cafdc373 Mon Sep 17 00:00:00 2001 +From 4e1350167ef79add7df24dd7ce0c84851465529c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 05/34] Make sure *.pc files are installed correctly diff --git a/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch index d5221ecb..099c3d83 100644 --- a/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From 50b56803c962a656211021e50cd3e7df57722726 Mon Sep 17 00:00:00 2001 +From 53088193a95b50d2bd88bf8a017a152e180404c9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 06/34] Don't add resource files to LIBS parameter diff --git a/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch index a3e93271..5543c88f 100644 --- a/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From b02e8af19e3d94f9c39bbcaf94e91ab6dc6ca3f8 Mon Sep 17 00:00:00 2001 +From 08fec3af6cd36be649cbab317ded9e2ff4a5a4c4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 07/34] Prevent debug library names in pkg-config files diff --git a/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch index a5eef160..b51544fd 100644 --- a/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From e48d371cf5b0b98f91fca0fe38a5dd0479fcdfca Mon Sep 17 00:00:00 2001 +From 2e8a2b07a1b9ba68f0836fe9d1f6e88f55e362ac Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 08/34] Fix linking against shared/static libpng diff --git a/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch index 4b897989..58f37072 100644 --- a/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From 6785fbf99c08ef26967bcd064941b7bd692afb41 Mon Sep 17 00:00:00 2001 +From 25273fb108f1e3a239d200570053ca3630461289 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 09/34] Fix linking against static D-Bus diff --git a/qt5-base/mingw-w64-static/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64-static/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index ebdc33ce..4b1175f3 100644 --- a/qt5-base/mingw-w64-static/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/qt5-base/mingw-w64-static/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 94ba6e5a623a81ee02f6b7a46b7e82f4ea505f4f Mon Sep 17 00:00:00 2001 +From 54e71f3f648c24958924ee52b427e777b979b47b Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library diff --git a/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch index a45279cf..4da1971a 100644 --- a/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From 6e4e751d6f39c6869cacb6d4148f5358f58bb54e Mon Sep 17 00:00:00 2001 +From 0d67a3dc557e4b4cc77e9c667dc427539a60c2af Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 11/34] Fix linking against static freetype2 diff --git a/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-harfbuzz.patch index 71e2a90b..75177fa4 100644 --- a/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From e05dcf0fb89c0ab64aba0f3a53986daa6a0bed76 Mon Sep 17 00:00:00 2001 +From bfb366d5d8746979429e89251993e1b4a4040e7d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 12/34] Fix linking against static harfbuzz diff --git a/qt5-base/mingw-w64-static/0013-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-static/0013-Fix-linking-against-static-pcre.patch index 6e3e18c9..38c77dd9 100644 --- a/qt5-base/mingw-w64-static/0013-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64-static/0013-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From 9e7f8734086cc4a2dd7f6e713076af64648802f7 Mon Sep 17 00:00:00 2001 +From b14796dc6a28a880c99f838e180c0398399d6418 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 13/34] Fix linking against static pcre diff --git a/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-MariaDB.patch index 6185fe92..366c143b 100644 --- a/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From 8d8e5c1df2e366ba3c595970813caf98768a140f Mon Sep 17 00:00:00 2001 +From 08683d4d220af8b00fd28d841d0027c2f830f3c9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 14/34] Fix linking against shared/static MariaDB diff --git a/qt5-base/mingw-w64-static/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64-static/0015-Fix-linking-against-shared-static-PostgreSQL.patch index abe072c4..99525fa1 100644 --- a/qt5-base/mingw-w64-static/0015-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64-static/0015-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From fd736054ec03ad328b1e8c4195184f286655040e Mon Sep 17 00:00:00 2001 +From 7f17b25b356d542355b1457b3eea211219768694 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL diff --git a/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch index 26b8cf2f..2b57ab9b 100644 --- a/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 15f3d49456695caeb91f1e861730883aea04ca5f Mon Sep 17 00:00:00 2001 +From 69c2a140953c4958dd59892bde8f4283e4ee2b35 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 16/34] Rename qtmain to qt5main diff --git a/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch index 184aff91..285b35e6 100644 --- a/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch +++ b/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch @@ -1,4 +1,4 @@ -From 366c764b927e568c75968ae92ec16caca54c0d31 Mon Sep 17 00:00:00 2001 +From 06c0f7930559066186bbb79876843f5cdf425a4a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:27:28 +0200 Subject: [PATCH 17/34] Build dynamic host libraries diff --git a/qt5-base/mingw-w64-static/0018-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64-static/0018-Enable-rpath-for-build-tools.patch index c8636ff4..9a086a70 100644 --- a/qt5-base/mingw-w64-static/0018-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64-static/0018-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From b6dfc4016e7f61c1eb178b051387b08219652484 Mon Sep 17 00:00:00 2001 +From 3e78a026458bf55398ec4c6cc31a66d2cca8b124 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 18/34] Enable rpath for build tools diff --git a/qt5-base/mingw-w64-static/0019-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64-static/0019-Use-system-zlib-for-build-tools.patch index e76fce8a..52eb3921 100644 --- a/qt5-base/mingw-w64-static/0019-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64-static/0019-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 012d6961a9ffbaeabf1742243b23ee092b915af2 Mon Sep 17 00:00:00 2001 +From f88dd77ef98c92070659ff5d3371ae39779e630c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 19/34] Use system zlib for build tools diff --git a/qt5-base/mingw-w64-static/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch b/qt5-base/mingw-w64-static/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch index cf2e1d82..de3ebbdf 100644 --- a/qt5-base/mingw-w64-static/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch +++ b/qt5-base/mingw-w64-static/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch @@ -1,4 +1,4 @@ -From 81a6a9a34e71a08fd5a8b87f44c71803d7f07797 Mon Sep 17 00:00:00 2001 +From 440c61802ae80ceda51ed8d405ab922dddaa2d45 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:20:25 +0200 Subject: [PATCH 20/34] Disable determing default include and lib dirs at qmake diff --git a/qt5-base/mingw-w64-static/0021-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64-static/0021-Use-.dll.a-as-import-lib-extension.patch index 4f2ee4c6..c5c35927 100644 --- a/qt5-base/mingw-w64-static/0021-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64-static/0021-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From 834b94ccb1897cd5325557fa6051ef2cb4bb70a0 Mon Sep 17 00:00:00 2001 +From 4798537f28bb206f5dc4469d67dfe18f05614506 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 21/34] Use *.dll.a as import lib extension diff --git a/qt5-base/mingw-w64-static/0022-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64-static/0022-Merge-shared-and-static-library-trees.patch index 44d0bcb3..e6708dca 100644 --- a/qt5-base/mingw-w64-static/0022-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64-static/0022-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 4502d0a9e9102067541a4307e80444a4fb44717c Mon Sep 17 00:00:00 2001 +From 190e710701a41341a07e3a00e5e35429d81053f1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 22/34] Merge shared and static library trees diff --git a/qt5-base/mingw-w64-static/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64-static/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index bf2ec7ba..0c629a18 100644 --- a/qt5-base/mingw-w64-static/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/qt5-base/mingw-w64-static/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From f73b460094294c7cd9f9d9cd481fbf1cef5a2a49 Mon Sep 17 00:00:00 2001 +From 787ef35985d51e5ce1f48fae320c8998b29654b7 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 23/34] Pull dependencies of static libraries in CMake modules @@ -13,7 +13,7 @@ the final application. 3 files changed, 128 insertions(+), 38 deletions(-) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 55c74aad66..85a0ae4307 100644 +index 55c74aad66..b401db5ac2 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -55,35 +55,52 @@ but not all the files it references. @@ -97,7 +97,7 @@ index 55c74aad66..85a0ae4307 100644 + macro(_populate_plugin_target_dependencies_from_prl_file PLUGIN_TARGET_NAME PRL_FILE_LOCATION CONFIGURATION LIB_DIRECTORY LIB_LOCATION) + file(STRINGS "${PRL_FILE_LOCATION}" prl_strings REGEX "QMAKE_PRL_LIBS_FOR_CMAKE") + string(REGEX REPLACE \"QMAKE_PRL_LIBS_FOR_CMAKE *= *([^\n]*)\" \"\\\\1\" static_depends ${prl_strings}) -+ string(REGEX REPLACE \"\\\\$\\\\$\\\\[QT_INSTALL_LIBS\\\\]\" \"${_qt5Svg_install_prefix}/lib\" static_depends \"${static_depends}\") ++ string(REGEX REPLACE \"\\\\$\\\\$\\\\[QT_INSTALL_LIBS\\\\]\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" static_depends \"${static_depends}\") + set_property(TARGET ${PLUGIN_TARGET_NAME} PROPERTY + INTERFACE_LINK_LIBRARIES ${static_depends} + ) diff --git a/qt5-base/mingw-w64-static/0024-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-static/0024-Allow-usage-of-static-version-with-CMake.patch index c4e60933..3abf04af 100644 --- a/qt5-base/mingw-w64-static/0024-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64-static/0024-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From 903ed5730e5a25ea6fda815fcd88cc36e3d8639e Mon Sep 17 00:00:00 2001 +From 169e2241bd5f8a47ff647a2ce1e8af43265fb32f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 24/34] Allow usage of static version with CMake @@ -244,7 +244,7 @@ index 15fc070008..13bd362092 100644 # We are generating cmake files. Most developers of Qt are not aware of cmake, # so we require automatic tests to be available. The only module which should diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 85a0ae4307..42053ac0c0 100644 +index b401db5ac2..e6dd749c9e 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -9,6 +9,33 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) diff --git a/qt5-base/mingw-w64-static/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64-static/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index 02432029..263cb9a9 100644 --- a/qt5-base/mingw-w64-static/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/qt5-base/mingw-w64-static/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From b3bcf57cfbd152eafa82b9d80183fde0f2bf1f5c Mon Sep 17 00:00:00 2001 +From a256ac2a8e64c8cc404f5c3842e9a1abc76dd840 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 25/34] Adjust linker flags for static build with diff --git a/qt5-base/mingw-w64-static/0026-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-static/0026-Use-correct-pkg-config-static-flag.patch index 36498bf7..416943aa 100644 --- a/qt5-base/mingw-w64-static/0026-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64-static/0026-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From 1e31f372966581f19bcbd9a39b29cf3dedfe9c5a Mon Sep 17 00:00:00 2001 +From 1a11849c5f8ba28bb0e492df01228d57f63974ff Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 26/34] Use correct pkg-config --static flag diff --git a/qt5-base/mingw-w64-static/0027-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-static/0027-Fix-macro-invoking-moc-rcc-and-uic.patch index 3b75e887..11f25e84 100644 --- a/qt5-base/mingw-w64-static/0027-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/qt5-base/mingw-w64-static/0027-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From 0f6a4852f4bf5d43aa856f2af475f5f526b76daf Mon Sep 17 00:00:00 2001 +From d585e369c2274af65dc82c53f2ec6ad16c9a124b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 27/34] Fix macro invoking moc, rcc and uic diff --git a/qt5-base/mingw-w64-static/0028-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-static/0028-Ignore-errors-about-missing-feature-static.patch index 803dfe38..82a4e031 100644 --- a/qt5-base/mingw-w64-static/0028-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64-static/0028-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From 80964e61f1442f4566b6cb1d4a08231ea5942133 Mon Sep 17 00:00:00 2001 +From b605147e73b0b0c36bfd21b94920310b7279898f Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 28/34] Ignore errors about missing feature static diff --git a/qt5-base/mingw-w64-static/0029-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-static/0029-Enable-and-fix-use-of-iconv.patch index 128a1cf3..b7847ff8 100644 --- a/qt5-base/mingw-w64-static/0029-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64-static/0029-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 3a5569599bd8c5267e41c57917b19e16bba1169c Mon Sep 17 00:00:00 2001 +From 8be581dab1e7b0ebba897ccd5d3c71a7e4c9b74b Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 29/34] Enable and fix use of iconv diff --git a/qt5-base/mingw-w64-static/0030-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-static/0030-Ignore-failing-pkg-config-test.patch index 4c8cc8f8..7919bf47 100644 --- a/qt5-base/mingw-w64-static/0030-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64-static/0030-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From e9f964d079c6dea6404f01d0d8f1acfa5287ccdc Mon Sep 17 00:00:00 2001 +From 69ce42a2cc5631a99b78c0468d0a4e8f2cb856f4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 30/34] Ignore failing pkg-config test diff --git a/qt5-base/mingw-w64-static/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-static/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch index e4349439..99e60333 100644 --- a/qt5-base/mingw-w64-static/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64-static/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From d35384a8d6191d68f8cd2b60a2295f5372d67fa4 Mon Sep 17 00:00:00 2001 +From 51684a7002b3da41428107ca80b8c360ce00c0b8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 31/34] Prevent qmake from messing static lib dependencies diff --git a/qt5-base/mingw-w64-static/0032-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64-static/0032-Hardcode-linker-flags-for-platform-plugins.patch index 3d82dfff..55c83356 100644 --- a/qt5-base/mingw-w64-static/0032-Hardcode-linker-flags-for-platform-plugins.patch +++ b/qt5-base/mingw-w64-static/0032-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From aa947be7429528caf04ad7db6f077fe695bcfe82 Mon Sep 17 00:00:00 2001 +From dd8af708953214aee7128b6448a98fdbea123cd1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 32/34] Hardcode linker flags for platform plugins diff --git a/qt5-base/mingw-w64-static/0033-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64-static/0033-Fix-linking-against-static-plugins-with-qmake.patch index d849f3d8..f8bc05fe 100644 --- a/qt5-base/mingw-w64-static/0033-Fix-linking-against-static-plugins-with-qmake.patch +++ b/qt5-base/mingw-w64-static/0033-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From 7db753e04de6a458fc10124b7e3b12ac5f4d1623 Mon Sep 17 00:00:00 2001 +From ba94765c0830e114e7b1cd269a04e8abac1ecd6a Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 33/34] Fix linking against static plugins with qmake diff --git a/qt5-base/mingw-w64-static/0034-Don-t-use-the-statx-syscall.patch b/qt5-base/mingw-w64-static/0034-Don-t-use-the-statx-syscall.patch index 56e0ca93..bbb8ef81 100644 --- a/qt5-base/mingw-w64-static/0034-Don-t-use-the-statx-syscall.patch +++ b/qt5-base/mingw-w64-static/0034-Don-t-use-the-statx-syscall.patch @@ -1,4 +1,4 @@ -From e8cbf42a882706cce93f46142748d252cb492e1c Mon Sep 17 00:00:00 2001 +From 06c69dbc4aa16012b8ab05b586fb2e261405a037 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 9 Dec 2017 00:36:56 +0100 Subject: [PATCH 34/34] Don't use the statx syscall diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD index ac6aa182..a927b5fb 100644 --- a/qt5-base/mingw-w64-static/PKGBUILD +++ b/qt5-base/mingw-w64-static/PKGBUILD @@ -85,7 +85,7 @@ isNoOpenGL() { pkgname=mingw-w64-qt5-base-static pkgver=5.10.0 -pkgrel=1 +pkgrel=2 pkgdesc='A cross-platform application and UI framework (mingw-w64)' # The static variant doesn't contain any executables which need to be executed on the build machine isStatic && arch=('any') || arch=('i686' 'x86_64') @@ -135,40 +135,40 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0033-Fix-linking-against-static-plugins-with-qmake.patch' '0034-Don-t-use-the-statx-syscall.patch') sha256sums=('fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762' - 'd2784f40a1f8f3f7041c94b89702404a21ef2fd1d6c63bbffe14e26321265745' - 'c695a25e6dc0ddd8b1dd07adba6eee518294ffb69b689f373dde861f935c876b' - '4a7a855fe8abffe0aa3da450981439a1c26f7f65fe456149f627bccd603ad5b7' - '46a42a20a4bed03f9f0b7abd55904be3e560dfd4e10e586d68479a5060ce06e2' - '70550f6cbe95c5a14ccb7e9ba5fab7cb595a0fc49b889c9ac735cca41148ab5b' - 'fa16872915ce6d24bc217ee7c5e42c3c61e29034f832e32f2971da85eb4f3d08' - '19b01e55dd3eb311c182d2ef682f15a2739556d5585d9e19de633e92dba9a788' - 'e13936a6f7d17a6c38c95e9cc9e19209a3d03970cf5157931f309edf45530132' - '978a2f5a53c0fe50780a12c09bbc81ee8efe60d1437425b08b3c5b4a4edb217c' - '8ffb5f68ebe09e99580d45c1279dc39ef811d0de7e4d363173af3be2cf3c9ee8' - '305f18d1b011033fbb12ca544d3af47cb45a1b6d324bf68b671cb007dc2a8a0a' - '53fb05efee9c024643cd607c623eda745a122cddc2880d6554b3168778942316' - '927188133dc2708345f7c831e1253b59338a9554b544c1d2cfdf02493b92573f' - '125f0b758bf2088589a31ced00146dc2cce28fa93bdd84684857ae60850c96b8' - '016c3a2980060365dd7e83a001f274b6a7f736af2519fa7c5263b0def10e2703' - '48930971f0ce225795bd0b6292c4e3ad27843ec0c95113b95be44274435b6623' - 'a6f8e6111b6960b86b347c3927251f41c8fa235aabf90e89965063326c7cedd3' - 'a57e452177fd1aa7f0d22b1a83f29dd18010dfef7b007157a7dc8d6399232471' - '07b1ab8b25a02e1ed369017178847081afe937817e71384dfb17ab56ff278a0e' - '2b426ab2aa774110c2b628c4987748520925e7ebfda2f524407cdc606315696b' - 'a78df9e2a5f3da89f944328a217ae5dd75fabd37f5b5c9ebc8eb75678f31910a' - '8470c121a04702b1a0ef4f52d310e69906bab0c066fcb6c7601bcb678655b959' - 'ac09e38e4f555e5bae1bc0f01b70a67624b15ecf5affc06d85eaccbc85f3c1da' - '0c1939eff41143bc78a6bf6e8b51515f4ba68337b9723674e6e7ab696167edae' - 'ed64b7a36a01d30bc9d35fed47186f9161e5ceba7dd92da7c60d288026fa8856' - '3f42240d83d09c62b8a7d9a98fe2d6a9d9fcf8ba6b5ff3d303a941411ef7d1a4' - 'd44bdc6363d1e5e1cbcdb5b61e0a788a38368ab3090746c165981bd0a5eb0854' - '15c0691f6fd058bf70be79b221ab4ace66cc574728b68d9f15bafe1877f46266' - '05aec6b0c2d9add0e4181246b52096d4cf2f4176f4c0e9f467d5244492844c28' - 'ed1237884607a368190cb1ac4de2a12f00e54ecfcea901c7f1980ac37b94b57b' - '4a83eb1549be9477bc002a6b939e24a6f1b6fd14bfcc804235771d484762aa3e' - 'a100076b67008b64f73fd4fd4b131e1774b84b24b61198cabecdb5916d634887' - 'fe9ecf6e82b64b3a955f688d51c87ca82a4aa4ad59e419c7c284ce18b72e223c' - 'cbc0e2570ca5b52681d99ab15e7a7a79a286e498203d34c2d67493a78dd6b84d') + 'd10d56c65b632d881f79eda8c0caeffb1a53a4829ac886e80038cdc8929b1669' + '524883f46945ab2ce023e9de1144a7eebafdba936ea8c61e035006deff48fa5b' + 'cea0e73f831348e50285ab87149803d4dfb5650c4c96037844b98b3dc1c65159' + 'e333d61821a42710a00f9bd4d003d376f513ba6ca41a3739bfcd414c99b8e7dd' + 'e8b0bdcc39458105dd0e5c569c98ef53a84d2fe4e9e200e1b1c1b7b749e8e758' + 'e14860d560886b600373f639e89e9a60d77de9a536587633ea71e1fd907df3fb' + '447c27f0e87d5cdcbe9883f6d3aac0daefef28e09bd8afe8d07a650375ca8362' + 'e2f98037b93aa2970014c1d185912b49d4ab5506c24fa2410cb0e93d4e0a1f54' + '507537c73995715fa1a4e9e0f1ecfdf4afe409b5397366f551d06c6c406e088b' + '760093a185cd77bacec0d85c0c077370d6044b89a4d6f03944524d1aa2b82dfa' + '6052446a675be39dd663ef69ee5339ab67c2805b29ff4ef19bacf0f677a95182' + '60a6e236334d3950b40dbb0501cc733bc7a672b0c7fbf6e4792c0058bf20a859' + 'f58391f9407742a1543702fe0234a134883046ff99584c1cfa468893264bf5e9' + '9e406b466c2b447da5d44ea37cafe2b3c3caebfa54936eb71e816e60b186c47d' + '870ed7adb78d4f5b396fa9106777aaeefc2a8af406e1aa1655dfe3405974a1ce' + 'b51a2d707a09cce340ca10e4a93c18a0872881889a97dc3ea2aafe73d80dfd46' + 'ed206eef70d57cd1aeb31c9e65ceb46fe926bee462c9b6507d22b6daf9b03aff' + '00ea2ef2f2d8868351d857716e60e8e78ed90a294132cd1fbd8039aae50e7344' + 'f80e166e5a358cc3d0dca5f0a543b30271a1c536ff9ef73105f1e432b10d3afe' + '12c4ce015c5641376dea7a232f0fc9f8feb10ddee06c65f87e0f00ea2574ab15' + 'a3a6a12f94ed4a79b3910623e3a8a11859d7a6a72b4634ff8bd6d1269af615bd' + '6f1f96ec05f049a107f4b5b3fba05e088d47f1c4751fd21851ed48d5f1b5a274' + '2926f77fbab219cb2fe9bb630274b06594a72c9047d374209d96591e481015fd' + 'b36b7fce8e101444d17026002f8052be41de887ccd263188a64faeae31cc1c89' + '7bcfe130f6dc47c9fb4d3db6fe9634596ab2c01e421bfc9a0967463487b4b7f0' + '83f6a3fc2489da2686f035563542478fd01e2849e18ea02478d7850bd68f16be' + '7254445b4cea5e1d7efc25b923e755ab3b19856ee8bce2ebe2900b9bf4717841' + 'd03a3cc5dab9d9a843e73f241fee2778deffe9ee727e493a0052e62b2266923e' + 'd6dc468d67e782b64fbe9ba64dfc3fdf423c5d06205f4a87a0561bb53b35d7fc' + '43c367e31c1560178a1471a80a9e90391c7c93f8dfece8c4c9dfafea4a3ce180' + '2e89aca862a62cbf535faf4b01c00dfed40ad6ccb52ac998913e9e96801491a3' + '8b1402c8ac78c0870af19ccdd8b2603e164cf2ef4fd4446fd03ea40b68a35643' + '81d279b24a508656597fec9bf94bade25cf0d600607febcd35f7fd27d09970eb' + '95a8cd9553ef18e200a85ff6dc5c718525d71be92d4fa49b8cdceae73696e037') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-base/mingw-w64/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch b/qt5-base/mingw-w64/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch index 15ca6ec5..341ba7ca 100644 --- a/qt5-base/mingw-w64/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch +++ b/qt5-base/mingw-w64/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch @@ -1,4 +1,4 @@ -From af6803389ebba50abfe7ad299bbf99c9c8d1a8aa Mon Sep 17 00:00:00 2001 +From ae97e360a3e6402957a7e72d89adf71b94fc5730 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/34] Add profile for cross compilation with mingw-w64 @@ -12,7 +12,7 @@ Subject: [PATCH 01/34] Add profile for cross compilation with mingw-w64 diff --git a/mkspecs/mingw-w64-g++/qmake.conf b/mkspecs/mingw-w64-g++/qmake.conf new file mode 100644 -index 0000000000..0979611a53 +index 0000000000..c49336845b --- /dev/null +++ b/mkspecs/mingw-w64-g++/qmake.conf @@ -0,0 +1,126 @@ @@ -128,7 +128,7 @@ index 0000000000..0979611a53 +QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config + +QMAKE_LIBS = -+QMAKE_LIBS_CORE = -lz -lpcre2-16 -lversion -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 ++QMAKE_LIBS_CORE = -lz -lpcre2-16 -lversion -lnetapi32 -luserenv -lole32 -luuid -lwinmm -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 +QMAKE_LIBS_GUI = -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lws2_32 -lole32 -luuid -luser32 -ladvapi32 -ljpeg -lpng \ + $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \ + $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2) 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 91acfc8f..28de9e20 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 b8e324aa1716e50bdb66772bab2442e5b7c7afe8 Mon Sep 17 00:00:00 2001 +From 009da5ac781ce0657808571538d6611166d0b4d9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL diff --git a/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch index 94419690..000082da 100644 --- a/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch +++ b/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch @@ -1,4 +1,4 @@ -From 036909a4c082a17bee90c451842ebaee896e1893 Mon Sep 17 00:00:00 2001 +From 3f183dac766bbaa507ff90dc7286e0c693f2dab1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:41:38 +0200 Subject: [PATCH 03/34] Use external ANGLE library diff --git a/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 7619c55f..13521b6f 100644 --- a/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From d67f33383fde286f9c8e77bbd686a5c335473645 Mon Sep 17 00:00:00 2001 +From 2b0ac418d4007e8bbda1e2a4aacc508bd7a931a9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory diff --git a/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch index c685ba02..3d9c3cbc 100644 --- a/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 1c595c81473d93a87b339df137820624cafdc373 Mon Sep 17 00:00:00 2001 +From 4e1350167ef79add7df24dd7ce0c84851465529c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 05/34] Make sure *.pc files are installed correctly diff --git a/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch index d5221ecb..099c3d83 100644 --- a/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From 50b56803c962a656211021e50cd3e7df57722726 Mon Sep 17 00:00:00 2001 +From 53088193a95b50d2bd88bf8a017a152e180404c9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 06/34] Don't add resource files to LIBS parameter diff --git a/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch index a3e93271..5543c88f 100644 --- a/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From b02e8af19e3d94f9c39bbcaf94e91ab6dc6ca3f8 Mon Sep 17 00:00:00 2001 +From 08fec3af6cd36be649cbab317ded9e2ff4a5a4c4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 07/34] Prevent debug library names in pkg-config files diff --git a/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch index a5eef160..b51544fd 100644 --- a/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From e48d371cf5b0b98f91fca0fe38a5dd0479fcdfca Mon Sep 17 00:00:00 2001 +From 2e8a2b07a1b9ba68f0836fe9d1f6e88f55e362ac Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 08/34] Fix linking against shared/static libpng diff --git a/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch index 4b897989..58f37072 100644 --- a/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From 6785fbf99c08ef26967bcd064941b7bd692afb41 Mon Sep 17 00:00:00 2001 +From 25273fb108f1e3a239d200570053ca3630461289 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 09/34] Fix linking against static D-Bus diff --git a/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index ebdc33ce..4b1175f3 100644 --- a/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 94ba6e5a623a81ee02f6b7a46b7e82f4ea505f4f Mon Sep 17 00:00:00 2001 +From 54e71f3f648c24958924ee52b427e777b979b47b Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library diff --git a/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch index a45279cf..4da1971a 100644 --- a/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From 6e4e751d6f39c6869cacb6d4148f5358f58bb54e Mon Sep 17 00:00:00 2001 +From 0d67a3dc557e4b4cc77e9c667dc427539a60c2af Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 11/34] Fix linking against static freetype2 diff --git a/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch index 71e2a90b..75177fa4 100644 --- a/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From e05dcf0fb89c0ab64aba0f3a53986daa6a0bed76 Mon Sep 17 00:00:00 2001 +From bfb366d5d8746979429e89251993e1b4a4040e7d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 12/34] Fix linking against static harfbuzz diff --git a/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch index 6e3e18c9..38c77dd9 100644 --- a/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From 9e7f8734086cc4a2dd7f6e713076af64648802f7 Mon Sep 17 00:00:00 2001 +From b14796dc6a28a880c99f838e180c0398399d6418 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 13/34] Fix linking against static pcre diff --git a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch index 6185fe92..366c143b 100644 --- a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From 8d8e5c1df2e366ba3c595970813caf98768a140f Mon Sep 17 00:00:00 2001 +From 08683d4d220af8b00fd28d841d0027c2f830f3c9 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 14/34] Fix linking against shared/static MariaDB diff --git a/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch index abe072c4..99525fa1 100644 --- a/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From fd736054ec03ad328b1e8c4195184f286655040e Mon Sep 17 00:00:00 2001 +From 7f17b25b356d542355b1457b3eea211219768694 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL diff --git a/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch index 26b8cf2f..2b57ab9b 100644 --- a/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 15f3d49456695caeb91f1e861730883aea04ca5f Mon Sep 17 00:00:00 2001 +From 69c2a140953c4958dd59892bde8f4283e4ee2b35 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 16/34] Rename qtmain to qt5main diff --git a/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch index 184aff91..285b35e6 100644 --- a/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch +++ b/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch @@ -1,4 +1,4 @@ -From 366c764b927e568c75968ae92ec16caca54c0d31 Mon Sep 17 00:00:00 2001 +From 06c0f7930559066186bbb79876843f5cdf425a4a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:27:28 +0200 Subject: [PATCH 17/34] Build dynamic host libraries diff --git a/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch index c8636ff4..9a086a70 100644 --- a/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From b6dfc4016e7f61c1eb178b051387b08219652484 Mon Sep 17 00:00:00 2001 +From 3e78a026458bf55398ec4c6cc31a66d2cca8b124 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 18/34] Enable rpath for build tools diff --git a/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch index e76fce8a..52eb3921 100644 --- a/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 012d6961a9ffbaeabf1742243b23ee092b915af2 Mon Sep 17 00:00:00 2001 +From f88dd77ef98c92070659ff5d3371ae39779e630c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 19/34] Use system zlib for build tools diff --git a/qt5-base/mingw-w64/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch b/qt5-base/mingw-w64/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch index cf2e1d82..de3ebbdf 100644 --- a/qt5-base/mingw-w64/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch +++ b/qt5-base/mingw-w64/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch @@ -1,4 +1,4 @@ -From 81a6a9a34e71a08fd5a8b87f44c71803d7f07797 Mon Sep 17 00:00:00 2001 +From 440c61802ae80ceda51ed8d405ab922dddaa2d45 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:20:25 +0200 Subject: [PATCH 20/34] Disable determing default include and lib dirs at qmake diff --git a/qt5-base/mingw-w64/0021-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64/0021-Use-.dll.a-as-import-lib-extension.patch index 4f2ee4c6..c5c35927 100644 --- a/qt5-base/mingw-w64/0021-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64/0021-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From 834b94ccb1897cd5325557fa6051ef2cb4bb70a0 Mon Sep 17 00:00:00 2001 +From 4798537f28bb206f5dc4469d67dfe18f05614506 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 21/34] Use *.dll.a as import lib extension diff --git a/qt5-base/mingw-w64/0022-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64/0022-Merge-shared-and-static-library-trees.patch index 44d0bcb3..e6708dca 100644 --- a/qt5-base/mingw-w64/0022-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64/0022-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 4502d0a9e9102067541a4307e80444a4fb44717c Mon Sep 17 00:00:00 2001 +From 190e710701a41341a07e3a00e5e35429d81053f1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 22/34] Merge shared and static library trees diff --git a/qt5-base/mingw-w64/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index bf2ec7ba..0c629a18 100644 --- a/qt5-base/mingw-w64/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/qt5-base/mingw-w64/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From f73b460094294c7cd9f9d9cd481fbf1cef5a2a49 Mon Sep 17 00:00:00 2001 +From 787ef35985d51e5ce1f48fae320c8998b29654b7 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 23/34] Pull dependencies of static libraries in CMake modules @@ -13,7 +13,7 @@ the final application. 3 files changed, 128 insertions(+), 38 deletions(-) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 55c74aad66..85a0ae4307 100644 +index 55c74aad66..b401db5ac2 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -55,35 +55,52 @@ but not all the files it references. @@ -97,7 +97,7 @@ index 55c74aad66..85a0ae4307 100644 + macro(_populate_plugin_target_dependencies_from_prl_file PLUGIN_TARGET_NAME PRL_FILE_LOCATION CONFIGURATION LIB_DIRECTORY LIB_LOCATION) + file(STRINGS "${PRL_FILE_LOCATION}" prl_strings REGEX "QMAKE_PRL_LIBS_FOR_CMAKE") + string(REGEX REPLACE \"QMAKE_PRL_LIBS_FOR_CMAKE *= *([^\n]*)\" \"\\\\1\" static_depends ${prl_strings}) -+ string(REGEX REPLACE \"\\\\$\\\\$\\\\[QT_INSTALL_LIBS\\\\]\" \"${_qt5Svg_install_prefix}/lib\" static_depends \"${static_depends}\") ++ string(REGEX REPLACE \"\\\\$\\\\$\\\\[QT_INSTALL_LIBS\\\\]\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" static_depends \"${static_depends}\") + set_property(TARGET ${PLUGIN_TARGET_NAME} PROPERTY + INTERFACE_LINK_LIBRARIES ${static_depends} + ) diff --git a/qt5-base/mingw-w64/0024-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64/0024-Allow-usage-of-static-version-with-CMake.patch index c4e60933..3abf04af 100644 --- a/qt5-base/mingw-w64/0024-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64/0024-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From 903ed5730e5a25ea6fda815fcd88cc36e3d8639e Mon Sep 17 00:00:00 2001 +From 169e2241bd5f8a47ff647a2ce1e8af43265fb32f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 24/34] Allow usage of static version with CMake @@ -244,7 +244,7 @@ index 15fc070008..13bd362092 100644 # We are generating cmake files. Most developers of Qt are not aware of cmake, # so we require automatic tests to be available. The only module which should diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 85a0ae4307..42053ac0c0 100644 +index b401db5ac2..e6dd749c9e 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -9,6 +9,33 @@ if (CMAKE_VERSION VERSION_LESS 3.0.0) diff --git a/qt5-base/mingw-w64/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index 02432029..263cb9a9 100644 --- a/qt5-base/mingw-w64/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/qt5-base/mingw-w64/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From b3bcf57cfbd152eafa82b9d80183fde0f2bf1f5c Mon Sep 17 00:00:00 2001 +From a256ac2a8e64c8cc404f5c3842e9a1abc76dd840 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 25/34] Adjust linker flags for static build with diff --git a/qt5-base/mingw-w64/0026-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64/0026-Use-correct-pkg-config-static-flag.patch index 36498bf7..416943aa 100644 --- a/qt5-base/mingw-w64/0026-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64/0026-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From 1e31f372966581f19bcbd9a39b29cf3dedfe9c5a Mon Sep 17 00:00:00 2001 +From 1a11849c5f8ba28bb0e492df01228d57f63974ff Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 26/34] Use correct pkg-config --static flag diff --git a/qt5-base/mingw-w64/0027-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64/0027-Fix-macro-invoking-moc-rcc-and-uic.patch index 3b75e887..11f25e84 100644 --- a/qt5-base/mingw-w64/0027-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/qt5-base/mingw-w64/0027-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From 0f6a4852f4bf5d43aa856f2af475f5f526b76daf Mon Sep 17 00:00:00 2001 +From d585e369c2274af65dc82c53f2ec6ad16c9a124b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 27/34] Fix macro invoking moc, rcc and uic diff --git a/qt5-base/mingw-w64/0028-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64/0028-Ignore-errors-about-missing-feature-static.patch index 803dfe38..82a4e031 100644 --- a/qt5-base/mingw-w64/0028-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64/0028-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From 80964e61f1442f4566b6cb1d4a08231ea5942133 Mon Sep 17 00:00:00 2001 +From b605147e73b0b0c36bfd21b94920310b7279898f Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 28/34] Ignore errors about missing feature static diff --git a/qt5-base/mingw-w64/0029-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64/0029-Enable-and-fix-use-of-iconv.patch index 128a1cf3..b7847ff8 100644 --- a/qt5-base/mingw-w64/0029-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64/0029-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 3a5569599bd8c5267e41c57917b19e16bba1169c Mon Sep 17 00:00:00 2001 +From 8be581dab1e7b0ebba897ccd5d3c71a7e4c9b74b Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 29/34] Enable and fix use of iconv diff --git a/qt5-base/mingw-w64/0030-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64/0030-Ignore-failing-pkg-config-test.patch index 4c8cc8f8..7919bf47 100644 --- a/qt5-base/mingw-w64/0030-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64/0030-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From e9f964d079c6dea6404f01d0d8f1acfa5287ccdc Mon Sep 17 00:00:00 2001 +From 69ce42a2cc5631a99b78c0468d0a4e8f2cb856f4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 30/34] Ignore failing pkg-config test diff --git a/qt5-base/mingw-w64/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch index e4349439..99e60333 100644 --- a/qt5-base/mingw-w64/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From d35384a8d6191d68f8cd2b60a2295f5372d67fa4 Mon Sep 17 00:00:00 2001 +From 51684a7002b3da41428107ca80b8c360ce00c0b8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 31/34] Prevent qmake from messing static lib dependencies diff --git a/qt5-base/mingw-w64/0032-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64/0032-Hardcode-linker-flags-for-platform-plugins.patch index 3d82dfff..55c83356 100644 --- a/qt5-base/mingw-w64/0032-Hardcode-linker-flags-for-platform-plugins.patch +++ b/qt5-base/mingw-w64/0032-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From aa947be7429528caf04ad7db6f077fe695bcfe82 Mon Sep 17 00:00:00 2001 +From dd8af708953214aee7128b6448a98fdbea123cd1 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 32/34] Hardcode linker flags for platform plugins diff --git a/qt5-base/mingw-w64/0033-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64/0033-Fix-linking-against-static-plugins-with-qmake.patch index d849f3d8..f8bc05fe 100644 --- a/qt5-base/mingw-w64/0033-Fix-linking-against-static-plugins-with-qmake.patch +++ b/qt5-base/mingw-w64/0033-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From 7db753e04de6a458fc10124b7e3b12ac5f4d1623 Mon Sep 17 00:00:00 2001 +From ba94765c0830e114e7b1cd269a04e8abac1ecd6a Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 33/34] Fix linking against static plugins with qmake diff --git a/qt5-base/mingw-w64/0034-Don-t-use-the-statx-syscall.patch b/qt5-base/mingw-w64/0034-Don-t-use-the-statx-syscall.patch index 56e0ca93..bbb8ef81 100644 --- a/qt5-base/mingw-w64/0034-Don-t-use-the-statx-syscall.patch +++ b/qt5-base/mingw-w64/0034-Don-t-use-the-statx-syscall.patch @@ -1,4 +1,4 @@ -From e8cbf42a882706cce93f46142748d252cb492e1c Mon Sep 17 00:00:00 2001 +From 06c69dbc4aa16012b8ab05b586fb2e261405a037 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 9 Dec 2017 00:36:56 +0100 Subject: [PATCH 34/34] Don't use the statx syscall diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD index 5c450ae7..3e380f02 100644 --- a/qt5-base/mingw-w64/PKGBUILD +++ b/qt5-base/mingw-w64/PKGBUILD @@ -85,7 +85,7 @@ isNoOpenGL() { pkgname=mingw-w64-qt5-base pkgver=5.10.0 -pkgrel=1 +pkgrel=2 pkgdesc='A cross-platform application and UI framework (mingw-w64)' # The static variant doesn't contain any executables which need to be executed on the build machine isStatic && arch=('any') || arch=('i686' 'x86_64') @@ -135,40 +135,40 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0033-Fix-linking-against-static-plugins-with-qmake.patch' '0034-Don-t-use-the-statx-syscall.patch') sha256sums=('fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762' - 'd2784f40a1f8f3f7041c94b89702404a21ef2fd1d6c63bbffe14e26321265745' - 'c695a25e6dc0ddd8b1dd07adba6eee518294ffb69b689f373dde861f935c876b' - '4a7a855fe8abffe0aa3da450981439a1c26f7f65fe456149f627bccd603ad5b7' - '46a42a20a4bed03f9f0b7abd55904be3e560dfd4e10e586d68479a5060ce06e2' - '70550f6cbe95c5a14ccb7e9ba5fab7cb595a0fc49b889c9ac735cca41148ab5b' - 'fa16872915ce6d24bc217ee7c5e42c3c61e29034f832e32f2971da85eb4f3d08' - '19b01e55dd3eb311c182d2ef682f15a2739556d5585d9e19de633e92dba9a788' - 'e13936a6f7d17a6c38c95e9cc9e19209a3d03970cf5157931f309edf45530132' - '978a2f5a53c0fe50780a12c09bbc81ee8efe60d1437425b08b3c5b4a4edb217c' - '8ffb5f68ebe09e99580d45c1279dc39ef811d0de7e4d363173af3be2cf3c9ee8' - '305f18d1b011033fbb12ca544d3af47cb45a1b6d324bf68b671cb007dc2a8a0a' - '53fb05efee9c024643cd607c623eda745a122cddc2880d6554b3168778942316' - '927188133dc2708345f7c831e1253b59338a9554b544c1d2cfdf02493b92573f' - '125f0b758bf2088589a31ced00146dc2cce28fa93bdd84684857ae60850c96b8' - '016c3a2980060365dd7e83a001f274b6a7f736af2519fa7c5263b0def10e2703' - '48930971f0ce225795bd0b6292c4e3ad27843ec0c95113b95be44274435b6623' - 'a6f8e6111b6960b86b347c3927251f41c8fa235aabf90e89965063326c7cedd3' - 'a57e452177fd1aa7f0d22b1a83f29dd18010dfef7b007157a7dc8d6399232471' - '07b1ab8b25a02e1ed369017178847081afe937817e71384dfb17ab56ff278a0e' - '2b426ab2aa774110c2b628c4987748520925e7ebfda2f524407cdc606315696b' - 'a78df9e2a5f3da89f944328a217ae5dd75fabd37f5b5c9ebc8eb75678f31910a' - '8470c121a04702b1a0ef4f52d310e69906bab0c066fcb6c7601bcb678655b959' - 'ac09e38e4f555e5bae1bc0f01b70a67624b15ecf5affc06d85eaccbc85f3c1da' - '0c1939eff41143bc78a6bf6e8b51515f4ba68337b9723674e6e7ab696167edae' - 'ed64b7a36a01d30bc9d35fed47186f9161e5ceba7dd92da7c60d288026fa8856' - '3f42240d83d09c62b8a7d9a98fe2d6a9d9fcf8ba6b5ff3d303a941411ef7d1a4' - 'd44bdc6363d1e5e1cbcdb5b61e0a788a38368ab3090746c165981bd0a5eb0854' - '15c0691f6fd058bf70be79b221ab4ace66cc574728b68d9f15bafe1877f46266' - '05aec6b0c2d9add0e4181246b52096d4cf2f4176f4c0e9f467d5244492844c28' - 'ed1237884607a368190cb1ac4de2a12f00e54ecfcea901c7f1980ac37b94b57b' - '4a83eb1549be9477bc002a6b939e24a6f1b6fd14bfcc804235771d484762aa3e' - 'a100076b67008b64f73fd4fd4b131e1774b84b24b61198cabecdb5916d634887' - 'fe9ecf6e82b64b3a955f688d51c87ca82a4aa4ad59e419c7c284ce18b72e223c' - 'cbc0e2570ca5b52681d99ab15e7a7a79a286e498203d34c2d67493a78dd6b84d') + 'd10d56c65b632d881f79eda8c0caeffb1a53a4829ac886e80038cdc8929b1669' + '524883f46945ab2ce023e9de1144a7eebafdba936ea8c61e035006deff48fa5b' + 'cea0e73f831348e50285ab87149803d4dfb5650c4c96037844b98b3dc1c65159' + 'e333d61821a42710a00f9bd4d003d376f513ba6ca41a3739bfcd414c99b8e7dd' + 'e8b0bdcc39458105dd0e5c569c98ef53a84d2fe4e9e200e1b1c1b7b749e8e758' + 'e14860d560886b600373f639e89e9a60d77de9a536587633ea71e1fd907df3fb' + '447c27f0e87d5cdcbe9883f6d3aac0daefef28e09bd8afe8d07a650375ca8362' + 'e2f98037b93aa2970014c1d185912b49d4ab5506c24fa2410cb0e93d4e0a1f54' + '507537c73995715fa1a4e9e0f1ecfdf4afe409b5397366f551d06c6c406e088b' + '760093a185cd77bacec0d85c0c077370d6044b89a4d6f03944524d1aa2b82dfa' + '6052446a675be39dd663ef69ee5339ab67c2805b29ff4ef19bacf0f677a95182' + '60a6e236334d3950b40dbb0501cc733bc7a672b0c7fbf6e4792c0058bf20a859' + 'f58391f9407742a1543702fe0234a134883046ff99584c1cfa468893264bf5e9' + '9e406b466c2b447da5d44ea37cafe2b3c3caebfa54936eb71e816e60b186c47d' + '870ed7adb78d4f5b396fa9106777aaeefc2a8af406e1aa1655dfe3405974a1ce' + 'b51a2d707a09cce340ca10e4a93c18a0872881889a97dc3ea2aafe73d80dfd46' + 'ed206eef70d57cd1aeb31c9e65ceb46fe926bee462c9b6507d22b6daf9b03aff' + '00ea2ef2f2d8868351d857716e60e8e78ed90a294132cd1fbd8039aae50e7344' + 'f80e166e5a358cc3d0dca5f0a543b30271a1c536ff9ef73105f1e432b10d3afe' + '12c4ce015c5641376dea7a232f0fc9f8feb10ddee06c65f87e0f00ea2574ab15' + 'a3a6a12f94ed4a79b3910623e3a8a11859d7a6a72b4634ff8bd6d1269af615bd' + '6f1f96ec05f049a107f4b5b3fba05e088d47f1c4751fd21851ed48d5f1b5a274' + '2926f77fbab219cb2fe9bb630274b06594a72c9047d374209d96591e481015fd' + 'b36b7fce8e101444d17026002f8052be41de887ccd263188a64faeae31cc1c89' + '7bcfe130f6dc47c9fb4d3db6fe9634596ab2c01e421bfc9a0967463487b4b7f0' + '83f6a3fc2489da2686f035563542478fd01e2849e18ea02478d7850bd68f16be' + '7254445b4cea5e1d7efc25b923e755ab3b19856ee8bce2ebe2900b9bf4717841' + 'd03a3cc5dab9d9a843e73f241fee2778deffe9ee727e493a0052e62b2266923e' + 'd6dc468d67e782b64fbe9ba64dfc3fdf423c5d06205f4a87a0561bb53b35d7fc' + '43c367e31c1560178a1471a80a9e90391c7c93f8dfece8c4c9dfafea4a3ce180' + '2e89aca862a62cbf535faf4b01c00dfed40ad6ccb52ac998913e9e96801491a3' + '8b1402c8ac78c0870af19ccdd8b2603e164cf2ef4fd4446fd03ea40b68a35643' + '81d279b24a508656597fec9bf94bade25cf0d600607febcd35f7fd27d09970eb' + '95a8cd9553ef18e200a85ff6dc5c718525d71be92d4fa49b8cdceae73696e037') _architectures='i686-w64-mingw32 x86_64-w64-mingw32'