diff options
36 files changed, 273 insertions, 230 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Mon Oct 16 17:36:24 UTC 2017 +# Thu Dec 14 00:06:18 UTC 2017 pkgbase = mingw-w64-qt5-base pkgdesc = A cross-platform application and UI framework (mingw-w64) - pkgver = 5.9.2 + pkgver = 5.10.0 pkgrel = 1 url = https://www.qt.io/ arch = i686 @@ -21,7 +21,7 @@ pkgbase = mingw-w64-qt5-base depends = mingw-w64-libjpeg-turbo depends = mingw-w64-sqlite depends = mingw-w64-libpng - depends = mingw-w64-openssl-1.0 + depends = mingw-w64-openssl depends = mingw-w64-dbus depends = mingw-w64-harfbuzz depends = mingw-w64-pcre2 @@ -31,7 +31,7 @@ pkgbase = mingw-w64-qt5-base options = !buildflags options = staticlibs options = !emptydirs - source = https://download.qt.io/official_releases/qt/5.9/5.9.2/submodules/qtbase-opensource-src-5.9.2.tar.xz + source = https://download.qt.io/official_releases/qt/5.10/5.10.0/submodules/qtbase-everywhere-src-5.10.0.tar.xz source = 0001-Add-profile-for-cross-compilation-with-mingw-w64.patch source = 0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch source = 0003-Use-external-ANGLE-library.patch @@ -65,40 +65,42 @@ pkgbase = mingw-w64-qt5-base source = 0031-Prevent-qmake-from-messing-static-lib-dependencies.patch source = 0032-Hardcode-linker-flags-for-platform-plugins.patch source = 0033-Fix-linking-against-static-plugins-with-qmake.patch - sha256sums = 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b - sha256sums = 685fd08e1c4e97bbf6990959cb3dbe88dd3ed494221400dce6aef159d277c34a - sha256sums = 4e5115e62b952acface29882c5f6423569cd1c439c454e58594b5fb2cb740916 - sha256sums = 0b339563844ccd325486d78711592561996fb256f0612c63b33b6ea52a6fc77e - sha256sums = 18945eb521df54d37922894c9bc82ccd03eb3fd9f6e0aed986facf2b49f336d4 - sha256sums = 2c2b5f9b3db02750ae9a9626ea8a24a3516c881c5eaa9b19fb9a2621fc1263fc - sha256sums = 81559290cc03f7ff6042f28a6eb319882264876076a20e24531641ebe4ef3aee - sha256sums = a3d657ee7f8bfa6c3e5a4aa626710bc27fc82fea3d834098bde2b2f67244d11c - sha256sums = 3df9bf81a936c737cc7ca53bdea9cfd2a4010fa190fe3e1a45611097d8213ef4 - sha256sums = 5aac41daaf223726d31ab5a7aec0bdc050aa182522ca732cc31c3b5ac8cd28dc - sha256sums = 6844b7106e636d513b077edeba318990641b1ee294f2a70739830e3d0a9b0d02 - sha256sums = 12b51c32069270e49e05e64b0f54d6e3e871523660fd17673e0ee6e67206955e - sha256sums = 4baa73f8b3d61b503a9de1437bdc9f7f84cd2443280afc1461456ae34d222e9b - sha256sums = e34eec672f9f681302edd809cbcb7d6848a310a02acc5711e2e348aab1b8d74c - sha256sums = d70f44c06a7bae6fbd91022ec79f09e2d658969aa5a6602bff6eb61076801b6e - sha256sums = f705fcfe1f552536318c2c63d59e5ec95640321d9f1fff1016a34d1bc862c9df - sha256sums = 60034cce435d3eca60906e4af2f1ad55edd12b4e95ccc9905e793bc7b9d66917 - sha256sums = 295c307f6b075b0c20b7d714b6ecff1bc25927b80dd60d725052b4bc05d1b055 - sha256sums = 37c2d0bce780a15e7bdb477324936b1ae0ebe576c64d3a713a9086586518d50a - sha256sums = 36b6a2e1d2bf478746e931da5223dcfeffc5eda513b64596ffbbd663fd5e63e7 - sha256sums = e1b45c50ca09b065f218442a1fc3ddf3c8de1357a818925497fe0e3e7c28cacd - sha256sums = 03feabae42553a6960c2a257eb951d956fe31a9a4440a92b373e8a0d6cb301ff - sha256sums = 1ec8a7ebaf5e400aca7a0abe8cee78d0dae6b662c30bf245b81814cfcd048dd3 - sha256sums = bc2f049471853a6bb2e83de3c2691a4206d55c7fe018bb7910215e9968759082 - sha256sums = 8611ac15ee36b803b5095466509c57d45532ab017d61513f2be7b34d5c13da0f - sha256sums = f999f20131f0180439b59320ab350a284b169e5ee5e21379fa74dc07d4aeda25 - sha256sums = d9fed680c0313c89458361ac253a5710379fa8022c7c24b05d2807ecaf4f803a - sha256sums = d263509d7951f12d9ccfa841cd7f205aebc7b9db28913925b65a23e627258023 - sha256sums = 092176255153bae63f779833d25e5f64a2c489a1b6f33e8e158ff59629916b36 - sha256sums = 65023b59b41797281876b5fcd8cb1542ad790b9b6f83125b6b0aa1e02d9de4fb - sha256sums = 3d5202be8837bccab4dedc9b6f10b3722ca57ea8b663e08b55d0235381397508 - sha256sums = 4df4c2ad348c13a3b82c3a9b127464492898379a82dfd6db9d3ff9d051a08dab - sha256sums = cfa48754bef9f7a95f1350c0c1ec1699c9dc413013ef78d218206f5d60335823 - sha256sums = 135123e630efdbeb6d4edc9bc200754f2c881760652fe5152f0903ae238ce2c9 + source = 0034-Don-t-use-the-statx-syscall.patch + sha256sums = fd5578cd320a13617c12cf2b19439386b203d6d45548e855f94e07be9829f762 + sha256sums = d2784f40a1f8f3f7041c94b89702404a21ef2fd1d6c63bbffe14e26321265745 + sha256sums = c695a25e6dc0ddd8b1dd07adba6eee518294ffb69b689f373dde861f935c876b + sha256sums = 4a7a855fe8abffe0aa3da450981439a1c26f7f65fe456149f627bccd603ad5b7 + sha256sums = 46a42a20a4bed03f9f0b7abd55904be3e560dfd4e10e586d68479a5060ce06e2 + sha256sums = 70550f6cbe95c5a14ccb7e9ba5fab7cb595a0fc49b889c9ac735cca41148ab5b + sha256sums = fa16872915ce6d24bc217ee7c5e42c3c61e29034f832e32f2971da85eb4f3d08 + sha256sums = 19b01e55dd3eb311c182d2ef682f15a2739556d5585d9e19de633e92dba9a788 + sha256sums = e13936a6f7d17a6c38c95e9cc9e19209a3d03970cf5157931f309edf45530132 + sha256sums = 978a2f5a53c0fe50780a12c09bbc81ee8efe60d1437425b08b3c5b4a4edb217c + sha256sums = 8ffb5f68ebe09e99580d45c1279dc39ef811d0de7e4d363173af3be2cf3c9ee8 + sha256sums = 305f18d1b011033fbb12ca544d3af47cb45a1b6d324bf68b671cb007dc2a8a0a + sha256sums = 53fb05efee9c024643cd607c623eda745a122cddc2880d6554b3168778942316 + sha256sums = 927188133dc2708345f7c831e1253b59338a9554b544c1d2cfdf02493b92573f + sha256sums = 125f0b758bf2088589a31ced00146dc2cce28fa93bdd84684857ae60850c96b8 + sha256sums = 016c3a2980060365dd7e83a001f274b6a7f736af2519fa7c5263b0def10e2703 + sha256sums = 48930971f0ce225795bd0b6292c4e3ad27843ec0c95113b95be44274435b6623 + sha256sums = a6f8e6111b6960b86b347c3927251f41c8fa235aabf90e89965063326c7cedd3 + sha256sums = a57e452177fd1aa7f0d22b1a83f29dd18010dfef7b007157a7dc8d6399232471 + sha256sums = 07b1ab8b25a02e1ed369017178847081afe937817e71384dfb17ab56ff278a0e + sha256sums = 2b426ab2aa774110c2b628c4987748520925e7ebfda2f524407cdc606315696b + sha256sums = a78df9e2a5f3da89f944328a217ae5dd75fabd37f5b5c9ebc8eb75678f31910a + sha256sums = 8470c121a04702b1a0ef4f52d310e69906bab0c066fcb6c7601bcb678655b959 + sha256sums = ac09e38e4f555e5bae1bc0f01b70a67624b15ecf5affc06d85eaccbc85f3c1da + sha256sums = 0c1939eff41143bc78a6bf6e8b51515f4ba68337b9723674e6e7ab696167edae + sha256sums = ed64b7a36a01d30bc9d35fed47186f9161e5ceba7dd92da7c60d288026fa8856 + sha256sums = 3f42240d83d09c62b8a7d9a98fe2d6a9d9fcf8ba6b5ff3d303a941411ef7d1a4 + sha256sums = d44bdc6363d1e5e1cbcdb5b61e0a788a38368ab3090746c165981bd0a5eb0854 + sha256sums = 15c0691f6fd058bf70be79b221ab4ace66cc574728b68d9f15bafe1877f46266 + sha256sums = 05aec6b0c2d9add0e4181246b52096d4cf2f4176f4c0e9f467d5244492844c28 + sha256sums = ed1237884607a368190cb1ac4de2a12f00e54ecfcea901c7f1980ac37b94b57b + sha256sums = 4a83eb1549be9477bc002a6b939e24a6f1b6fd14bfcc804235771d484762aa3e + sha256sums = a100076b67008b64f73fd4fd4b131e1774b84b24b61198cabecdb5916d634887 + sha256sums = fe9ecf6e82b64b3a955f688d51c87ca82a4aa4ad59e419c7c284ce18b72e223c + sha256sums = cbc0e2570ca5b52681d99ab15e7a7a79a286e498203d34c2d67493a78dd6b84d pkgname = mingw-w64-qt5-base diff --git a/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch b/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch index 9fa075d16c77..15ca6ec5b00d 100644 --- a/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch +++ b/0001-Add-profile-for-cross-compilation-with-mingw-w64.patch @@ -1,7 +1,7 @@ -From 76b918b0c930c9c4c704f4ce947822e30c1bf1ec Mon Sep 17 00:00:00 2001 +From af6803389ebba50abfe7ad299bbf99c9c8d1a8aa Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 18:30:51 +0100 -Subject: [PATCH 01/33] Add profile for cross compilation with mingw-w64 +Subject: [PATCH 01/34] Add profile for cross compilation with mingw-w64 --- mkspecs/mingw-w64-g++/qmake.conf | 126 +++++++++++++++++++++++++++ @@ -12,7 +12,7 @@ Subject: [PATCH 01/33] 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..c929483fcd +index 0000000000..0979611a53 --- /dev/null +++ b/mkspecs/mingw-w64-g++/qmake.conf @@ -0,0 +1,126 @@ @@ -133,7 +133,7 @@ index 0000000000..c929483fcd + $$system($${QMAKE_PKG_CONFIG} --static --libs harfbuzz) \ + $$system($${QMAKE_PKG_CONFIG} --static --libs freetype2) +QMAKE_LIBS_NETWORK = -lws2_32 -lcrypt32 -ldnsapi -+QMAKE_LIBS_NETWORK_STATIC = $${CROSS_COMPILE_PREFIX}/lib/openssl-1.0/libssl.a $${CROSS_COMPILE_PREFIX}/lib/openssl-1.0/libcrypto.a -lgdi32 ++QMAKE_LIBS_NETWORK_STATIC = $$system($${QMAKE_PKG_CONFIG} --static --libs openssl) -ldnsapi +QMAKE_LIBS_DBUS = $$system($${QMAKE_PKG_CONFIG} --static --libs dbus-1) +QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 +QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32 @@ -304,5 +304,5 @@ index 0000000000..c5a70b1445 + +#endif // QPLATFORMDEFS_H -- -2.14.2 +2.15.1 diff --git a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index e644e2aacb4d..91acfc8f5101 100644 --- a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch +++ b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch @@ -1,7 +1,7 @@ -From 31fa3e1192849fb5460b346a3fc1f91fe1431f8e Mon Sep 17 00:00:00 2001 +From b8e324aa1716e50bdb66772bab2442e5b7c7afe8 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:36:53 +0200 -Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL +Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL FIXME: Not sure whether this is still required --- @@ -23,5 +23,5 @@ index 0a5de2c9af..35798a2a28 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include <stdio.h> -- -2.14.2 +2.15.1 diff --git a/0003-Use-external-ANGLE-library.patch b/0003-Use-external-ANGLE-library.patch index f753a01a597f..9441969078ec 100644 --- a/0003-Use-external-ANGLE-library.patch +++ b/0003-Use-external-ANGLE-library.patch @@ -1,7 +1,7 @@ -From 00b0e801caf246047f3ea18bead0ffc7c7631dad Mon Sep 17 00:00:00 2001 +From 036909a4c082a17bee90c451842ebaee896e1893 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:41:38 +0200 -Subject: [PATCH 03/33] Use external ANGLE library +Subject: [PATCH 03/34] Use external ANGLE library --- src/gui/Qt5GuiConfigExtras.cmake.in | 4 ++-- @@ -28,7 +28,7 @@ index 07869efd7d..2e32911a64 100644 _qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS}) diff --git a/src/gui/gui.pro b/src/gui/gui.pro -index f7d077e656..b7fc6fadaf 100644 +index f8cec00b82..d09c9fd49c 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -18,12 +18,6 @@ MODULE_PLUGIN_TYPES = \ @@ -66,7 +66,7 @@ index 016db46405..02f1204f0f 100644 HEADERS += qgl.h \ qgl_p.h \ diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri -index 6d01d05fcc..181ac2cb3b 100644 +index b7790a66e3..046fe34a06 100644 --- a/src/plugins/platforms/windows/windows.pri +++ b/src/plugins/platforms/windows/windows.pri @@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32 @@ -78,10 +78,10 @@ index 6d01d05fcc..181ac2cb3b 100644 mingw: LIBS *= -luuid # For the dialog helpers: diff --git a/src/src.pro b/src/src.pro -index 43fc06f2e5..4188d4ea6b 100644 +index a2064b1362..b9ba606b03 100644 --- a/src/src.pro +++ b/src/src.pro -@@ -175,10 +175,6 @@ qtConfig(gui) { +@@ -180,10 +180,6 @@ qtConfig(gui) { SUBDIRS += src_3rdparty_harfbuzzng src_gui.depends += src_3rdparty_harfbuzzng } @@ -93,5 +93,5 @@ index 43fc06f2e5..4188d4ea6b 100644 SUBDIRS += src_3rdparty_libpng src_3rdparty_freetype.depends += src_3rdparty_libpng -- -2.14.2 +2.15.1 diff --git a/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index b3ae560de48c..7619c55feabe 100644 --- a/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,7 +1,7 @@ -From 6f9daffcc9b83acbcae94ced0708f6f96f2e99c4 Mon Sep 17 00:00:00 2001 +From d67f33383fde286f9c8e77bbd686a5c335473645 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:48:51 +0200 -Subject: [PATCH 04/33] Fix too many sections assemler error in OpenGL factory +Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory On x86_64 qopenglversionfunctionsfactory.o exceeds the limit of 32768 sections. @@ -25,5 +25,5 @@ index 4c778b184e..1dd1755d7f 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.14.2 +2.15.1 diff --git a/0005-Make-sure-.pc-files-are-installed-correctly.patch b/0005-Make-sure-.pc-files-are-installed-correctly.patch index e99439dbf7b9..c685ba020f00 100644 --- a/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,7 +1,7 @@ -From 198b5f7e944f21a7f9caaeb686afddfc9e87c768 Mon Sep 17 00:00:00 2001 +From 1c595c81473d93a87b339df137820624cafdc373 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:54:12 +0200 -Subject: [PATCH 05/33] Make sure *.pc files are installed correctly +Subject: [PATCH 05/34] Make sure *.pc files are installed correctly --- qmake/generators/makefile.cpp | 8 ++++++-- @@ -10,7 +10,7 @@ Subject: [PATCH 05/33] Make sure *.pc files are installed correctly 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index a1f3352aa3..0be4b1ef01 100644 +index 82573347b6..b9871ff49c 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3146,7 +3146,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const @@ -62,5 +62,5 @@ index 75bb5d236d..737f3abc3a 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.14.2 +2.15.1 diff --git a/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/0006-Don-t-add-resource-files-to-LIBS-parameter.patch index 43268114c14f..d5221ecbdb92 100644 --- a/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,7 +1,7 @@ -From 5731914d9e5d8a026901e5bbab3f3ee1b3ea50f3 Mon Sep 17 00:00:00 2001 +From 50b56803c962a656211021e50cd3e7df57722726 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:58:28 +0200 -Subject: [PATCH 06/33] Don't add resource files to LIBS parameter +Subject: [PATCH 06/34] Don't add resource files to LIBS parameter Solves an issue where the generated pkg-config files contained invalid Libs.private references @@ -11,10 +11,10 @@ like .obj/debug/Qt5Cored_resource_res.o 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp -index bad53dc5b7..c730d641b2 100644 +index 792ffb1997..faf8b5a275 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp -@@ -202,7 +202,7 @@ void MingwMakefileGenerator::init() +@@ -196,7 +196,7 @@ void MingwMakefileGenerator::init() processVars(); @@ -24,5 +24,5 @@ index bad53dc5b7..c730d641b2 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.14.2 +2.15.1 diff --git a/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/0007-Prevent-debug-library-names-in-pkg-config-files.patch index f09d6fae4298..a3e932717e5f 100644 --- a/0007-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/0007-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,7 +1,7 @@ -From 285b5fee5b5ada6cd82ddaf33eb9c1a05b564bc6 Mon Sep 17 00:00:00 2001 +From b02e8af19e3d94f9c39bbcaf94e91ab6dc6ca3f8 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:01:14 +0200 -Subject: [PATCH 07/33] Prevent debug library names in pkg-config files +Subject: [PATCH 07/34] Prevent debug library names in pkg-config files qmake generates the pkgconfig .pc files two times, once for the release build and once for the debug build (which we're not actually @@ -15,7 +15,7 @@ files for the debug build an unique file name. 1 file changed, 3 insertions(+) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 0be4b1ef01..c7e075b5bc 100644 +index b9871ff49c..0d07d6c333 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3160,6 +3160,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) @@ -29,5 +29,5 @@ index 0be4b1ef01..c7e075b5bc 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.14.2 +2.15.1 diff --git a/0008-Fix-linking-against-shared-static-libpng.patch b/0008-Fix-linking-against-shared-static-libpng.patch index d1b4f7ac33e8..a5eef160e36b 100644 --- a/0008-Fix-linking-against-shared-static-libpng.patch +++ b/0008-Fix-linking-against-shared-static-libpng.patch @@ -1,7 +1,7 @@ -From 1ee8c85cd86ca49c2d43d81af0c57eb49b877372 Mon Sep 17 00:00:00 2001 +From e48d371cf5b0b98f91fca0fe38a5dd0479fcdfca Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Thu, 26 Jan 2017 17:51:31 +0100 -Subject: [PATCH 08/33] Fix linking against shared/static libpng +Subject: [PATCH 08/34] Fix linking against shared/static libpng Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf --- @@ -9,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 28c8034c75..7e9148500b 100644 +index 0a591e110c..4ca919c6da 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -294,7 +294,8 @@ +@@ -296,7 +296,8 @@ "sources": [ { "type": "pkgConfig", "args": "libpng" }, { "libs": "-llibpng", "condition": "config.msvc" }, @@ -23,5 +23,5 @@ index 28c8034c75..7e9148500b 100644 "use": [ { "lib": "zlib", "condition": "features.system-zlib" } -- -2.14.2 +2.15.1 diff --git a/0009-Fix-linking-against-static-D-Bus.patch b/0009-Fix-linking-against-static-D-Bus.patch index d07abaee8c3c..4b897989195b 100644 --- a/0009-Fix-linking-against-static-D-Bus.patch +++ b/0009-Fix-linking-against-static-D-Bus.patch @@ -1,7 +1,7 @@ -From 3e04b4a701a7dde06f5ea046198ac5646b644e86 Mon Sep 17 00:00:00 2001 +From 6785fbf99c08ef26967bcd064941b7bd692afb41 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 19:36:25 +0100 -Subject: [PATCH 09/33] Fix linking against static D-Bus +Subject: [PATCH 09/34] Fix linking against static D-Bus --- configure.json | 9 +++++++-- @@ -9,7 +9,7 @@ Subject: [PATCH 09/33] Fix linking against static D-Bus 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.json b/configure.json -index a91456aaf3..55c56369ba 100644 +index 26e1572f32..108619634c 100644 --- a/configure.json +++ b/configure.json @@ -171,18 +171,23 @@ @@ -54,5 +54,5 @@ index cfc0e12046..65f1397cd6 100644 # include <dbus/dbus.h> #else -- -2.14.2 +2.15.1 diff --git a/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index 02a01b1190e8..ebdc33cedf84 100644 --- a/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,7 +1,7 @@ -From 28750e29ab3549300823ff8af3c2064479e71c95 Mon Sep 17 00:00:00 2001 +From 94ba6e5a623a81ee02f6b7a46b7e82f4ea505f4f Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 2 Jun 2017 18:28:10 +0200 -Subject: [PATCH 10/33] Don't try to use debug version of D-Bus library +Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library Required for a debug build of Qt because mingw-w64-dbus does not contain debug version @@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.json b/configure.json -index 55c56369ba..9914bf0487 100644 +index 108619634c..d668ce0c98 100644 --- a/configure.json +++ b/configure.json @@ -184,7 +184,7 @@ @@ -25,5 +25,5 @@ index 55c56369ba..9914bf0487 100644 }, "condition": "config.win32 && features.shared" -- -2.14.2 +2.15.1 diff --git a/0011-Fix-linking-against-static-freetype2.patch b/0011-Fix-linking-against-static-freetype2.patch index aa7a66d490f9..a45279cf6c23 100644 --- a/0011-Fix-linking-against-static-freetype2.patch +++ b/0011-Fix-linking-against-static-freetype2.patch @@ -1,17 +1,17 @@ -From e7e7c7500e07d5d1eaa69550ac6c760e55e857a4 Mon Sep 17 00:00:00 2001 +From 6e4e751d6f39c6869cacb6d4148f5358f58bb54e Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 20:51:19 +0100 -Subject: [PATCH 11/33] Fix linking against static freetype2 +Subject: [PATCH 11/34] Fix linking against static freetype2 --- src/gui/configure.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 7e9148500b..27f8257c18 100644 +index 4ca919c6da..5d524b1d73 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -156,8 +156,11 @@ +@@ -158,8 +158,11 @@ ] }, "sources": [ @@ -26,5 +26,5 @@ index 7e9148500b..27f8257c18 100644 }, "fontconfig": { -- -2.14.2 +2.15.1 diff --git a/0012-Fix-linking-against-static-harfbuzz.patch b/0012-Fix-linking-against-static-harfbuzz.patch index 91364f8ce46b..71e2a90be7af 100644 --- a/0012-Fix-linking-against-static-harfbuzz.patch +++ b/0012-Fix-linking-against-static-harfbuzz.patch @@ -1,17 +1,17 @@ -From 38b3a06ebd65bab1765c95537eb8503286e31754 Mon Sep 17 00:00:00 2001 +From e05dcf0fb89c0ab64aba0f3a53986daa6a0bed76 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:22:56 +0200 -Subject: [PATCH 12/33] Fix linking against static harfbuzz +Subject: [PATCH 12/34] Fix linking against static harfbuzz --- src/gui/configure.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 27f8257c18..1a87110831 100644 +index 5d524b1d73..78f1b90d37 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -221,7 +221,11 @@ +@@ -223,7 +223,11 @@ ] }, "sources": [ @@ -25,5 +25,5 @@ index 27f8257c18..1a87110831 100644 }, "imf": { -- -2.14.2 +2.15.1 diff --git a/0013-Fix-linking-against-static-pcre.patch b/0013-Fix-linking-against-static-pcre.patch index 0bdd68d8748b..6e3e18c9c9eb 100644 --- a/0013-Fix-linking-against-static-pcre.patch +++ b/0013-Fix-linking-against-static-pcre.patch @@ -1,7 +1,7 @@ -From f5a1650b08d90f854b1b8eb12c0e6b9a5c3f5cc4 Mon Sep 17 00:00:00 2001 +From 9e7f8734086cc4a2dd7f6e713076af64648802f7 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:24:01 +0200 -Subject: [PATCH 13/33] Fix linking against static pcre +Subject: [PATCH 13/34] Fix linking against static pcre Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1 --- @@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1 1 file changed, 4 insertions(+) diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp -index 88b696f53a..afe444027e 100644 +index 86bc99716d..5037ae68a1 100644 --- a/src/corelib/tools/qregularexpression.cpp +++ b/src/corelib/tools/qregularexpression.cpp @@ -55,6 +55,10 @@ @@ -24,5 +24,5 @@ index 88b696f53a..afe444027e 100644 #include <pcre2.h> -- -2.14.2 +2.15.1 diff --git a/0014-Fix-linking-against-shared-static-MariaDB.patch b/0014-Fix-linking-against-shared-static-MariaDB.patch index 402f1dd8f821..6185fe92e7cf 100644 --- a/0014-Fix-linking-against-shared-static-MariaDB.patch +++ b/0014-Fix-linking-against-shared-static-MariaDB.patch @@ -1,7 +1,7 @@ -From a1d177d63fb62d1bb77225fd90c5eb2883322a26 Mon Sep 17 00:00:00 2001 +From 8d8e5c1df2e366ba3c595970813caf98768a140f Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:56:55 +0200 -Subject: [PATCH 14/33] Fix linking against shared/static MariaDB +Subject: [PATCH 14/34] Fix linking against shared/static MariaDB Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b --- @@ -23,5 +23,5 @@ index 234f880579..4619db4a54 100644 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.14.2 +2.15.1 diff --git a/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/0015-Fix-linking-against-shared-static-PostgreSQL.patch index ec7e9178c4e2..abe072c4103b 100644 --- a/0015-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/0015-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,7 +1,7 @@ -From 603ca5161d67e72432128a21478bd623d8b973c2 Mon Sep 17 00:00:00 2001 +From fd736054ec03ad328b1e8c4195184f286655040e Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:58:25 +0200 -Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL +Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL --- src/plugins/sqldrivers/configure.json | 5 +++-- @@ -25,5 +25,5 @@ index 4619db4a54..ef0d45f6cc 100644 ] }, -- -2.14.2 +2.15.1 diff --git a/0016-Rename-qtmain-to-qt5main.patch b/0016-Rename-qtmain-to-qt5main.patch index a2a5d38761f6..26b8cf2fec5b 100644 --- a/0016-Rename-qtmain-to-qt5main.patch +++ b/0016-Rename-qtmain-to-qt5main.patch @@ -1,7 +1,7 @@ -From eed57ae8b6b9a2a8a6183751f08f16c9921bf32b Mon Sep 17 00:00:00 2001 +From 15f3d49456695caeb91f1e861730883aea04ca5f Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:25:40 +0200 -Subject: [PATCH 16/33] Rename qtmain to qt5main +Subject: [PATCH 16/34] Rename qtmain to qt5main Prevents conflict with mingw-w64-qt4 package --- @@ -52,5 +52,5 @@ index 4140ae48de..9ae73db74b 100644 CONFIG += static -- -2.14.2 +2.15.1 diff --git a/0017-Build-dynamic-host-libraries.patch b/0017-Build-dynamic-host-libraries.patch index 2f2262c1b1b5..184aff917451 100644 --- a/0017-Build-dynamic-host-libraries.patch +++ b/0017-Build-dynamic-host-libraries.patch @@ -1,7 +1,7 @@ -From b5a1c1909c58b62705f1ff46adfac40ed26b0f5d Mon Sep 17 00:00:00 2001 +From 366c764b927e568c75968ae92ec16caca54c0d31 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:27:28 +0200 -Subject: [PATCH 17/33] Build dynamic host libraries +Subject: [PATCH 17/34] Build dynamic host libraries This came initially from Fedora, not sure whether it makes sense to keep it. Regular Arch package @@ -14,7 +14,7 @@ Change-Id: I91a3613955c656fb0d262ccb9b2529350bab032b 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 36f632e8ca..2deec56866 100644 +index c0a8dcc251..200fa40840 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -24,7 +24,7 @@ requires(!$$skip) @@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644 -INSTALLS = lib +INSTALLS += lib -- -2.14.2 +2.15.1 diff --git a/0018-Enable-rpath-for-build-tools.patch b/0018-Enable-rpath-for-build-tools.patch index 4740f5c0ab64..c8636ff4222f 100644 --- a/0018-Enable-rpath-for-build-tools.patch +++ b/0018-Enable-rpath-for-build-tools.patch @@ -1,7 +1,7 @@ -From 7b40a97b618dda07f6e9fdaf28db958c0f5b33fc Mon Sep 17 00:00:00 2001 +From b6dfc4016e7f61c1eb178b051387b08219652484 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 17:59:27 +0200 -Subject: [PATCH 18/33] Enable rpath for build tools +Subject: [PATCH 18/34] Enable rpath for build tools - Required because various tools depend on libQt5Bootstrap.so which resides in folder /usr/${_arch}/lib @@ -33,5 +33,5 @@ index 883f8ca215..786f2e660c 100644 INSTALLS += target -- -2.14.2 +2.15.1 diff --git a/0019-Use-system-zlib-for-build-tools.patch b/0019-Use-system-zlib-for-build-tools.patch index 834f8cccf203..e76fce8a0042 100644 --- a/0019-Use-system-zlib-for-build-tools.patch +++ b/0019-Use-system-zlib-for-build-tools.patch @@ -1,17 +1,17 @@ -From 25849eed06ade33131bb0dfa2bdb3e890b2e9ee7 Mon Sep 17 00:00:00 2001 +From 012d6961a9ffbaeabf1742243b23ee092b915af2 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:04:42 +0200 -Subject: [PATCH 19/33] Use system zlib for build tools +Subject: [PATCH 19/34] Use system zlib for build tools --- src/tools/bootstrap/bootstrap.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro -index 521dd5f0f2..eb8cb4770c 100644 +index 042ad7adb9..7e3bc3977a 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro -@@ -129,7 +129,7 @@ macx { +@@ -132,7 +132,7 @@ macx { ../../corelib/io/qstandardpaths_win.cpp } @@ -21,5 +21,5 @@ index 521dd5f0f2..eb8cb4770c 100644 } else { CONFIG += no_core_dep -- -2.14.2 +2.15.1 diff --git a/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch b/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch index ff40a8085b48..cf2e1d82be56 100644 --- a/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch +++ b/0020-Disable-determing-default-include-and-lib-dirs-at-qm.patch @@ -1,7 +1,7 @@ -From 98a2adad712fb0c23ad2813e1a35a793317461ad Mon Sep 17 00:00:00 2001 +From 81a6a9a34e71a08fd5a8b87f44c71803d7f07797 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:20:25 +0200 -Subject: [PATCH 20/33] Disable determing default include and lib dirs at qmake +Subject: [PATCH 20/34] Disable determing default include and lib dirs at qmake time when building with mingw-w64 --- @@ -9,7 +9,7 @@ Subject: [PATCH 20/33] Disable determing default include and lib dirs at qmake 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf -index 35175f1744..96afeeca57 100644 +index ba41598be1..6416db4d58 100644 --- a/mkspecs/features/toolchain.prf +++ b/mkspecs/features/toolchain.prf @@ -31,7 +31,7 @@ isEmpty($${target_prefix}.INCDIRS) { @@ -18,9 +18,9 @@ index 35175f1744..96afeeca57 100644 # - gcc { + !win32:gcc { - !equals(QMAKE_HOST.os, Windows) { - cmd_prefix = "LC_ALL=C" - cmd_suffix = "</dev/null >/dev/null" + cmd_suffix = "<$$QMAKE_SYSTEM_NULL_DEVICE >$$QMAKE_SYSTEM_NULL_DEVICE" + equals(QMAKE_HOST.os, Windows): \ + cmd_prefix = "set LC_ALL=C&" -- -2.14.2 +2.15.1 diff --git a/0021-Use-.dll.a-as-import-lib-extension.patch b/0021-Use-.dll.a-as-import-lib-extension.patch index b3f9e5dc11f0..4f2ee4c6fb6d 100644 --- a/0021-Use-.dll.a-as-import-lib-extension.patch +++ b/0021-Use-.dll.a-as-import-lib-extension.patch @@ -1,7 +1,7 @@ -From 5cb315e62e7c4114d62767c274952c58ebe88b06 Mon Sep 17 00:00:00 2001 +From 834b94ccb1897cd5325557fa6051ef2cb4bb70a0 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:26:18 +0200 -Subject: [PATCH 21/33] Use *.dll.a as import lib extension +Subject: [PATCH 21/34] Use *.dll.a as import lib extension The variables used here are provided by mingw-w64 specific mkspec @@ -64,5 +64,5 @@ index 737f3abc3a..2e6d5d94a9 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.14.2 +2.15.1 diff --git a/0022-Merge-shared-and-static-library-trees.patch b/0022-Merge-shared-and-static-library-trees.patch index c2c02d585df6..44d0bcb3b172 100644 --- a/0022-Merge-shared-and-static-library-trees.patch +++ b/0022-Merge-shared-and-static-library-trees.patch @@ -1,7 +1,7 @@ -From 0401a8dd7051a1d6aca6288fd5a5d0bef006168e Mon Sep 17 00:00:00 2001 +From 4502d0a9e9102067541a4307e80444a4fb44717c Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:45:08 +0200 -Subject: [PATCH 22/33] Merge shared and static library trees +Subject: [PATCH 22/34] Merge shared and static library trees Allow installation of shared and static build in the same prefix --- @@ -99,7 +99,7 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index c7e075b5bc..d61f7b05e5 100644 +index 0d07d6c333..5e84628e72 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -3163,6 +3163,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) @@ -126,5 +126,5 @@ index c7e075b5bc..d61f7b05e5 100644 t << endl; -- -2.14.2 +2.15.1 diff --git a/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index 2fd999f636c3..bf2ec7ba4e34 100644 --- a/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/0023-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,7 +1,7 @@ -From 6e0b658e5cadf0248954fbbf1b8271d54b9778a2 Mon Sep 17 00:00:00 2001 +From f73b460094294c7cd9f9d9cd481fbf1cef5a2a49 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:32:00 +0200 -Subject: [PATCH 23/33] Pull dependencies of static libraries in CMake modules +Subject: [PATCH 23/34] Pull dependencies of static libraries in CMake modules When doing a static build of Qt, the dependencies of the Qt libraries and plugins itself must be specified when linking @@ -251,7 +251,7 @@ index 5baf0fdb10..ec5f3cc437 100644 + +endif() diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index d61f7b05e5..2dd26bf4dd 100644 +index 5e84628e72..c853d52b27 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -998,6 +998,13 @@ MakefileGenerator::writePrlFile(QTextStream &t) @@ -269,5 +269,5 @@ index d61f7b05e5..2dd26bf4dd 100644 } -- -2.14.2 +2.15.1 diff --git a/0024-Allow-usage-of-static-version-with-CMake.patch b/0024-Allow-usage-of-static-version-with-CMake.patch index 0e9f97715b1c..c4e60933da7d 100644 --- a/0024-Allow-usage-of-static-version-with-CMake.patch +++ b/0024-Allow-usage-of-static-version-with-CMake.patch @@ -1,7 +1,7 @@ -From eec4b8a76d8c5882a5fbd4e6aa85dea696049c23 Mon Sep 17 00:00:00 2001 +From 903ed5730e5a25ea6fda815fcd88cc36e3d8639e Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sat, 5 Aug 2017 21:14:26 +0200 -Subject: [PATCH 24/33] Allow usage of static version with CMake +Subject: [PATCH 24/34] Allow usage of static version with CMake Allow selecting between dynamic and static Qt versions installed in the same prefix @@ -997,5 +997,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.14.2 +2.15.1 diff --git a/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index b9f81f22f439..02432029f991 100644 --- a/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/0025-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,7 +1,7 @@ -From 0aac929861fb8d60fbc66f2557e1b9c5022ff9c5 Mon Sep 17 00:00:00 2001 +From b3bcf57cfbd152eafa82b9d80183fde0f2bf1f5c Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 2 Jun 2017 16:42:07 +0200 -Subject: [PATCH 25/33] Adjust linker flags for static build with +Subject: [PATCH 25/34] Adjust linker flags for static build with cmake/mingw-w64 Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d @@ -25,5 +25,5 @@ index ebe6644dfe..687d611b3f 100644 +unset(_isExe) +!!ENDIF -- -2.14.2 +2.15.1 diff --git a/0026-Use-correct-pkg-config-static-flag.patch b/0026-Use-correct-pkg-config-static-flag.patch index 15c749e6f830..36498bf76573 100644 --- a/0026-Use-correct-pkg-config-static-flag.patch +++ b/0026-Use-correct-pkg-config-static-flag.patch @@ -1,7 +1,7 @@ -From f2ff6d5023bd834b0110a97a16e085c3914335a7 Mon Sep 17 00:00:00 2001 +From 1e31f372966581f19bcbd9a39b29cf3dedfe9c5a Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:50:21 +0200 -Subject: [PATCH 26/33] Use correct pkg-config --static flag +Subject: [PATCH 26/34] Use correct pkg-config --static flag --- configure.pri | 3 +++ @@ -22,5 +22,5 @@ index a05c3d98e6..8dc874a74d 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.14.2 +2.15.1 diff --git a/0027-Fix-macro-invoking-moc-rcc-and-uic.patch b/0027-Fix-macro-invoking-moc-rcc-and-uic.patch index a85082513463..3b75e8873772 100644 --- a/0027-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/0027-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,7 +1,7 @@ -From 4f332ea7f376d8a77d7dbfe82ab6e5eb6b6f1fe9 Mon Sep 17 00:00:00 2001 +From 0f6a4852f4bf5d43aa856f2af475f5f526b76daf Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 4 Dec 2016 20:35:47 +0100 -Subject: [PATCH 27/33] Fix macro invoking moc, rcc and uic +Subject: [PATCH 27/34] Fix macro invoking moc, rcc and uic * Otherwise the arguments aren't passed correctly leading to errors like ``` @@ -70,5 +70,5 @@ index f5e7b7f050..18d120f0c7 100644 MAIN_DEPENDENCY ${infile} VERBATIM) list(APPEND ${outfiles} ${outfile}) -- -2.14.2 +2.15.1 diff --git a/0028-Ignore-errors-about-missing-feature-static.patch b/0028-Ignore-errors-about-missing-feature-static.patch index 104d9c209539..803dfe380f09 100644 --- a/0028-Ignore-errors-about-missing-feature-static.patch +++ b/0028-Ignore-errors-about-missing-feature-static.patch @@ -1,7 +1,7 @@ -From a8039e2f388a3fbd289dc912ae6b6a58beb84f19 Mon Sep 17 00:00:00 2001 +From 80964e61f1442f4566b6cb1d4a08231ea5942133 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 20:59:54 +0100 -Subject: [PATCH 28/33] Ignore errors about missing feature static +Subject: [PATCH 28/34] Ignore errors about missing feature static Not sure why this error occurs, let's hope for the best --- @@ -10,10 +10,10 @@ Not sure why this error occurs, let's hope for the best 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf -index 150d2b2cc3..d93d24cce5 100644 +index 76e1d15319..9a1c5cd8b6 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf -@@ -135,5 +135,5 @@ defineTest(qtConfig) { +@@ -138,5 +138,5 @@ defineTest(qtConfig) { contains(QT.$${module}.disabled_features, $$1): \ return(false) } @@ -21,10 +21,10 @@ index 150d2b2cc3..d93d24cce5 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index c00fdb73f8..d4d5599433 100644 +index 1903e509c8..1fcb597fa3 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf -@@ -351,5 +351,5 @@ defineTest(qtConfig) { +@@ -348,5 +348,5 @@ defineTest(qtConfig) { contains(QT.$${module}.disabled_features, $$1): \ return(false) } @@ -32,5 +32,5 @@ index c00fdb73f8..d4d5599433 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.14.2 +2.15.1 diff --git a/0029-Enable-and-fix-use-of-iconv.patch b/0029-Enable-and-fix-use-of-iconv.patch index ddffbea33f93..128a1cf39cbf 100644 --- a/0029-Enable-and-fix-use-of-iconv.patch +++ b/0029-Enable-and-fix-use-of-iconv.patch @@ -1,7 +1,7 @@ -From 05738e526362a5c712d8341ada02e557e76579f5 Mon Sep 17 00:00:00 2001 +From 3a5569599bd8c5267e41c57917b19e16bba1169c Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 21:08:20 +0100 -Subject: [PATCH 29/33] Enable and fix use of iconv +Subject: [PATCH 29/34] Enable and fix use of iconv Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c --- @@ -63,10 +63,10 @@ index d6362b6fbc..4da4546a24 100644 #else char **inBytesPtr = &inBytes; diff --git a/src/corelib/configure.json b/src/corelib/configure.json -index a5b69a2df6..9e3eb4f671 100644 +index bf44f2649d..90f0450902 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json -@@ -428,9 +428,9 @@ +@@ -521,9 +521,9 @@ }, "gnu-libiconv": { "label": "GNU iconv", @@ -79,5 +79,5 @@ index a5b69a2df6..9e3eb4f671 100644 }, "icu": { -- -2.14.2 +2.15.1 diff --git a/0030-Ignore-failing-pkg-config-test.patch b/0030-Ignore-failing-pkg-config-test.patch index cc89a8e378bf..4c8cc8f885ec 100644 --- a/0030-Ignore-failing-pkg-config-test.patch +++ b/0030-Ignore-failing-pkg-config-test.patch @@ -1,7 +1,7 @@ -From f99af5483b8c3d8b511db8476f4d738ff868886c Mon Sep 17 00:00:00 2001 +From e9f964d079c6dea6404f01d0d8f1acfa5287ccdc Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 21:08:48 +0100 -Subject: [PATCH 30/33] Ignore failing pkg-config test +Subject: [PATCH 30/34] Ignore failing pkg-config test Didn't investigate why it fails, let's hope for the best --- @@ -9,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best 1 file changed, 1 deletion(-) diff --git a/configure.json b/configure.json -index 9914bf0487..d5b81d53f5 100644 +index d668ce0c98..2d36a60cd3 100644 --- a/configure.json +++ b/configure.json -@@ -710,7 +710,6 @@ +@@ -725,7 +725,6 @@ "pkg-config": { "label": "Using pkg-config", "autoDetect": "!config.darwin && !config.win32", @@ -21,5 +21,5 @@ index 9914bf0487..d5b81d53f5 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.14.2 +2.15.1 diff --git a/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch index 5fc9df503973..e43494399c81 100644 --- a/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/0031-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,7 +1,7 @@ -From eadf27b8bd882899a99254578ecb8407a0acab6f Mon Sep 17 00:00:00 2001 +From d35384a8d6191d68f8cd2b60a2295f5372d67fa4 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Tue, 7 Feb 2017 18:25:28 +0100 -Subject: [PATCH 31/33] Prevent qmake from messing static lib dependencies +Subject: [PATCH 31/34] Prevent qmake from messing static lib dependencies In particular, it messes resolving cyclic dependency between static freetype2 and harfbuzz @@ -39,5 +39,5 @@ index 2e6d5d94a9..a8320bae09 100644 static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 }; for (int i = 0; lflags[i]; i++) { -- -2.14.2 +2.15.1 diff --git a/0032-Hardcode-linker-flags-for-platform-plugins.patch b/0032-Hardcode-linker-flags-for-platform-plugins.patch index 5562bbf38a4b..3d82dfffc6b8 100644 --- a/0032-Hardcode-linker-flags-for-platform-plugins.patch +++ b/0032-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,18 +1,16 @@ -From f7bb119102d28e22b764cce82ee491e747034247 Mon Sep 17 00:00:00 2001 +From aa947be7429528caf04ad7db6f077fe695bcfe82 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 23:42:30 +0100 -Subject: [PATCH 32/33] Hardcode linker flags for platform plugins +Subject: [PATCH 32/34] Hardcode linker flags for platform plugins Otherwise incorrect order of libs leads to errors when building libqminimal.dll, libqoffscreen.dll and libqwindows.dll - -Change-Id: I594ddcc15599c63bb8ac5e998f59c4561a18eb26 --- - src/plugins/platforms/minimal/minimal.pro | 15 +++++++++++++-- - src/plugins/platforms/offscreen/offscreen.pro | 14 ++++++++++++-- - src/plugins/platforms/windows/windows.pro | 19 +++++++++++++++---- - 3 files changed, 40 insertions(+), 8 deletions(-) + src/plugins/platforms/minimal/minimal.pro | 15 +++++++++++-- + src/plugins/platforms/offscreen/offscreen.pro | 14 ++++++++++-- + src/plugins/platforms/windows/windows.pro | 32 +++++++++++++++++++-------- + 3 files changed, 48 insertions(+), 13 deletions(-) diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro index 8cfb68824e..46834a71fc 100644 @@ -66,36 +64,47 @@ index 6652cefd86..a322b17cc5 100644 DEFINES += QT_NO_FOREACH diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro -index 23168c10dc..eb4af726ca 100644 +index 174bc7b609..e66488e364 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro -@@ -1,11 +1,22 @@ +@@ -1,14 +1,28 @@ TARGET = qwindows - QT += \ +-QT += \ - core-private gui-private \ -- eventdispatcher_support-private accessibility_support-private \ +- eventdispatcher_support-private \ - fontdatabase_support-private theme_support-private -+ core-private gui-private - +- +-qtConfig(accessibility): QT += accessibility_support-private +-qtConfig(vulkan): QT += vulkan_support-private +- -LIBS += -lgdi32 -ldwmapi ++QT += core-private gui-private ++ +# Fix linker error when building libqwindows.dll by specifying linker flags for +# required modules manually (otherwise order is messed) +LIBS += \ + -lQt5EventDispatcherSupport \ -+ -lQt5AccessibilitySupport \ + -lQt5FontDatabaseSupport \ + -lQt5ThemeSupport \ + -lfreetype -lole32 -lgdi32 -ldwmapi +# However, this workaround leads to the necessity of specifying include dirs manually +INCLUDEPATH += \ + $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION} \ -+ $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION} \ + $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION} \ + $$QT_SOURCE_TREE/include/QtThemeSupport/$${QT_VERSION} ++# Same for private support libs for accessibility and vulkan, if those are enabled ++qtConfig(accessibility) { ++ LIBS += -lQt5AccessibilitySupport ++ INCLUDEPATH += $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION} ++} ++qtConfig(vulkan) { ++ LIBS += -lQt5VulkanSupport ++ INCLUDEPATH += $$QT_SOURCE_TREE/include/QtVulkanSupport/$${QT_VERSION} ++} include(windows.pri) -- -2.14.2 +2.15.1 diff --git a/0033-Fix-linking-against-static-plugins-with-qmake.patch b/0033-Fix-linking-against-static-plugins-with-qmake.patch index 676a558c8e93..d849f3d800ac 100644 --- a/0033-Fix-linking-against-static-plugins-with-qmake.patch +++ b/0033-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,7 +1,7 @@ -From b91d3a0690995511d1388b9d9493aed702bd0138 Mon Sep 17 00:00:00 2001 +From 7db753e04de6a458fc10124b7e3b12ac5f4d1623 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 25 Aug 2017 17:07:17 +0200 -Subject: [PATCH 33/33] Fix linking against static plugins with qmake +Subject: [PATCH 33/34] Fix linking against static plugins with qmake Required because qtConfig(static) does not work with 'Merge shared and static library trees' @@ -33,5 +33,5 @@ index afaac3dbc4..82b02b5113 100644 # Check if the plugin is known to Qt. We can use this to determine # the plugin path. Unknown plugins must rely on the default link path. -- -2.14.2 +2.15.1 diff --git a/0034-Don-t-use-the-statx-syscall.patch b/0034-Don-t-use-the-statx-syscall.patch new file mode 100644 index 000000000000..56e0ca936512 --- /dev/null +++ b/0034-Don-t-use-the-statx-syscall.patch @@ -0,0 +1,27 @@ +From e8cbf42a882706cce93f46142748d252cb492e1c Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sat, 9 Dec 2017 00:36:56 +0100 +Subject: [PATCH 34/34] Don't use the statx syscall + +Otherwise Qt can not be built in a systemd +container +--- + src/corelib/io/qfilesystemengine_unix.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp +index 77d154c6b4..6036bae4f1 100644 +--- a/src/corelib/io/qfilesystemengine_unix.cpp ++++ b/src/corelib/io/qfilesystemengine_unix.cpp +@@ -95,7 +95,7 @@ static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newp + { return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); } + # endif + +-# if !QT_CONFIG(statx) && defined(SYS_statx) && QT_HAS_INCLUDE(<linux/stat.h>) ++# if 0 + # include <linux/stat.h> + static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf) + { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); } +-- +2.15.1 + @@ -84,7 +84,7 @@ isNoOpenGL() { } pkgname=mingw-w64-qt5-base -pkgver=5.9.2 +pkgver=5.10.0 pkgrel=1 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 @@ -92,14 +92,14 @@ isStatic && arch=('any') || arch=('i686' 'x86_64') url='https://www.qt.io/' license=('GPL3' 'LGPL3' 'FDL' 'custom') depends=('mingw-w64-crt' 'mingw-w64-zlib' 'mingw-w64-libjpeg-turbo' 'mingw-w64-sqlite' - 'mingw-w64-libpng' 'mingw-w64-openssl-1.0' 'mingw-w64-dbus' 'mingw-w64-harfbuzz' + 'mingw-w64-libpng' 'mingw-w64-openssl' 'mingw-w64-dbus' 'mingw-w64-harfbuzz' 'mingw-w64-pcre2') groups=('mingw-w64-qt5') optdepends=('mingw-w64-postgresql: PostgreSQL support' 'mingw-w64-mariadb-connector-c: MySQL support') makedepends=('mingw-w64-gcc' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c' 'mingw-w64-pkg-config') options=('!strip' '!buildflags' 'staticlibs' '!emptydirs') -_pkgfqn="qtbase-opensource-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/submodules/${_pkgfqn}.tar.xz" +_pkgfqn="qtbase-everywhere-src-${pkgver}" +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" '0001-Add-profile-for-cross-compilation-with-mingw-w64.patch' '0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch' '0003-Use-external-ANGLE-library.patch' @@ -132,41 +132,43 @@ source=("https://download.qt.io/official_releases/qt/${pkgver:0:3}/${pkgver}/sub '0030-Ignore-failing-pkg-config-test.patch' '0031-Prevent-qmake-from-messing-static-lib-dependencies.patch' '0032-Hardcode-linker-flags-for-platform-plugins.patch' - '0033-Fix-linking-against-static-plugins-with-qmake.patch') -sha256sums=('7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b' - '685fd08e1c4e97bbf6990959cb3dbe88dd3ed494221400dce6aef159d277c34a' - '4e5115e62b952acface29882c5f6423569cd1c439c454e58594b5fb2cb740916' - '0b339563844ccd325486d78711592561996fb256f0612c63b33b6ea52a6fc77e' - '18945eb521df54d37922894c9bc82ccd03eb3fd9f6e0aed986facf2b49f336d4' - '2c2b5f9b3db02750ae9a9626ea8a24a3516c881c5eaa9b19fb9a2621fc1263fc' - '81559290cc03f7ff6042f28a6eb319882264876076a20e24531641ebe4ef3aee' - 'a3d657ee7f8bfa6c3e5a4aa626710bc27fc82fea3d834098bde2b2f67244d11c' - '3df9bf81a936c737cc7ca53bdea9cfd2a4010fa190fe3e1a45611097d8213ef4' - '5aac41daaf223726d31ab5a7aec0bdc050aa182522ca732cc31c3b5ac8cd28dc' - '6844b7106e636d513b077edeba318990641b1ee294f2a70739830e3d0a9b0d02' - '12b51c32069270e49e05e64b0f54d6e3e871523660fd17673e0ee6e67206955e' - '4baa73f8b3d61b503a9de1437bdc9f7f84cd2443280afc1461456ae34d222e9b' - 'e34eec672f9f681302edd809cbcb7d6848a310a02acc5711e2e348aab1b8d74c' - 'd70f44c06a7bae6fbd91022ec79f09e2d658969aa5a6602bff6eb61076801b6e' - 'f705fcfe1f552536318c2c63d59e5ec95640321d9f1fff1016a34d1bc862c9df' - '60034cce435d3eca60906e4af2f1ad55edd12b4e95ccc9905e793bc7b9d66917' - '295c307f6b075b0c20b7d714b6ecff1bc25927b80dd60d725052b4bc05d1b055' - '37c2d0bce780a15e7bdb477324936b1ae0ebe576c64d3a713a9086586518d50a' - '36b6a2e1d2bf478746e931da5223dcfeffc5eda513b64596ffbbd663fd5e63e7' - 'e1b45c50ca09b065f218442a1fc3ddf3c8de1357a818925497fe0e3e7c28cacd' - '03feabae42553a6960c2a257eb951d956fe31a9a4440a92b373e8a0d6cb301ff' - '1ec8a7ebaf5e400aca7a0abe8cee78d0dae6b662c30bf245b81814cfcd048dd3' - 'bc2f049471853a6bb2e83de3c2691a4206d55c7fe018bb7910215e9968759082' - '8611ac15ee36b803b5095466509c57d45532ab017d61513f2be7b34d5c13da0f' - 'f999f20131f0180439b59320ab350a284b169e5ee5e21379fa74dc07d4aeda25' - 'd9fed680c0313c89458361ac253a5710379fa8022c7c24b05d2807ecaf4f803a' - 'd263509d7951f12d9ccfa841cd7f205aebc7b9db28913925b65a23e627258023' - '092176255153bae63f779833d25e5f64a2c489a1b6f33e8e158ff59629916b36' - '65023b59b41797281876b5fcd8cb1542ad790b9b6f83125b6b0aa1e02d9de4fb' - '3d5202be8837bccab4dedc9b6f10b3722ca57ea8b663e08b55d0235381397508' - '4df4c2ad348c13a3b82c3a9b127464492898379a82dfd6db9d3ff9d051a08dab' - 'cfa48754bef9f7a95f1350c0c1ec1699c9dc413013ef78d218206f5d60335823' - '135123e630efdbeb6d4edc9bc200754f2c881760652fe5152f0903ae238ce2c9') + '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') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -232,8 +234,6 @@ build() { unset PKG_CONFIG_PATH for _arch in ${_architectures}; do - echo "INCLUDEPATH += /usr/${_arch}/include/openssl-1.0" >> src/network/network.pro - # To prevent conflicts with the mingw-w64-qt4 package we have # to put tools in a dedicated folder @@ -314,22 +314,26 @@ build() { # Fix MariaDB qt_configure_args+=" -I/usr/${_arch}/include/mariadb" + msg2 'Configure and build qmake' mkdir -p ../build-${_arch} && pushd ../build-${_arch} if isStatic; then - export OPENSSL_LIBS="/usr/${_arch}/lib/openssl-1.0/libssl.a /usr/${_arch}/lib/openssl-1.0/libcrypto.a -lws2_32 -lgdi32 -lcrypt32" + export OPENSSL_LIBS="/usr/${_arch}/lib/libssl.a /usr/${_arch}/lib/libcrypto.a -lws2_32 -lgdi32 -lcrypt32" ../${_pkgfqn}/configure \ $qt_configure_args \ -static \ -openssl-linked + msg2 'Build static Qt libraries' make else # The LD_LIBRARY_PATH override is needed because libQt5Bootstrap* are shared # libraries which various compiled tools (like moc) use. As the libQt5Bootstrap* # libraries aren't installed at this point yet, we have to workaround this - ../${_pkgfqn}/configure $qt_configure_args \ + ../${_pkgfqn}/configure \ + $qt_configure_args \ -shared \ -openssl-runtime \ -device-option 'CROSS_COMPILE_CUSTOM_CONFIG=actually_a_shared_build' + msg2 'Build shared Qt libraries' LD_LIBRARY_PATH="$PWD/lib" LDFLAGS="-L$PWD/lib" make fi popd @@ -351,6 +355,7 @@ package() { "${pkgdir}/usr/${_arch}/lib/"{lib,}qt5main* \ "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5AccessibilitySupport* \ "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5DeviceDiscoverySupport* \ + "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5EdidSupport* \ "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5EventDispatcherSupport* \ "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5FbSupport* \ "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5FontDatabaseSupport* \ |