diff options
36 files changed, 246 insertions, 276 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-qt5-base pkgdesc = A cross-platform application and UI framework (mingw-w64) - pkgver = 5.11.1 + pkgver = 5.11.2 pkgrel = 1 url = https://www.qt.io/ arch = i686 @@ -29,7 +29,7 @@ pkgbase = mingw-w64-qt5-base options = !buildflags options = staticlibs options = !emptydirs - source = https://download.qt.io/official_releases/qt/5.11/5.11.1/submodules/qtbase-everywhere-src-5.11.1.tar.xz + source = https://download.qt.io/official_releases/qt/5.11/5.11.2/submodules/qtbase-everywhere-src-5.11.2.tar.xz source = 0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch source = 0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch source = 0003-Use-external-ANGLE-library.patch @@ -63,42 +63,40 @@ pkgbase = mingw-w64-qt5-base source = 0031-Hardcode-linker-flags-for-platform-plugins.patch source = 0032-Fix-linking-against-static-plugins-with-qmake.patch source = 0033-Disable-hardware-randomizer-for-32-bit.patch - source = 0034-Fix-build-error-related-to-glibc-2.28-and-stat.patch - sha256sums = a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46 - sha256sums = 6e929b114e4a69fec480db4e78a39c2e95a88e76b88b1743863013e9f4bd1b0b - sha256sums = f0bb44995308af295a9847b2f796dc938d4e4673dbd422616cb890a1ad559ade - sha256sums = bb81e37b265140e99c8ed01acadd93ba533757f98cc38452309aca4de74fc957 - sha256sums = 5a7eff8dd3312a62b3f1606358e74fa8d4e5b118796299afbd334bff159f3659 - sha256sums = 857650169e6c7f96aeb835c7c622ff67034a19cc295f7724498c95c49a6d0b79 - sha256sums = b56639a777db979145b26cb39dcba15d7b6f52178cc94373be637ec026db23b7 - sha256sums = 87ad586b648f3fd9c24f9794f0926ca3a3b78d62c544dcbfc1f80c89ad51dbbf - sha256sums = cd2d25b8c036a967624d46dcbe9f04b323678fa72855c11c2bf307d713b32aad - sha256sums = 1223e502f6700f6d428920bf0cb103eba03f8b253f43d9cd9dfd2b8e1c4974bc - sha256sums = d9c0de2a86939bfa19c69b31a8165d4553dc4afdbbe60f9dce8ca1e030b96e51 - sha256sums = 0e5462994dcaf9b3d879b4ef562c12ecb2462b325e5026486ae6c29a83975e07 - sha256sums = 75fd2a29acc8e06bdd46a18018c81f0cb4816947ebd8ff8b8c76a633855c60d1 - sha256sums = 88f0f909022c7a3be8df0f4597ad36681a73d3be40a848061fa17d23641263ad - sha256sums = c413a032bbf1e0de0ac722cb7213cc1e21ef36797d23fd12604a843c9a9cfcd8 - sha256sums = 564ca84a3c7bdc12aab2edca084850fec3104ea9dba053127c754dd463010283 - sha256sums = 3191b4c924af232ac5c3db8e2b670868107837ff39541451806731fd88c44877 - sha256sums = 9eeaeb84fc650f6fa54b66d45a67a1922b9d363c40d749aa0fb0925d0a190110 - sha256sums = 62d8b373f074c3d0f440cb35f464b98a283b28c57551b921d7f464b86f95902c - sha256sums = 17a17bea14fedbffc011334f5298e3b3da6be90d26635982aa9027d0f9be8d5c - sha256sums = b43c3b5e7e071854ba0249b38ea8e7e543e3be3a604dfb700baad752c5722967 - sha256sums = 6097ff39d3996d1c7832a2fa4fbdd67728bf1014083db7c145c9585579d79a95 - sha256sums = dc79f6449d4aa5c3be57cfcff975f5573017c69c49785fc124d37837e8704e02 - sha256sums = 6ff9bdee5dfc958b38b5063d1f1cf082a5950d00479f70fd5905ff9b5e53acc1 - sha256sums = 339139a569c951c75e6db12754f8629b392d1b4c410718f068a8ad1cf63c2ff4 - sha256sums = 5db30dd7615347286975f50911e9c0aa567733107069d96c484f414c9eb0d06d - sha256sums = 45fba6b70852c8ddfc1793d7d661788ccad23468a276617e13566efce2993e5f - sha256sums = 9199a5fe3eccca581df6513ff9167bfbfaa7e9b3ff787a0803da543a37ff054b - sha256sums = 28a30fd468eedcb08d70df65c670a8b5713898f64c2fe4985f93694441543b39 - sha256sums = b8fae2d545997d1cdfab3688d7dec42e7606de493a1eb8ff118d6d56b3000440 - sha256sums = d1c83496e0139fbc3aa167238296dd5bfe08adf645549bffeaf9bbb3a40ceaf0 - sha256sums = 2cbabbad04e7a1ddaffb2d3e968814dac875dc070ed63b90181905e3dd0351de - sha256sums = 84528256f371719d0a8a68628392a6f3f37ca3d9353a746114a9bc7d4732728b - sha256sums = 9af2a3650bf3141d4fb042f00b2067a43069a72e5f75ea2f37d90730089f5e44 - sha256sums = d354ab15d7475e2df989d969990ddd415da62423b4af731946e8c3c7ab496d07 + sha256sums = 6381e7c3468d5a1dcfe3683b29eeced192faa0f8a32434fec071a59b8bcd0107 + sha256sums = 3036fb04baa54d010dce053059dd780322f1d2925d42bdb6d9762539b1581e62 + sha256sums = 0861dc21d857eeddbc992f63f66590baade93e049b1ea385a34b8896e231cbd0 + sha256sums = cff8b6b146bc20faaa1f7dc25e88f6f3dd71657d2b80d5b3b15c0949026fc4aa + sha256sums = 76ea9cd3ab0d9308fb57bff0bd82490ec3da95e3e5f96d452fe62206daff300d + sha256sums = 626790dc110b0c70989e57dbdb42dd1cc5757c2360d6e7714624fbdee6e8dae1 + sha256sums = 96d94a7aae914f3706a820ad074bbd32e884154c1bebba3f3e631920fe0fbd59 + sha256sums = 6bbdf39b2682002d4f4972b395f49d17acee607f92df00734faf53c4930de2d9 + sha256sums = 3c1df53016e40b00dbe8ef132b50730fadf412534135a114628612f4c55fe6b7 + sha256sums = 02966be361050075382e3a3ad83e4eb13d7b135aadb95d43b2bde443c39506aa + sha256sums = 230e4bf22051a79d36285178c8e294e479e81a5480d8791b53ab090a87b8d5e7 + sha256sums = 7f6a16f8d2108bc96b58a1fcb695da342f71bd47de24f5b20b9412319e4e35ad + sha256sums = 49a6571dca2333c04658f47e7f0971ffaa45d8c8664cc7dded63d8f29b80bfb2 + sha256sums = 32333bd89e86efba6333897f77dbd61464ea8130013248b37c5927eb3c79efdc + sha256sums = 4b7c018cc7335639df7b3819132d5d32906a5fa0796c2caf4428993f16697882 + sha256sums = a6086ef73d1b2ac079b06f2ce1059458af1f033efa7a2e5e684c97d64d418296 + sha256sums = 82787b2bac35de3992bb36816ee0bd30117a3e8679d0cffc2aabe7c551c5f4cb + sha256sums = dcee7f38ce40aec00e8ecce72b9a3c07e6d0bf838049c4bbb80f33448e34038b + sha256sums = 49b332039ef6ba074c58fd7149df70003a7e69c61ed1519df6a0f16635848843 + sha256sums = c345fd741f71c9e728ea88e4c86640c522d7cc0c9f0e39cee5812a2ea41c51e5 + sha256sums = 55ffc1bc12d449cb80fa5be4891e4ebdba4a41c62a5953b13dfc8fb75c153de4 + sha256sums = af990f18952df3372f42112f68f13ceab9a46feb50c115ea548b44822b841e29 + sha256sums = 843e78560e7d09b86979f928e16d1ed56595d6f660d4dc95d4888a56978b9d43 + sha256sums = c8fc2495f4d99d460020c362dbf78e6faba2c60c65580f8d06f59fe6e85d7e19 + sha256sums = 0be553d337ecc23b1a1bc8df019beaa300b3e0d0bffa8d68e6401f5cbfa79b21 + sha256sums = 03ff8e2ca617a5852ce9b0c99eab6c5866e00c5099e62e4c583af6e68b03c076 + sha256sums = 3e6d0ed72cf9817dd7508b5403c1bbbdde91f6a59725c8e5250abe8fc66b5a03 + sha256sums = 16fd7e1dc7afb830d984b1d6c112c632e4190f610cdee48d36bd0313e1c19634 + sha256sums = d28476f714a02671acaa02ce0c3a462efd2917aa02d9add004e1d5935f795e76 + sha256sums = 4cbaddd05144010a681d370573d98130af909adedbc761728d0842af3be84a1d + sha256sums = 9bf58d9378fcdd5a1af5e272f2ef19c3b2ec6b020bcb2b78ec808e7adcc8f032 + sha256sums = ca1b066b22af17192b59ce7f0ca3a83bda7c6a8c7f023537c37c1b5c4a388984 + sha256sums = d33e97f491ec8773922ccdd9df25ef3f532c00edf48bab858cef99a60edcf8fe + sha256sums = 550082fea34c12c9df92c73ac1c7ae23ee7ef454799403fda0d495f5d8d92be4 pkgname = mingw-w64-qt5-base diff --git a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch index 7a3d6c47082e..d27207b62aaa 100644 --- a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch +++ b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch @@ -1,7 +1,7 @@ -From 955c44726565654efbf8099a66b1e3b23e2d41df Mon Sep 17 00:00:00 2001 +From 2658fe5a2166aa8893701e65e71dd7bdb16d9180 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 18:30:51 +0100 -Subject: [PATCH 01/34] Adjust win32-g++ profile for cross compilation with +Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with mingw-w64 Adding a new, separate mkspec instead of patching the existing one @@ -19,7 +19,7 @@ Also see the following issues: 3 files changed, 40 insertions(+), 21 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index 610503379d..e747ef16af 100644 +index f0df324b64..48d1c49d44 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -8,18 +8,24 @@ @@ -42,10 +42,10 @@ index 610503379d..e747ef16af 100644 MAKEFILE_GENERATOR = MINGW QMAKE_PLATFORM = win32 mingw -CONFIG += debug_and_release debug_and_release_target precompile_header --DEFINES += UNICODE _UNICODE WIN32 +-DEFINES += UNICODE _UNICODE WIN32 MINGW_HAS_SECURE_API=1 -QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32 +CONFIG += debug_and_release debug_and_release_target precompile_header $${CROSS_COMPILE_CUSTOM_CONFIG} -+DEFINES += UNICODE _UNICODE ++DEFINES += UNICODE _UNICODE MINGW_HAS_SECURE_API=1 +QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32 WIN32 # can't add 'DEFINES += WIN64' and 'QMAKE_COMPILER_DEFINES += _WIN64' defines for # x86_64 platform similar to 'msvc-desktop.conf' toolchain, because, unlike for MSVC, @@ -163,5 +163,5 @@ index ed131c6823..b77d86cd6b 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.18.0 +2.19.0 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 9bb1f05a5431..e41368b333ac 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 190efab0758fdd9055145491f6c788996fa6b7ce Mon Sep 17 00:00:00 2001 +From 39c6529c65ebf9e9af4d54cec6ac45a61f4ba618 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:36:53 +0200 -Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL +Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL FIXME: Not sure whether this is still required --- @@ -23,5 +23,5 @@ index 1a43f13d9b..a4c954a453 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include <stdio.h> -- -2.18.0 +2.19.0 diff --git a/0003-Use-external-ANGLE-library.patch b/0003-Use-external-ANGLE-library.patch index 8146b8f94cd1..69b1f25d7aee 100644 --- a/0003-Use-external-ANGLE-library.patch +++ b/0003-Use-external-ANGLE-library.patch @@ -1,7 +1,7 @@ -From f17fa5afa2f24bc569eda2bbe35b77a4ab268608 Mon Sep 17 00:00:00 2001 +From b0a8c226931a787ec4214686827bcb9b1d7f873f Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:41:38 +0200 -Subject: [PATCH 03/34] Use external ANGLE library +Subject: [PATCH 03/33] Use external ANGLE library --- src/gui/Qt5GuiConfigExtras.cmake.in | 4 ++-- @@ -78,10 +78,10 @@ index f4c396f7c5..fc87e810aa 100644 mingw: LIBS *= -luuid # For the dialog helpers: diff --git a/src/src.pro b/src/src.pro -index 1f7c5d99c1..24e24ef7f1 100644 +index 1c76a2e46f..6a5f046b34 100644 --- a/src/src.pro +++ b/src/src.pro -@@ -189,10 +189,6 @@ qtConfig(gui) { +@@ -199,10 +199,6 @@ qtConfig(gui) { SUBDIRS += src_3rdparty_harfbuzzng src_gui.depends += src_3rdparty_harfbuzzng } @@ -93,5 +93,5 @@ index 1f7c5d99c1..24e24ef7f1 100644 SUBDIRS += src_3rdparty_libpng src_3rdparty_freetype.depends += src_3rdparty_libpng -- -2.18.0 +2.19.0 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 00b6944cfbf6..2fcdb8ea6126 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 1ec5d5ee305fd993022c404ad00e5c3f4524d007 Mon Sep 17 00:00:00 2001 +From baee6baceceaa4abb8a9ea909771bcac6da04e05 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:48:51 +0200 -Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory +Subject: [PATCH 04/33] 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.18.0 +2.19.0 diff --git a/0005-Make-sure-.pc-files-are-installed-correctly.patch b/0005-Make-sure-.pc-files-are-installed-correctly.patch index 8431b7e8bf7e..47c41be9b9b3 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 ddc22a123829a1d50a82ea62e6b9f1df3496b253 Mon Sep 17 00:00:00 2001 +From 4b8467ce1b3c487b69e9f9016fa26044853fb6aa Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:54:12 +0200 -Subject: [PATCH 05/34] Make sure *.pc files are installed correctly +Subject: [PATCH 05/33] Make sure *.pc files are installed correctly --- qmake/generators/makefile.cpp | 8 ++++++-- @@ -10,10 +10,10 @@ Subject: [PATCH 05/34] 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 99aecdd8ce..6c614fd868 100644 +index 73e09a1025..6c977b3e0b 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3150,7 +3150,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3183,7 +3183,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index 99aecdd8ce..6c614fd868 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3175,7 +3175,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3208,7 +3208,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) if(fixify) { if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR").toQString()); @@ -36,7 +36,7 @@ index 99aecdd8ce..6c614fd868 100644 return ret; } diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h -index 4ced3bd121..f7cc3b9e9b 100644 +index f32bec650e..17fed7f8c8 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -89,7 +89,7 @@ protected: @@ -49,7 +49,7 @@ index 4ced3bd121..f7cc3b9e9b 100644 void writePkgConfigFile(); // for pkg-config diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 75bb5d236d..737f3abc3a 100644 +index bca27b7044..dec0931bd4 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -726,7 +726,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) @@ -62,5 +62,5 @@ index 75bb5d236d..737f3abc3a 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.18.0 +2.19.0 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 bd2e4537f8a3..f61ea5519033 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 1eb6c3cccc09e51f68f30ab2fc6d8bbf04085031 Mon Sep 17 00:00:00 2001 +From 346528ea0e3b2966e798b9492b72b087561781af Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:58:28 +0200 -Subject: [PATCH 06/34] Don't add resource files to LIBS parameter +Subject: [PATCH 06/33] 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 d6d6b04148..7bb616302f 100644 +index 6fcfe96380..f482cae21a 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp -@@ -196,7 +196,7 @@ void MingwMakefileGenerator::init() +@@ -195,7 +195,7 @@ void MingwMakefileGenerator::init() processVars(); @@ -24,5 +24,5 @@ index d6d6b04148..7bb616302f 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.18.0 +2.19.0 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 b00a666fe6b8..afc5271a9588 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 31cca3a47eea50156a5549574d934dd0264cb0f3 Mon Sep 17 00:00:00 2001 +From 541e805e6c9180089625700f498165d9e3a371d1 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:01:14 +0200 -Subject: [PATCH 07/34] Prevent debug library names in pkg-config files +Subject: [PATCH 07/33] 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,10 +15,10 @@ 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 6c614fd868..bd87c5bd6d 100644 +index 6c977b3e0b..412278c8c6 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3164,6 +3164,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3197,6 +3197,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (dot != -1) ret = ret.left(dot); } @@ -29,5 +29,5 @@ index 6c614fd868..bd87c5bd6d 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.18.0 +2.19.0 diff --git a/0008-Fix-linking-against-shared-static-libpng.patch b/0008-Fix-linking-against-shared-static-libpng.patch index 009e3bb6a089..ce8aee38fc68 100644 --- a/0008-Fix-linking-against-shared-static-libpng.patch +++ b/0008-Fix-linking-against-shared-static-libpng.patch @@ -1,7 +1,7 @@ -From c8ebd475383209c46510769731be7f7598e6feee Mon Sep 17 00:00:00 2001 +From dc1443e4b4cbc38d31934674b006f0458fe86298 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Thu, 26 Jan 2017 17:51:31 +0100 -Subject: [PATCH 08/34] Fix linking against shared/static libpng +Subject: [PATCH 08/33] Fix linking against shared/static libpng Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf --- @@ -23,5 +23,5 @@ index 219385a108..d629a45b92 100644 "use": [ { "lib": "zlib", "condition": "features.system-zlib" } -- -2.18.0 +2.19.0 diff --git a/0009-Fix-linking-against-static-D-Bus.patch b/0009-Fix-linking-against-static-D-Bus.patch index 03cfa28545f8..e3c67bd1d6e9 100644 --- a/0009-Fix-linking-against-static-D-Bus.patch +++ b/0009-Fix-linking-against-static-D-Bus.patch @@ -1,7 +1,7 @@ -From d79b593a0d432b88521ec58ed6e7411a85347bb8 Mon Sep 17 00:00:00 2001 +From ce8a5ec429efd173899f3a545ca527085c929daf Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 19:36:25 +0100 -Subject: [PATCH 09/34] Fix linking against static D-Bus +Subject: [PATCH 09/33] Fix linking against static D-Bus --- configure.json | 9 +++++++-- @@ -9,7 +9,7 @@ Subject: [PATCH 09/34] Fix linking against static D-Bus 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.json b/configure.json -index b4a87f5505..c404fd7066 100644 +index 2dc79137e8..68fed05289 100644 --- a/configure.json +++ b/configure.json @@ -172,18 +172,23 @@ @@ -54,5 +54,5 @@ index 9eaebe6d7e..ac1b1d977b 100644 # include <dbus/dbus.h> #else -- -2.18.0 +2.19.0 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 2538fc96eadf..8ecd940ffa77 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 6032fdbbd2df9576e7509b80c2e4d6c87d744470 Mon Sep 17 00:00:00 2001 +From 6db371f6604d00b31d797447bfc6be93091637c9 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 2 Jun 2017 18:28:10 +0200 -Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library +Subject: [PATCH 10/33] 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 c404fd7066..1488cde728 100644 +index 68fed05289..bcd226f852 100644 --- a/configure.json +++ b/configure.json @@ -185,7 +185,7 @@ @@ -25,5 +25,5 @@ index c404fd7066..1488cde728 100644 }, "condition": "config.win32 && features.shared" -- -2.18.0 +2.19.0 diff --git a/0011-Fix-linking-against-static-freetype2.patch b/0011-Fix-linking-against-static-freetype2.patch index 5c926ba75950..67d154e39b24 100644 --- a/0011-Fix-linking-against-static-freetype2.patch +++ b/0011-Fix-linking-against-static-freetype2.patch @@ -1,7 +1,7 @@ -From a1ce36f86105230865fd6fb5eb4f0bbe09d7221b Mon Sep 17 00:00:00 2001 +From 0ca7e00a0ab483f3050349db030afab902d389c2 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 3 Feb 2017 20:51:19 +0100 -Subject: [PATCH 11/34] Fix linking against static freetype2 +Subject: [PATCH 11/33] Fix linking against static freetype2 --- src/gui/configure.json | 7 +++++-- @@ -26,5 +26,5 @@ index d629a45b92..afa3d95f39 100644 }, "fontconfig": { -- -2.18.0 +2.19.0 diff --git a/0012-Fix-linking-against-static-harfbuzz.patch b/0012-Fix-linking-against-static-harfbuzz.patch index b5d90943748c..d1fa3210c527 100644 --- a/0012-Fix-linking-against-static-harfbuzz.patch +++ b/0012-Fix-linking-against-static-harfbuzz.patch @@ -1,7 +1,7 @@ -From ab966035502f0b14f4e9b037223c9d84646f0bf2 Mon Sep 17 00:00:00 2001 +From 0118d791f8fba7fdadc92ed6884b2ff4de7abf22 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:22:56 +0200 -Subject: [PATCH 12/34] Fix linking against static harfbuzz +Subject: [PATCH 12/33] Fix linking against static harfbuzz --- src/gui/configure.json | 6 +++++- @@ -25,5 +25,5 @@ index afa3d95f39..a2b0a00d09 100644 }, "imf": { -- -2.18.0 +2.19.0 diff --git a/0013-Fix-linking-against-static-pcre.patch b/0013-Fix-linking-against-static-pcre.patch index bddd3a748ac3..b22ebb65a322 100644 --- a/0013-Fix-linking-against-static-pcre.patch +++ b/0013-Fix-linking-against-static-pcre.patch @@ -1,7 +1,7 @@ -From 313ee18fb5ba456880fbcfcb5f5d991235094da4 Mon Sep 17 00:00:00 2001 +From c9383537c6d1c47aa0d435be4c6db1ee88d26bff Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:24:01 +0200 -Subject: [PATCH 13/34] Fix linking against static pcre +Subject: [PATCH 13/33] Fix linking against static pcre Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1 --- @@ -24,5 +24,5 @@ index 13eff07c04..ea747244da 100644 #include <pcre2.h> -- -2.18.0 +2.19.0 diff --git a/0014-Fix-linking-against-shared-static-MariaDB.patch b/0014-Fix-linking-against-shared-static-MariaDB.patch index 151a83b43afe..5217a54b1969 100644 --- a/0014-Fix-linking-against-shared-static-MariaDB.patch +++ b/0014-Fix-linking-against-shared-static-MariaDB.patch @@ -1,7 +1,7 @@ -From 267961ff9c908b5c02828b0c2842c8f320fa7f1b Mon Sep 17 00:00:00 2001 +From b701eb9c3dcb206435726d0405fa152655231dcb Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:56:55 +0200 -Subject: [PATCH 14/34] Fix linking against shared/static MariaDB +Subject: [PATCH 14/33] 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.18.0 +2.19.0 diff --git a/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/0015-Fix-linking-against-shared-static-PostgreSQL.patch index 9b64ae630bc6..ea2a67ea371e 100644 --- a/0015-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/0015-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,7 +1,7 @@ -From 00fc4018caca88c40fb216917ae0066aa3dd2ed3 Mon Sep 17 00:00:00 2001 +From ee6b2158ed83ed926ba3f17f7c520fb889ef74ac Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:58:25 +0200 -Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL +Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL --- src/plugins/sqldrivers/configure.json | 5 +++-- @@ -25,5 +25,5 @@ index 4619db4a54..ef0d45f6cc 100644 ] }, -- -2.18.0 +2.19.0 diff --git a/0016-Rename-qtmain-to-qt5main.patch b/0016-Rename-qtmain-to-qt5main.patch index 6da5fd87b2e3..217a5489e7cb 100644 --- a/0016-Rename-qtmain-to-qt5main.patch +++ b/0016-Rename-qtmain-to-qt5main.patch @@ -1,7 +1,7 @@ -From ef21b8b44d8c71e927a93bd24cdca38ec2c37391 Mon Sep 17 00:00:00 2001 +From 1bb8814307183b3311c99e0e4987ea0d84d487f2 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:25:40 +0200 -Subject: [PATCH 16/34] Rename qtmain to qt5main +Subject: [PATCH 16/33] Rename qtmain to qt5main Prevents conflict with mingw-w64-qt4 package --- @@ -12,7 +12,7 @@ Prevents conflict with mingw-w64-qt4 package 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index e747ef16af..8b8a4ad240 100644 +index 48d1c49d44..a011f681eb 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -87,7 +87,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 @@ -66,5 +66,5 @@ index 4140ae48de..9ae73db74b 100644 CONFIG += static -- -2.18.0 +2.19.0 diff --git a/0017-Build-dynamic-host-libraries.patch b/0017-Build-dynamic-host-libraries.patch index 8a6f6493ea10..4205ad21aad5 100644 --- a/0017-Build-dynamic-host-libraries.patch +++ b/0017-Build-dynamic-host-libraries.patch @@ -1,7 +1,7 @@ -From c79c2a4f048484d235574a69e6f6ba3dcff23abe Mon Sep 17 00:00:00 2001 +From 337a71fdb496c2228ee5564d5c12498b6b7d498d Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 14:27:28 +0200 -Subject: [PATCH 17/34] Build dynamic host libraries +Subject: [PATCH 17/33] Build dynamic host libraries This came initially from Fedora, not sure whether it makes sense to keep it. Regular Arch package @@ -14,10 +14,10 @@ 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 f8729de947..db23f4ad1d 100644 +index 8c7adc45eb..8dd69efee6 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf -@@ -24,7 +24,7 @@ requires(!$$skip) +@@ -25,7 +25,7 @@ requires(!$$skip) # Compile as shared/DLL or static according to the option given to configure # unless overridden. Host builds are always static @@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644 -INSTALLS = lib +INSTALLS += lib -- -2.18.0 +2.19.0 diff --git a/0018-Enable-rpath-for-build-tools.patch b/0018-Enable-rpath-for-build-tools.patch index fc0832f97763..2e71cd2f58e6 100644 --- a/0018-Enable-rpath-for-build-tools.patch +++ b/0018-Enable-rpath-for-build-tools.patch @@ -1,7 +1,7 @@ -From 9a506994e00aa0fb257bfe80458b0543c0e9f8b0 Mon Sep 17 00:00:00 2001 +From 664fce69abcad0d7c10013b51b42a1a34c27f279 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 17:59:27 +0200 -Subject: [PATCH 18/34] Enable rpath for build tools +Subject: [PATCH 18/33] 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.18.0 +2.19.0 diff --git a/0019-Use-system-zlib-for-build-tools.patch b/0019-Use-system-zlib-for-build-tools.patch index 250475fe915f..885c852be21d 100644 --- a/0019-Use-system-zlib-for-build-tools.patch +++ b/0019-Use-system-zlib-for-build-tools.patch @@ -1,7 +1,7 @@ -From 92e7155e22bfe514a20d6ebf39b6bdfbf45f194c Mon Sep 17 00:00:00 2001 +From ec1d27f7cb06c118e81335f4614559db92256fd5 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:04:42 +0200 -Subject: [PATCH 19/34] Use system zlib for build tools +Subject: [PATCH 19/33] Use system zlib for build tools --- src/tools/bootstrap/bootstrap.pro | 2 +- @@ -21,5 +21,5 @@ index a45382106a..17b9828581 100644 } else { CONFIG += no_core_dep -- -2.18.0 +2.19.0 diff --git a/0020-Use-.dll.a-as-import-lib-extension.patch b/0020-Use-.dll.a-as-import-lib-extension.patch index e55598e55a29..6649f9a6655f 100644 --- a/0020-Use-.dll.a-as-import-lib-extension.patch +++ b/0020-Use-.dll.a-as-import-lib-extension.patch @@ -1,7 +1,7 @@ -From d3a0f355335aa086e2663d634f2f41766f1bcdd6 Mon Sep 17 00:00:00 2001 +From 75c9cbfab1967e472ced8730e561b062a30c4d9d Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:26:18 +0200 -Subject: [PATCH 20/34] Use *.dll.a as import lib extension +Subject: [PATCH 20/33] Use *.dll.a as import lib extension The variables used here are provided by mingw-w64 specific mkspec @@ -27,7 +27,7 @@ index e67917cc96..2a94964b49 100644 } else { CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 737f3abc3a..2e6d5d94a9 100644 +index dec0931bd4..cd64cb0c4f 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -80,10 +80,14 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg) @@ -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.18.0 +2.19.0 diff --git a/0021-Merge-shared-and-static-library-trees.patch b/0021-Merge-shared-and-static-library-trees.patch index 094880c892cc..f1f5c334b227 100644 --- a/0021-Merge-shared-and-static-library-trees.patch +++ b/0021-Merge-shared-and-static-library-trees.patch @@ -1,7 +1,7 @@ -From 91d94eadf25139197ce3cf74bb75692e9c77db07 Mon Sep 17 00:00:00 2001 +From 12168d6839249e51586f3e63e666bd68e1363905 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:45:08 +0200 -Subject: [PATCH 21/34] Merge shared and static library trees +Subject: [PATCH 21/33] Merge shared and static library trees Allow installation of shared and static build in the same prefix --- @@ -13,10 +13,10 @@ Allow installation of shared and static build in the same prefix 5 files changed, 51 insertions(+), 6 deletions(-) diff --git a/configure.pri b/configure.pri -index 0512ef0144..c3ce522e4f 100644 +index 6e7f6b76a4..8d6af2fb81 100644 --- a/configure.pri +++ b/configure.pri -@@ -1249,3 +1249,12 @@ defineTest(createConfigStatus) { +@@ -1259,3 +1259,12 @@ defineTest(createConfigStatus) { QMAKE_POST_CONFIGURE += \ "createConfigStatus()" @@ -101,10 +101,10 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index bd87c5bd6d..736af1c843 100644 +index 412278c8c6..dd86df8b91 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3167,6 +3167,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3200,6 +3200,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -114,7 +114,7 @@ index bd87c5bd6d..736af1c843 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3340,9 +3343,9 @@ MakefileGenerator::writePkgConfigFile() +@@ -3373,9 +3376,9 @@ MakefileGenerator::writePkgConfigFile() t << endl; // requires @@ -128,5 +128,5 @@ index bd87c5bd6d..736af1c843 100644 t << endl; -- -2.18.0 +2.19.0 diff --git a/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index 8c7e73a6165b..b388a4fcd6b0 100644 --- a/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,7 +1,7 @@ -From 86e3c50a96608acab006e9e525c23e4f420d8b4d Mon Sep 17 00:00:00 2001 +From f02786f7eea8c88f7cd4761638ae53bcf13d94fe Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:32:00 +0200 -Subject: [PATCH 22/34] Pull dependencies of static libraries in CMake modules +Subject: [PATCH 22/33] 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 736af1c843..a1972b7eb0 100644 +index dd86df8b91..fc7a0927a9 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -994,10 +994,18 @@ MakefileGenerator::writePrlFile(QTextStream &t) @@ -278,5 +278,5 @@ index 736af1c843..a1972b7eb0 100644 } -- -2.18.0 +2.19.0 diff --git a/0023-Allow-usage-of-static-version-with-CMake.patch b/0023-Allow-usage-of-static-version-with-CMake.patch index 54dbc9300ed0..ec354ea63082 100644 --- a/0023-Allow-usage-of-static-version-with-CMake.patch +++ b/0023-Allow-usage-of-static-version-with-CMake.patch @@ -1,7 +1,7 @@ -From 244565bea2e8c84287b0a5dbbacea3db7e186f6d Mon Sep 17 00:00:00 2001 +From 191a510dd089ac2d870e989b44a15af535eacb8a Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sat, 5 Aug 2017 21:14:26 +0200 -Subject: [PATCH 23/34] Allow usage of static version with CMake +Subject: [PATCH 23/33] Allow usage of static version with CMake Allow selecting between dynamic and static Qt versions installed in the same prefix @@ -992,5 +992,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.18.0 +2.19.0 diff --git a/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index 98c1c54d6c83..6e6d96fd5277 100644 --- a/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,7 +1,7 @@ -From dad3f2977824ca10f03f28486f10780fa2f615e3 Mon Sep 17 00:00:00 2001 +From e0197a35c25984f50de023cec5d5dd28391c22b0 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 2 Jun 2017 16:42:07 +0200 -Subject: [PATCH 24/34] Adjust linker flags for static build with +Subject: [PATCH 24/33] Adjust linker flags for static build with cmake/mingw-w64 Change-Id: I33b88976d8f5ce87ce431a6f422fe87785bf5b8d @@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644 +unset(_isExe) +!!ENDIF -- -2.18.0 +2.19.0 diff --git a/0025-Use-correct-pkg-config-static-flag.patch b/0025-Use-correct-pkg-config-static-flag.patch index c822445ca382..ac5e69fcc1a8 100644 --- a/0025-Use-correct-pkg-config-static-flag.patch +++ b/0025-Use-correct-pkg-config-static-flag.patch @@ -1,17 +1,17 @@ -From 2c846ab2a45c159905715e98338246f86e98e5a8 Mon Sep 17 00:00:00 2001 +From cd1074a5c6c3615b89b0abb6f2960d26332dc2a5 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:50:21 +0200 -Subject: [PATCH 25/34] Use correct pkg-config --static flag +Subject: [PATCH 25/33] Use correct pkg-config --static flag --- configure.pri | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure.pri b/configure.pri -index c3ce522e4f..59a9b1e88a 100644 +index 8d6af2fb81..23b6050d35 100644 --- a/configure.pri +++ b/configure.pri -@@ -311,6 +311,9 @@ defineTest(qtConfTest_detectPkgConfig) { +@@ -315,6 +315,9 @@ defineTest(qtConfTest_detectPkgConfig) { qtLog("Found pkg-config from path: $$pkgConfig") } } @@ -22,5 +22,5 @@ index c3ce522e4f..59a9b1e88a 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.18.0 +2.19.0 diff --git a/0026-Fix-macro-invoking-moc-rcc-and-uic.patch b/0026-Fix-macro-invoking-moc-rcc-and-uic.patch index b833d4288c19..6b8b3add83f9 100644 --- a/0026-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/0026-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,7 +1,7 @@ -From 400f992fa24ed2b62be4258d5d26bff3846d95ce Mon Sep 17 00:00:00 2001 +From b9ae2c29543c9d9ecc2e5933c2a849fb79f1190d Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 4 Dec 2016 20:35:47 +0100 -Subject: [PATCH 26/34] Fix macro invoking moc, rcc and uic +Subject: [PATCH 26/33] Fix macro invoking moc, rcc and uic * Otherwise the arguments aren't passed correctly leading to errors like ``` @@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.18.0 +2.19.0 diff --git a/0027-Ignore-errors-about-missing-feature-static.patch b/0027-Ignore-errors-about-missing-feature-static.patch index 8fbe09245785..d8e723da4e1c 100644 --- a/0027-Ignore-errors-about-missing-feature-static.patch +++ b/0027-Ignore-errors-about-missing-feature-static.patch @@ -1,7 +1,7 @@ -From 3872dc79e2e8c530ee73003c6c7f4b08e4697f7f Mon Sep 17 00:00:00 2001 +From f9d1c593895a0698db00b96ed42c2ba6db464fcf Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 20:59:54 +0100 -Subject: [PATCH 27/34] Ignore errors about missing feature static +Subject: [PATCH 27/33] Ignore errors about missing feature static Not sure why this error occurs, let's hope for the best --- @@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.18.0 +2.19.0 diff --git a/0028-Enable-and-fix-use-of-iconv.patch b/0028-Enable-and-fix-use-of-iconv.patch index 8f06c4eca0d6..485e375bc3f4 100644 --- a/0028-Enable-and-fix-use-of-iconv.patch +++ b/0028-Enable-and-fix-use-of-iconv.patch @@ -1,7 +1,7 @@ -From c7eb8dbf86904eab61b3bb53f52563d861372f65 Mon Sep 17 00:00:00 2001 +From 54ea8a6b4a956037ad4f03c60f9aee654317c1b4 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 21:08:20 +0100 -Subject: [PATCH 28/34] Enable and fix use of iconv +Subject: [PATCH 28/33] Enable and fix use of iconv Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c --- @@ -79,5 +79,5 @@ index dfb575da0d..a630d7abf3 100644 }, "icu": { -- -2.18.0 +2.19.0 diff --git a/0029-Ignore-failing-pkg-config-test.patch b/0029-Ignore-failing-pkg-config-test.patch index 2041dd9e39c7..0a8bc6ad51e2 100644 --- a/0029-Ignore-failing-pkg-config-test.patch +++ b/0029-Ignore-failing-pkg-config-test.patch @@ -1,7 +1,7 @@ -From 558b86ad0cbaa5fb318d729c3768bc51f385e7cd Mon Sep 17 00:00:00 2001 +From 4fba521536c369be187e9e618b3333cf0b2c724a Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 21:08:48 +0100 -Subject: [PATCH 29/34] Ignore failing pkg-config test +Subject: [PATCH 29/33] 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 1488cde728..a52c1c9c95 100644 +index bcd226f852..25512db145 100644 --- a/configure.json +++ b/configure.json -@@ -597,7 +597,6 @@ +@@ -604,7 +604,6 @@ "pkg-config": { "label": "Using pkg-config", "autoDetect": "!config.darwin && !config.win32", @@ -21,5 +21,5 @@ index 1488cde728..a52c1c9c95 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.18.0 +2.19.0 diff --git a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch index 36312d45c41d..064dec5e4180 100644 --- a/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,7 +1,7 @@ -From cfdde9962386c34c3f2bfe902aa2a522b0530dba Mon Sep 17 00:00:00 2001 +From c4f29e97fd87f1f6790708d21247dd6c333167c9 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Tue, 7 Feb 2017 18:25:28 +0100 -Subject: [PATCH 30/34] Prevent qmake from messing static lib dependencies +Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies In particular, it messes resolving cyclic dependency between static freetype2 and harfbuzz @@ -25,7 +25,7 @@ index 894020d2bd..5f57d6f5cb 100644 int libidx = 0, fwidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 2e6d5d94a9..a8320bae09 100644 +index cd64cb0c4f..c63d8b5754 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -87,6 +87,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) @@ -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.18.0 +2.19.0 diff --git a/0031-Hardcode-linker-flags-for-platform-plugins.patch b/0031-Hardcode-linker-flags-for-platform-plugins.patch index a84cf778f092..e5aac2e55049 100644 --- a/0031-Hardcode-linker-flags-for-platform-plugins.patch +++ b/0031-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,17 +1,60 @@ -From 0e3e71c77f1bf23ab20c2c4b3219c371ba94825f Mon Sep 17 00:00:00 2001 +From dacff81f228db7dd158e4f2bdc2dae02175aea5f Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Wed, 25 Jan 2017 23:42:30 +0100 -Subject: [PATCH 31/34] Hardcode linker flags for platform plugins +Subject: [PATCH 31/33] Hardcode linker flags for platform plugins Otherwise incorrect order of libs leads to errors when building libqminimal.dll, libqoffscreen.dll and libqwindows.dll --- + src/plugins/platforms/direct2d/direct2d.pro | 30 ++++++++++++++--- 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(-) + 4 files changed, 73 insertions(+), 18 deletions(-) +diff --git a/src/plugins/platforms/direct2d/direct2d.pro b/src/plugins/platforms/direct2d/direct2d.pro +index 3bfd02bdc8..4732f89920 100644 +--- a/src/plugins/platforms/direct2d/direct2d.pro ++++ b/src/plugins/platforms/direct2d/direct2d.pro +@@ -1,12 +1,32 @@ + TARGET = qdirect2d + + QT += \ +- core-private gui-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 ++# Fix linker error when building libqdirect2d.dll by specifying linker flags for ++# required modules manually (otherwise order is messed) ++LIBS += \ ++ -lQt5EventDispatcherSupport \ ++ -lQt5FontDatabaseSupport \ ++ -lQt5ThemeSupport \ ++ -lfreetype -lole32 -lgdi32 -luuid ++# However, this workaround leads to the necessity of specifying include dirs manually ++INCLUDEPATH += \ ++ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${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} ++} ++# Also add Qt5WindowsUIAutomationSupport - it seems to link against it ++LIBS += -lQt5WindowsUIAutomationSupport ++INCLUDEPATH += $$QT_SOURCE_TREE/include/Qt5WindowsUIAutomationSupport/$${QT_VERSION} + + LIBS += -ldwmapi -ld2d1 -ld3d11 -ldwrite -lversion -lgdi32 + diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro index a1a2da547b..7ef91b574d 100644 --- a/src/plugins/platforms/minimal/minimal.pro @@ -106,5 +149,5 @@ index 174bc7b609..e66488e364 100644 include(windows.pri) -- -2.18.0 +2.19.0 diff --git a/0032-Fix-linking-against-static-plugins-with-qmake.patch b/0032-Fix-linking-against-static-plugins-with-qmake.patch index a7fee5a8bf7c..7b9808cb4b0e 100644 --- a/0032-Fix-linking-against-static-plugins-with-qmake.patch +++ b/0032-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,7 +1,7 @@ -From 8741a4b4d6c3bc569dc6452c777a7692266e6a91 Mon Sep 17 00:00:00 2001 +From 58dedf7fb76457bba9a1fc0f2a9d4a28c9a3e356 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Fri, 25 Aug 2017 17:07:17 +0200 -Subject: [PATCH 32/34] Fix linking against static plugins with qmake +Subject: [PATCH 32/33] 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 6eebd068f1..310b8713f0 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.18.0 +2.19.0 diff --git a/0033-Disable-hardware-randomizer-for-32-bit.patch b/0033-Disable-hardware-randomizer-for-32-bit.patch index c7b1cc0c843e..36db415103eb 100644 --- a/0033-Disable-hardware-randomizer-for-32-bit.patch +++ b/0033-Disable-hardware-randomizer-for-32-bit.patch @@ -1,7 +1,7 @@ -From 4c9b1ccd23a3d0b63e57f5dff781ae8650b5d85c Mon Sep 17 00:00:00 2001 +From 244213d3b887fcd16d345f0797fb1b8c8414cd46 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sat, 26 May 2018 03:47:14 +0200 -Subject: [PATCH 33/34] Disable hardware randomizer for 32-bit +Subject: [PATCH 33/33] Disable hardware randomizer for 32-bit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644 #else return false; -- -2.18.0 +2.19.0 diff --git a/0034-Fix-build-error-related-to-glibc-2.28-and-stat.patch b/0034-Fix-build-error-related-to-glibc-2.28-and-stat.patch deleted file mode 100644 index 8343667a8047..000000000000 --- a/0034-Fix-build-error-related-to-glibc-2.28-and-stat.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 0fc1e355f07235ca7fe1f04d7206394772c6b5f4 Mon Sep 17 00:00:00 2001 -From: Martchus <martchus@gmx.net> -Date: Sat, 25 Aug 2018 11:44:46 +0200 -Subject: [PATCH 34/34] Fix build error related to glibc 2.28 and stat - -Taken from regular package, comes from Fedora ---- - mkspecs/linux-g++/qplatformdefs.h | 2 ++ - src/corelib/io/qfilesystemengine_unix.cpp | 10 +++++++--- - 2 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h -index 13523f0702..d32453162c 100644 ---- a/mkspecs/linux-g++/qplatformdefs.h -+++ b/mkspecs/linux-g++/qplatformdefs.h -@@ -72,7 +72,9 @@ - #include <sys/time.h> - #include <sys/shm.h> - #include <sys/socket.h> -+#if 0 - #include <sys/stat.h> -+#endif - #include <sys/wait.h> - #include <netinet/in.h> - -diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp -index be6ce48d0c..3648cfc43d 100644 ---- a/src/corelib/io/qfilesystemengine_unix.cpp -+++ b/src/corelib/io/qfilesystemengine_unix.cpp -@@ -50,7 +50,9 @@ - #include <pwd.h> - #include <stdlib.h> // for realpath() - #include <sys/types.h> -+#if 0 - #include <sys/stat.h> -+#endif - #include <unistd.h> - #include <stdio.h> - #include <errno.h> -@@ -91,7 +93,9 @@ extern "C" NSString *NSTemporaryDirectory(); - # include <sys/syscall.h> - # include <sys/sendfile.h> - # include <linux/fs.h> -+#if 0 - # include <linux/stat.h> -+#endif - - // in case linux/fs.h is too old and doesn't define it: - #ifndef FICLONE -@@ -105,13 +109,13 @@ extern "C" NSString *NSTemporaryDirectory(); - # undef SYS_renameat2 - # undef SYS_statx - # undef STATX_BASIC_STATS --# else --# if !QT_CONFIG(renameat2) && defined(SYS_renameat2) -+# else -+# if 0 && !QT_CONFIG(renameat2) && defined(SYS_renameat2) - static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newpath, unsigned flags) - { return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); } - # endif - --# if !QT_CONFIG(statx) && defined(SYS_statx) -+# if 0 && !QT_CONFIG(statx) && defined(SYS_statx) - static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf) - { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); } - # elif !QT_CONFIG(statx) && !defined(SYS_statx) --- -2.18.0 - @@ -36,7 +36,7 @@ isNoOpenGL() { } pkgname=mingw-w64-qt5-base -pkgver=5.11.1 +pkgver=5.11.2 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 @@ -84,43 +84,41 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0030-Prevent-qmake-from-messing-static-lib-dependencies.patch' '0031-Hardcode-linker-flags-for-platform-plugins.patch' '0032-Fix-linking-against-static-plugins-with-qmake.patch' - '0033-Disable-hardware-randomizer-for-32-bit.patch' - '0034-Fix-build-error-related-to-glibc-2.28-and-stat.patch') -sha256sums=('a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46' - '6e929b114e4a69fec480db4e78a39c2e95a88e76b88b1743863013e9f4bd1b0b' - 'f0bb44995308af295a9847b2f796dc938d4e4673dbd422616cb890a1ad559ade' - 'bb81e37b265140e99c8ed01acadd93ba533757f98cc38452309aca4de74fc957' - '5a7eff8dd3312a62b3f1606358e74fa8d4e5b118796299afbd334bff159f3659' - '857650169e6c7f96aeb835c7c622ff67034a19cc295f7724498c95c49a6d0b79' - 'b56639a777db979145b26cb39dcba15d7b6f52178cc94373be637ec026db23b7' - '87ad586b648f3fd9c24f9794f0926ca3a3b78d62c544dcbfc1f80c89ad51dbbf' - 'cd2d25b8c036a967624d46dcbe9f04b323678fa72855c11c2bf307d713b32aad' - '1223e502f6700f6d428920bf0cb103eba03f8b253f43d9cd9dfd2b8e1c4974bc' - 'd9c0de2a86939bfa19c69b31a8165d4553dc4afdbbe60f9dce8ca1e030b96e51' - '0e5462994dcaf9b3d879b4ef562c12ecb2462b325e5026486ae6c29a83975e07' - '75fd2a29acc8e06bdd46a18018c81f0cb4816947ebd8ff8b8c76a633855c60d1' - '88f0f909022c7a3be8df0f4597ad36681a73d3be40a848061fa17d23641263ad' - 'c413a032bbf1e0de0ac722cb7213cc1e21ef36797d23fd12604a843c9a9cfcd8' - '564ca84a3c7bdc12aab2edca084850fec3104ea9dba053127c754dd463010283' - '3191b4c924af232ac5c3db8e2b670868107837ff39541451806731fd88c44877' - '9eeaeb84fc650f6fa54b66d45a67a1922b9d363c40d749aa0fb0925d0a190110' - '62d8b373f074c3d0f440cb35f464b98a283b28c57551b921d7f464b86f95902c' - '17a17bea14fedbffc011334f5298e3b3da6be90d26635982aa9027d0f9be8d5c' - 'b43c3b5e7e071854ba0249b38ea8e7e543e3be3a604dfb700baad752c5722967' - '6097ff39d3996d1c7832a2fa4fbdd67728bf1014083db7c145c9585579d79a95' - 'dc79f6449d4aa5c3be57cfcff975f5573017c69c49785fc124d37837e8704e02' - '6ff9bdee5dfc958b38b5063d1f1cf082a5950d00479f70fd5905ff9b5e53acc1' - '339139a569c951c75e6db12754f8629b392d1b4c410718f068a8ad1cf63c2ff4' - '5db30dd7615347286975f50911e9c0aa567733107069d96c484f414c9eb0d06d' - '45fba6b70852c8ddfc1793d7d661788ccad23468a276617e13566efce2993e5f' - '9199a5fe3eccca581df6513ff9167bfbfaa7e9b3ff787a0803da543a37ff054b' - '28a30fd468eedcb08d70df65c670a8b5713898f64c2fe4985f93694441543b39' - 'b8fae2d545997d1cdfab3688d7dec42e7606de493a1eb8ff118d6d56b3000440' - 'd1c83496e0139fbc3aa167238296dd5bfe08adf645549bffeaf9bbb3a40ceaf0' - '2cbabbad04e7a1ddaffb2d3e968814dac875dc070ed63b90181905e3dd0351de' - '84528256f371719d0a8a68628392a6f3f37ca3d9353a746114a9bc7d4732728b' - '9af2a3650bf3141d4fb042f00b2067a43069a72e5f75ea2f37d90730089f5e44' - 'd354ab15d7475e2df989d969990ddd415da62423b4af731946e8c3c7ab496d07') + '0033-Disable-hardware-randomizer-for-32-bit.patch') +sha256sums=('6381e7c3468d5a1dcfe3683b29eeced192faa0f8a32434fec071a59b8bcd0107' + '3036fb04baa54d010dce053059dd780322f1d2925d42bdb6d9762539b1581e62' + '0861dc21d857eeddbc992f63f66590baade93e049b1ea385a34b8896e231cbd0' + 'cff8b6b146bc20faaa1f7dc25e88f6f3dd71657d2b80d5b3b15c0949026fc4aa' + '76ea9cd3ab0d9308fb57bff0bd82490ec3da95e3e5f96d452fe62206daff300d' + '626790dc110b0c70989e57dbdb42dd1cc5757c2360d6e7714624fbdee6e8dae1' + '96d94a7aae914f3706a820ad074bbd32e884154c1bebba3f3e631920fe0fbd59' + '6bbdf39b2682002d4f4972b395f49d17acee607f92df00734faf53c4930de2d9' + '3c1df53016e40b00dbe8ef132b50730fadf412534135a114628612f4c55fe6b7' + '02966be361050075382e3a3ad83e4eb13d7b135aadb95d43b2bde443c39506aa' + '230e4bf22051a79d36285178c8e294e479e81a5480d8791b53ab090a87b8d5e7' + '7f6a16f8d2108bc96b58a1fcb695da342f71bd47de24f5b20b9412319e4e35ad' + '49a6571dca2333c04658f47e7f0971ffaa45d8c8664cc7dded63d8f29b80bfb2' + '32333bd89e86efba6333897f77dbd61464ea8130013248b37c5927eb3c79efdc' + '4b7c018cc7335639df7b3819132d5d32906a5fa0796c2caf4428993f16697882' + 'a6086ef73d1b2ac079b06f2ce1059458af1f033efa7a2e5e684c97d64d418296' + '82787b2bac35de3992bb36816ee0bd30117a3e8679d0cffc2aabe7c551c5f4cb' + 'dcee7f38ce40aec00e8ecce72b9a3c07e6d0bf838049c4bbb80f33448e34038b' + '49b332039ef6ba074c58fd7149df70003a7e69c61ed1519df6a0f16635848843' + 'c345fd741f71c9e728ea88e4c86640c522d7cc0c9f0e39cee5812a2ea41c51e5' + '55ffc1bc12d449cb80fa5be4891e4ebdba4a41c62a5953b13dfc8fb75c153de4' + 'af990f18952df3372f42112f68f13ceab9a46feb50c115ea548b44822b841e29' + '843e78560e7d09b86979f928e16d1ed56595d6f660d4dc95d4888a56978b9d43' + 'c8fc2495f4d99d460020c362dbf78e6faba2c60c65580f8d06f59fe6e85d7e19' + '0be553d337ecc23b1a1bc8df019beaa300b3e0d0bffa8d68e6401f5cbfa79b21' + '03ff8e2ca617a5852ce9b0c99eab6c5866e00c5099e62e4c583af6e68b03c076' + '3e6d0ed72cf9817dd7508b5403c1bbbdde91f6a59725c8e5250abe8fc66b5a03' + '16fd7e1dc7afb830d984b1d6c112c632e4190f610cdee48d36bd0313e1c19634' + 'd28476f714a02671acaa02ce0c3a462efd2917aa02d9add004e1d5935f795e76' + '4cbaddd05144010a681d370573d98130af909adedbc761728d0842af3be84a1d' + '9bf58d9378fcdd5a1af5e272f2ef19c3b2ec6b020bcb2b78ec808e7adcc8f032' + 'ca1b066b22af17192b59ce7f0ca3a83bda7c6a8c7f023537c37c1b5c4a388984' + 'd33e97f491ec8773922ccdd9df25ef3f532c00edf48bab858cef99a60edcf8fe' + '550082fea34c12c9df92c73ac1c7ae23ee7ef454799403fda0d495f5d8d92be4') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' |