diff --git a/README.md b/README.md index 184d7237..c30e0b0b 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,8 @@ workflow is quite simple: * eg. `rebase-patches.sh 5.11.0 5.10.1 fixes` to create branch `5.11.0-mingw-w64` based on `5.10.1-mingw-w64-fixes` * after fixing possible conflicts, run `devel/qt5/continue-rebase-patches.sh` * otherwise, that's it + * all scripts need to run in the Git repository directory of the Qt module except `rebase-all-patches.sh` which needs + the environment variable `QT_GIT_REPOS_DIR` to be set 2. Run `devel/qt5/update-patches.sh` or `devel/qt5/update-all-patches.sh` to update PKGBUILDs ## Supported build and deployment tools for mingw-w64-qt5 packages diff --git a/devel/qt5/rebase-patches.sh b/devel/qt5/rebase-patches.sh index 341269dc..b680c5b6 100755 --- a/devel/qt5/rebase-patches.sh +++ b/devel/qt5/rebase-patches.sh @@ -30,7 +30,7 @@ if [[ $branch_count -lt 1 ]]; then msg2 "Branch for old version $oldversionbranch doesn't exist. Likely we just don't need any patches for this repo :-)" exit 0 fi -if [[ $branch_count -gt 1 ]]; then +if [[ -z $3 ]] && [[ $branch_count -gt 1 ]]; then msg 'Which of the following branches was the latest for the old version?' git branch | grep "$oldversionbranch" msg2 'Please disambiguate by specifying the corresponding suffix as 3rd argument.' diff --git a/devel/versions.sh b/devel/versions.sh index 28d41994..69288691 100755 --- a/devel/versions.sh +++ b/devel/versions.sh @@ -11,7 +11,7 @@ declare -A versions=( [reflective-rapidjson]=0.0.6 [blackwidowcontrol]=1.0.1 [dbus-soundrecorder]=1.2.2 - [qt5]=5.12.1 + [qt5]=5.12.2 ) declare -A github_names=( [c++utilities]=cpp-utilities diff --git a/qt5-3d/mingw-w64/PKGBUILD b/qt5-3d/mingw-w64/PKGBUILD index 8006ebf7..c3599158 100644 --- a/qt5-3d/mingw-w64/PKGBUILD +++ b/qt5-3d/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qt3d pkgname="mingw-w64-qt5-3d" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('ce51ed3fe403672db2c874cbaa60f3a139ec817abd1270dc5e4255d35fd64bf1') +sha256sums=('d4036e7ac146ba78784dde0dd99e8182372b7c38e832e33b61fed4187de0ad06') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-activeqt/mingw-w64/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch b/qt5-activeqt/mingw-w64/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch index 1a474831..d03491bc 100644 --- a/qt5-activeqt/mingw-w64/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch +++ b/qt5-activeqt/mingw-w64/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch @@ -1,4 +1,4 @@ -From c8373145859a4167b83772790879b3c453db5f83 Mon Sep 17 00:00:00 2001 +From 39cbdd617fe7d154bb77c62378ef4fa939cad59c Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 17:17:46 +0200 Subject: [PATCH 1/2] Don't require windows.h when using native Linux gcc @@ -17,5 +17,5 @@ index 7f9a8d4..6f3548a 100644 SOURCES = main.cpp -- -2.20.1 +2.21.0 diff --git a/qt5-activeqt/mingw-w64/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch b/qt5-activeqt/mingw-w64/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch index 7c71b449..0257af09 100644 --- a/qt5-activeqt/mingw-w64/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch +++ b/qt5-activeqt/mingw-w64/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch @@ -1,4 +1,4 @@ -From 6ab1661e2f6781ae219ba65f7981667ad4ed4043 Mon Sep 17 00:00:00 2001 +From e6e5e75c12ff1c0cc96662fb20a2eddb25022922 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 17:21:08 +0200 Subject: [PATCH 2/2] Handle win64 in dumpcpp and @@ -52,5 +52,5 @@ index 4601aef..65eee94 100644 } -- -2.20.1 +2.21.0 diff --git a/qt5-activeqt/mingw-w64/PKGBUILD b/qt5-activeqt/mingw-w64/PKGBUILD index eb1808ba..6be09112 100644 --- a/qt5-activeqt/mingw-w64/PKGBUILD +++ b/qt5-activeqt/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtactiveqt pkgname=mingw-w64-qt5-activeqt -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="ActiveX integration framework (mingw-w64)" @@ -23,9 +23,9 @@ _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" '0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch' '0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch') -sha256sums=('a56fbd9aa018b9b91a1de6018db6538f4bc4309bfbdd86c52d437e7297983c45' - '1b07005fbcccf531475b131f84b6a13bff3f7281e3eb35457e93d2fe7ba7c345' - 'ea3a9fbb5bcc3d73832489342fde116347c981bd8668685aa69f88d6a2ceed0a') +sha256sums=('281ec22e43c5e8385ed7da0ad7f317cf200bc6c2b72e6980e7c1c318635c636b' + 'f6a82b00428d8da4a794740addc39293322a6f3c0e04c3d1aafba357ec3d46f2' + '9d1cf3315c79b3e81b21c336c7953d9c2d472a02298a2c1750a47faab0ae555e') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-base/apple-darwin/PKGBUILD b/qt5-base/apple-darwin/PKGBUILD index 5eaf186a..be4e15f4 100644 --- a/qt5-base/apple-darwin/PKGBUILD +++ b/qt5-base/apple-darwin/PKGBUILD @@ -5,7 +5,7 @@ # All patches are managed at https://github.com/Martchus/qtbase pkgname=apple-darwin-qt5-base -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 pkgdesc='A cross-platform application and UI framework (apple-darwin)' arch=('i686' 'x86_64') diff --git a/qt5-base/mingw-w64-angle/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/qt5-base/mingw-w64-angle/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch index 96b590a3..a705f71a 100644 --- a/qt5-base/mingw-w64-angle/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch +++ b/qt5-base/mingw-w64-angle/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch @@ -1,4 +1,4 @@ -From 2ac45582566cb492858de99cf06cabf2fa575e30 Mon Sep 17 00:00:00 2001 +From 7b26289a1e7fafff7da844cdaac26b997febbc94 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/34] Adjust win32-g++ profile for cross compilation with @@ -161,5 +161,5 @@ index ed131c6823..b8e08df0be 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index e3d0f710..c7649a9c 100644 --- a/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch +++ b/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch @@ -1,4 +1,4 @@ -From 1083693a799b03cde91c83ff25d890640c01d780 Mon Sep 17 00:00:00 2001 +From 71303c275da3c576a5386dc50d4916ce21a58b16 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL @@ -23,5 +23,5 @@ index 00287b0665..35ad3007d1 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch index f364abc5..43cc3f94 100644 --- a/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch +++ b/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch @@ -1,4 +1,4 @@ -From 0be0cdb753a85725e603a02ada330cc9fd2c161e Mon Sep 17 00:00:00 2001 +From 1e421ad10dfb855e5a8626124854fb6e9ab568ca Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:41:38 +0200 Subject: [PATCH 03/34] Use external ANGLE library @@ -93,5 +93,5 @@ index 1c76a2e46f..6a5f046b34 100644 SUBDIRS += src_3rdparty_libpng src_3rdparty_freetype.depends += src_3rdparty_libpng -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 6261b628..2d00f691 100644 --- a/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From 987045e209769c2b4f8f48046167b5ef9106dd70 Mon Sep 17 00:00:00 2001 +From 200e74dca03f63bac8ef550403454e069c450239 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory @@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch index 77cc1ad1..194b1fc0 100644 --- a/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 08286bb3f862fdc5f6cbdbb104d56d29d06b840a Mon Sep 17 00:00:00 2001 +From 77b28d91f16838274c5e6ac28cf10a0d8794c225 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 05/34] Make sure *.pc files are installed correctly @@ -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 f824f12bce..07abba9e5f 100644 +index 7762e47f41..bc466d35b3 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3227,7 +3227,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index f824f12bce..07abba9e5f 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3252,7 +3252,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3255,7 +3255,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 f824f12bce..07abba9e5f 100644 return ret; } diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h -index 0535017ff6..b2f8b961c0 100644 +index 350ebd377a..d0c234b864 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -92,7 +92,7 @@ protected: @@ -62,5 +62,5 @@ index 6046e5791e..87157f31ae 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch index 842d9c28..2f8e9c3b 100644 --- a/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From fdec0d79a76384fcefd55c06722380a2eccbbe22 Mon Sep 17 00:00:00 2001 +From 81db0b14c6a54d49f9150f20a30a3e188ec97052 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 06/34] Don't add resource files to LIBS parameter @@ -24,5 +24,5 @@ index de7363e51b..b2b9d01799 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch index bc386a79..ae6ecec7 100644 --- a/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From a7d2f0dacfb8e30058dcacf34450a467a5ff5d94 Mon Sep 17 00:00:00 2001 +From 5242deeb9bda4e9e692bb56a2cc681d4311cb0e5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 07/34] Prevent debug library names in pkg-config files @@ -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 07abba9e5f..e640fb8079 100644 +index bc466d35b3..67d97f520a 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3241,6 +3241,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (dot != -1) ret = ret.left(dot); } @@ -29,5 +29,5 @@ index 07abba9e5f..e640fb8079 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch index c6d0a2cb..e61a9a3e 100644 --- a/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From 95710d93c0d010afaa8ac7433b99827346bc011b Mon Sep 17 00:00:00 2001 +From 658b08047664f3f83caa324dcbfd3281e2a375cc Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 08/34] Fix linking against shared/static libpng @@ -9,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 89934c8f1d..9124e3e77e 100644 +index 44140bc7b6..19fd92bce7 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -385,8 +385,10 @@ +@@ -387,8 +387,10 @@ { "type": "pkgConfig", "args": "libpng" }, { "libs": "-llibpng16", "condition": "config.msvc" }, { "libs": "-llibpng", "condition": "config.msvc" }, @@ -26,5 +26,5 @@ index 89934c8f1d..9124e3e77e 100644 ], "use": [ -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch index db73366a..913bc60e 100644 --- a/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From 5c645a6510d3ac66a845b695c5e30c76944f22a0 Mon Sep 17 00:00:00 2001 +From 1ca21f0dc5e507ad26f16232dd75cb351ded1d6a Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 09/34] Fix linking against static D-Bus @@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644 # include #else -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64-angle/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index deddac80..7c5998b6 100644 --- a/qt5-base/mingw-w64-angle/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/qt5-base/mingw-w64-angle/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 75d943609ad0a9814656ce151a353fb391b5df33 Mon Sep 17 00:00:00 2001 +From aef97271acabe3732d92e6c291f9b9f844bc1f29 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library @@ -25,5 +25,5 @@ index c673f9a5fc..15b0f21e58 100644 }, "condition": "config.win32 && features.shared" -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-freetype2.patch index bcbdbf74..0908b405 100644 --- a/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From 54e2fd21f8daa2f61c44d764ea19f31e03390b1d Mon Sep 17 00:00:00 2001 +From d318f8d851e848936b2e171d38ebda142f733455 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 11/34] Fix linking against static freetype2 @@ -8,10 +8,10 @@ Subject: [PATCH 11/34] Fix linking against static freetype2 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 9124e3e77e..f3628f415d 100644 +index 19fd92bce7..822214a0aa 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -237,8 +237,11 @@ +@@ -238,8 +238,11 @@ }, "headers": "ft2build.h", "sources": [ @@ -22,9 +22,9 @@ index 9124e3e77e..f3628f415d 100644 + { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" }, + { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" }, + { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" }, - { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" } + { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }, + { "libs": "-lfreetype" } ], - "use": [ -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-harfbuzz.patch index ee2b3334..c552550a 100644 --- a/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From bdfd1226b5fcf7ede805676a2bb4bb8fbe047d6a Mon Sep 17 00:00:00 2001 +From 49fd90a7d66176f95ace73a34d7c2b3aca3206bd Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 12/34] Fix linking against static harfbuzz @@ -8,10 +8,10 @@ Subject: [PATCH 12/34] Fix linking against static harfbuzz 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index f3628f415d..b12a0e8ff2 100644 +index 822214a0aa..da4cab79a0 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -304,7 +304,11 @@ +@@ -306,7 +306,11 @@ }, "headers": "harfbuzz/hb.h", "sources": [ @@ -25,5 +25,5 @@ index f3628f415d..b12a0e8ff2 100644 }, "imf": { -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0013-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-angle/0013-Fix-linking-against-static-pcre.patch index a2042b98..598b53c7 100644 --- a/qt5-base/mingw-w64-angle/0013-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64-angle/0013-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From 52634efb9b9b2f3de1a2941297c7670ec7d4bdfc Mon Sep 17 00:00:00 2001 +From 1b56343203f3a75b0e1ae237da4f42f6b235940b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 13/34] Fix linking against static pcre @@ -24,5 +24,5 @@ index bdaa2d3243..90f8250c03 100644 #include -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-MariaDB.patch index 77c84b11..cdbca05c 100644 --- a/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From 6d8c6ce62a3a418cc30a6e3016eaf38ff945697b Mon Sep 17 00:00:00 2001 +From 697338ba4c3626e99aa3a501c0942a411ce55a5f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 14/34] Fix linking against shared/static MariaDB @@ -22,5 +22,5 @@ index cd20eef1df..babd0465ce 100644 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64-angle/0015-Fix-linking-against-shared-static-PostgreSQL.patch index dd9d6232..1ef4aa2c 100644 --- a/qt5-base/mingw-w64-angle/0015-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64-angle/0015-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From 0c7b1782160144c9a0839f02efd365716816400d Mon Sep 17 00:00:00 2001 +From bc71e0b2ee8e5ce96091e0fc65f2fdc986438376 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL @@ -24,5 +24,5 @@ index babd0465ce..b4b3bdec6b 100644 ] }, -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch index cfec875b..c97528bf 100644 --- a/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From c37572ff090abe65285eacaedf7e7022af92aae6 Mon Sep 17 00:00:00 2001 +From 53eb02bb30a316f3562e5886cd3fae8ad02af7a0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 16/34] Rename qtmain to qt5main @@ -53,7 +53,7 @@ index ecb167bf18..7c9368c3b3 100644 QMAKE_LIBS += -L$$QT.core.libs CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro -index 61e9f29d23..a1795bf265 100644 +index 9cb6ab0c59..4327ba365e 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -2,7 +2,7 @@ @@ -66,5 +66,5 @@ index 61e9f29d23..a1795bf265 100644 CONFIG += static -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch index 719a0360..72e387e7 100644 --- a/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch +++ b/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch @@ -1,4 +1,4 @@ -From 901d666dd3a5609f40b5fce75620b9016660b4c5 Mon Sep 17 00:00:00 2001 +From 1289a32f82d05281db146165a94fc4d06d432972 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:27:28 +0200 Subject: [PATCH 17/34] Build dynamic host libraries @@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644 -INSTALLS = lib +INSTALLS += lib -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0018-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64-angle/0018-Enable-rpath-for-build-tools.patch index d8537cdc..67323501 100644 --- a/qt5-base/mingw-w64-angle/0018-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64-angle/0018-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From 8ae9fed6ff5f5bf2e4c1d031baa7c03282268b35 Mon Sep 17 00:00:00 2001 +From 8f12c750711b71fded02ad3e6bee6e88f93f4bae Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 18/34] Enable rpath for build tools @@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644 INSTALLS += target -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0019-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64-angle/0019-Use-system-zlib-for-build-tools.patch index fd0e8883..075f79e0 100644 --- a/qt5-base/mingw-w64-angle/0019-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64-angle/0019-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 9056f0faf07d8493969ead198f30edc958f86fd7 Mon Sep 17 00:00:00 2001 +From 6e6bc8bbffff9972c86d660d3fdd99029e6c7c8a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 19/34] Use system zlib for build tools @@ -23,5 +23,5 @@ index 83e44ff9a4..4734623936 100644 } else { CONFIG += no_core_dep -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch index e6b4ff5d..3fe7ac92 100644 --- a/qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From 5e28a49dd99a5b682fcc9cd78985fc138a1cbc2f Mon Sep 17 00:00:00 2001 +From cf9f7a67dedc858d1f8b1e16747a31747787cb4e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 20/34] Use *.dll.a as import lib extension @@ -62,5 +62,5 @@ index 87157f31ae..4592fed7b2 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch index 142e2ceb..82176cd2 100644 --- a/qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From d21a2fde18007e8abbde3407ae20b967b137069e Mon Sep 17 00:00:00 2001 +From 0e8a2cab1c1a9257ad85cfa3869433c9b454f860 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 21/34] Merge shared and static library trees @@ -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 b3b3e27c44..3136889a2f 100644 +index 629ca78ff1..b4822af13f 100644 --- a/configure.pri +++ b/configure.pri -@@ -1312,3 +1312,12 @@ defineTest(createConfigStatus) { +@@ -1315,3 +1315,12 @@ defineTest(createConfigStatus) { QMAKE_POST_CONFIGURE += \ "createConfigStatus()" @@ -51,10 +51,10 @@ index fbf1f3b8df..c261c46e72 100644 !have_target:!force_qt: CONFIG -= qt diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 5da82fdb5b..5b05aa9e2a 100644 +index d8d5acaafd..167b8dbf2c 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf -@@ -246,6 +246,23 @@ for(ever) { +@@ -238,6 +238,23 @@ for(ever) { !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \ WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE } @@ -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 e640fb8079..fc7f729ae6 100644 +index 67d97f520a..a802c645c7 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3247,6 +3247,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -114,7 +114,7 @@ index e640fb8079..fc7f729ae6 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3418,9 +3421,9 @@ MakefileGenerator::writePkgConfigFile() +@@ -3421,9 +3424,9 @@ MakefileGenerator::writePkgConfigFile() t << endl; // requires @@ -128,5 +128,5 @@ index e640fb8079..fc7f729ae6 100644 t << endl; -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64-angle/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index d7b6a73c..fc9e517e 100644 --- a/qt5-base/mingw-w64-angle/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/qt5-base/mingw-w64-angle/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From 7f561d87a70af23d5d2a0c89e08ba5744b2f9585 Mon Sep 17 00:00:00 2001 +From b2d749f5e3b7b6d35345dff54c7eb76d2e1a3a44 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 22/34] Pull dependencies of static libraries in CMake modules @@ -7,18 +7,78 @@ When doing a static build of Qt, the dependencies of the Qt libraries and plugins itself must be specified when linking the final application. --- - .../data/cmake/Qt5BasicConfig.cmake.in | 148 ++++++++++++++---- + .../data/cmake/Qt5BasicConfig.cmake.in | 207 +++++++++++++++--- .../data/cmake/Qt5PluginTarget.cmake.in | 11 +- qmake/generators/makefile.cpp | 16 +- - 3 files changed, 133 insertions(+), 42 deletions(-) + 3 files changed, 192 insertions(+), 42 deletions(-) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 3ed6dd5889..15d8b8372e 100644 +index 3ed6dd5889..9325bb3190 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -49,35 +49,52 @@ but not all the files it references. +@@ -48,36 +48,110 @@ but not all the files it references. + endif() endmacro() ++!!IF !isEmpty(CMAKE_STATIC_TYPE) ++if(NOT COMMAND _qt5_add_dependencies) ++ # add dependencies via imported targets with their absolute file path so CMake does not mess with them ++ macro(_qt5_add_dependencies IMPORTED_TARGET_NAME IMPORTED_TARGET_CONFIG STATIC_DEPENDENCIES) ++ # prefer static libs ++ set(DEFAULT_CMAKE_FIND_LIBRARY_SUFFIXES \"${CMAKE_FIND_LIBRARY_SUFFIXES}\") ++ set(DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES \"${CMAKE_FIND_LIBRARY_PREFIXES}\") ++ set(CMAKE_FIND_LIBRARY_SUFFIXES .a .lib) ++ set(CMAKE_FIND_LIBRARY_PREFIXES lib \"\") ++ ++ set(DEPENDENCY_INDEX 0) ++ unset(EXTRA_PATHS) ++ unset(DEPENDENCY_TARGETS) ++ ++ foreach(LIBRARY_NAME ${STATIC_DEPENDENCIES}) ++ if (TARGET \"${LIBRARY_NAME}\") ++ list(APPEND DEPENDENCY_TARGETS \"${LIBRARY_NAME}\") ++ continue() ++ endif() ++ set(DEPENDENCY_NAME ${IMPORTED_TARGET_NAME}_DEPENDENCY_${DEPENDENCY_INDEX}) ++ if (NOT TARGET \"${DEPENDENCY_NAME}\") ++ if(EXISTS \"${LIBRARY_NAME}\") ++ set(IMPORTED_LOCATION ${LIBRARY_NAME}) ++ elseif(\"${LIBRARY_NAME}\" MATCHES \" *-l(.*)\") ++ set(LIBRARY_NAME \"${CMAKE_MATCH_1}\") ++ find_library(\"${DEPENDENCY_NAME}_LIBRARY_PATH\" \"${LIBRARY_NAME}\" PATHS \"${EXTRA_PATHS}\") ++ if (NOT EXISTS "${${DEPENDENCY_NAME}_LIBRARY_PATH}") ++ message(WARNING \"Unable to find dependency ${LIBRARY_NAME} for static Qt target (was looking in ${EXTRA_PATHS}).\") ++ continue() ++ endif() ++ set(IMPORTED_LOCATION \"${${DEPENDENCY_NAME}_LIBRARY_PATH}\") ++ elseif(\"${LIBRARY_NAME}\" MATCHES \" *-L(.*)\") ++ list(APPEND EXTRA_PATHS \"${CMAKE_MATCH_1}\") ++ else() ++ set(IMPORTED_LOCATION ${LIBRARY_NAME}) ++ message(WARNING \"Format of dependency unknown: ${LIBRARY_NAME}\") ++ endif() ++ add_library(${DEPENDENCY_NAME} STATIC IMPORTED) ++ set_property(TARGET ${DEPENDENCY_NAME} PROPERTY IMPORTED_LOCATION ${IMPORTED_LOCATION}) ++ endif() ++ if (TARGET ${DEPENDENCY_NAME}) ++ list(APPEND DEPENDENCY_TARGETS ${DEPENDENCY_NAME}) ++ endif() ++ math(EXPR DEPENDENCY_INDEX \"${DEPENDENCY_INDEX} + 1\") ++ endforeach() ++ ++ if (\"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"ALL\") ++ set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES ${DEPENDENCY_TARGETS}) ++ else() ++ set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES_${IMPORTED_TARGET_CONFIG} ${DEPENDENCY_TARGETS}) ++ endif() ++ ++ # restore previous setup ++ set(CMAKE_FIND_LIBRARY_SUFFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_SUFFIXES}\") ++ set(CMAKE_FIND_LIBRARY_PREFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES}\") ++ endmacro() ++endif() ++!!ENDIF ++ !!IF !equals(TEMPLATE, aux) -macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -38,14 +98,12 @@ index 3ed6dd5889..15d8b8372e 100644 + set(_list_sep \";\") + endif() + set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -+ \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\" + \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} +!!IF !isEmpty(CMAKE_LIB_SONAME) + \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" +!!ENDIF -+ # For backward compatibility with CMake < 2.8.12 -+ \"IMPORTED_LINK_INTERFACE_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\" + ) ++ _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\") +!!ELSE set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES - \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" @@ -77,7 +135,7 @@ index 3ed6dd5889..15d8b8372e 100644 ) endif() !!ENDIF -@@ -217,13 +234,47 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -217,13 +291,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!IF !isEmpty(CMAKE_STATIC_TYPE) add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") @@ -98,19 +156,17 @@ index 3ed6dd5889..15d8b8372e 100644 + file(STRINGS "${PRL_FILE_LOCATION}" prl_strings REGEX "QMAKE_PRL_LIBS_FOR_CMAKE") + string(REGEX REPLACE \"QMAKE_PRL_LIBS_FOR_CMAKE *= *([^\n]*)\" \"\\\\1\" static_depends ${prl_strings}) + string(REGEX REPLACE \"\\\\$\\\\$\\\\[QT_INSTALL_LIBS\\\\]\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" static_depends \"${static_depends}\") -+ set_property(TARGET ${PLUGIN_TARGET_NAME} PROPERTY -+ INTERFACE_LINK_LIBRARIES ${static_depends} -+ ) ++ _qt5_add_dependencies(\"${PLUGIN_TARGET_NAME}\" ALL \"${static_depends}\") + endmacro() + +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) + _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG) - !!ELSE ++!!ELSE + _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG) +!!ENDIF +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) + _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE) -+!!ELSE + !!ELSE + _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE) +!!ENDIF + @@ -126,7 +182,7 @@ index 3ed6dd5889..15d8b8372e 100644 !!IF !equals(TEMPLATE, aux) !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1) -@@ -238,6 +289,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -238,6 +344,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_ENABLED_FEATURES $$join(QT.$${MODULE}.enabled_features, ";")) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_DISABLED_FEATURES $$join(QT.$${MODULE}.disabled_features, ";")) @@ -183,7 +239,21 @@ index 3ed6dd5889..15d8b8372e 100644 set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE) foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}) if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR}) -@@ -328,9 +429,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -256,9 +412,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private) + endif() + endforeach() ++!!IF !isEmpty(CMAKE_STATIC_TYPE) ++ _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME}Private ALL \"Qt5::$${CMAKE_MODULE_NAME};${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}\") ++!!ELSE + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY + INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS} + ) ++!!ENDIF // CMAKE_STATIC_TYPE + endif() + + !!IF !equals(TEMPLATE, aux) +@@ -328,9 +488,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF @@ -197,7 +267,7 @@ index 3ed6dd5889..15d8b8372e 100644 !!ENDIF // CMAKE_RELEASE_TYPE !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD -@@ -341,29 +444,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -341,29 +503,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) !!ENDIF // TEMPLATE != aux @@ -251,7 +321,7 @@ index 5baf0fdb10..ec5f3cc437 100644 + +endif() diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index fc7f729ae6..095b4d2720 100644 +index a802c645c7..30756d9b64 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1019,10 +1019,18 @@ MakefileGenerator::writePrlFile(QTextStream &t) @@ -278,5 +348,5 @@ index fc7f729ae6..095b4d2720 100644 } -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0023-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-angle/0023-Allow-usage-of-static-version-with-CMake.patch index a530bbb6..bc5a767d 100644 --- a/qt5-base/mingw-w64-angle/0023-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64-angle/0023-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From c49f1674465685e03c0d95b869d6cea45dcf5447 Mon Sep 17 00:00:00 2001 +From af97d60e4f62cffec74c0c4905b79b49aab598af Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 23/34] Allow usage of static version with CMake @@ -12,13 +12,13 @@ installed in the same prefix via regular find_package(Qt5Core) --- mkspecs/features/create_cmake.prf | 103 +++--- - .../data/cmake/Qt5BasicConfig.cmake.in | 302 ++++++++++++------ + .../data/cmake/Qt5BasicConfig.cmake.in | 305 ++++++++++++------ .../data/cmake/Qt5PluginTarget.cmake.in | 18 +- .../cmake/Qt5StaticOnlyRedirection.cmake.in | 11 + src/corelib/Qt5CoreConfigExtras.cmake.in | 24 +- src/gui/Qt5GuiConfigExtras.cmake.in | 8 +- src/testlib/Qt5TestConfigExtras.cmake.in | 2 +- - 7 files changed, 315 insertions(+), 153 deletions(-) + 7 files changed, 316 insertions(+), 155 deletions(-) create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf @@ -244,7 +244,7 @@ index 2a94964b49..839a51f377 100644 # We are generating cmake files. Most developers of Qt are not aware of cmake, # so we require automatic tests to be available. The only module which should diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 15d8b8372e..939e55dfd8 100644 +index 9325bb3190..7ee0c86130 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -3,6 +3,33 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) @@ -307,19 +307,19 @@ index 15d8b8372e..939e55dfd8 100644 but this file does not exist. Possible reasons include: * The file was deleted, renamed, or moved to another location. * An install or uninstall procedure did not complete successfully. -@@ -48,23 +79,60 @@ but not all the files it references. - endif() - endmacro() - -+!!IF !isEmpty(CMAKE_STATIC_TYPE) +@@ -105,33 +136,68 @@ if(NOT COMMAND _qt5_add_dependencies) + set(CMAKE_FIND_LIBRARY_PREFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES}\") + endmacro() + endif() ++ +# ensure also regular/dynamic macro exists because it might be used in some extra config +if(NOT COMMAND _qt5_$${CMAKE_MODULE_NAME}_check_file_exists) + macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists FILE) -+ _qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static("${FILE}") ++ _qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static(\"${FILE}\") + endmacro() +endif() -+!!ENDIF -+ + !!ENDIF + !!IF !equals(TEMPLATE, aux) -macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATION IMPLIB_LOCATION) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${TARGET_CONFIG}) @@ -368,19 +368,20 @@ index 15d8b8372e..939e55dfd8 100644 endif() - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(${TARGET_NAME} PROPERTIES - \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\" \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} !!IF !isEmpty(CMAKE_LIB_SONAME) -@@ -74,7 +142,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI - \"IMPORTED_LINK_INTERFACE_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\" + \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" + !!ENDIF ) +- _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\") ++ _qt5_add_dependencies(\"${TARGET_NAME}\" \"${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\") !!ELSE - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(${TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} !!IF !isEmpty(CMAKE_LIB_SONAME) -@@ -91,9 +159,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI +@@ -148,9 +214,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI !!ELSE set(imported_implib \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF @@ -395,7 +396,7 @@ index 15d8b8372e..939e55dfd8 100644 \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib} ) endif() -@@ -101,8 +173,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI +@@ -158,8 +228,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI endmacro() !!ENDIF @@ -406,7 +407,7 @@ index 15d8b8372e..939e55dfd8 100644 !!IF !no_module_headers !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS -@@ -110,46 +183,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -167,46 +238,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" ) !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) @@ -474,7 +475,7 @@ index 15d8b8372e..939e55dfd8 100644 endforeach() !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK) -@@ -158,16 +235,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -215,16 +290,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(FIND Qt5$${CMAKE_MODULE_NAME}_FIND_COMPONENTS Private _check_private) if (NOT _check_private STREQUAL -1) foreach(_dir ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS}) @@ -498,7 +499,7 @@ index 15d8b8372e..939e55dfd8 100644 !!ENDIF // TEMPLATE != aux set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\") -@@ -175,10 +256,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -232,10 +311,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\") !!ENDIF @@ -511,7 +512,7 @@ index 15d8b8372e..939e55dfd8 100644 set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED) endif() set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET) -@@ -186,17 +267,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -243,17 +322,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET) endif() set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT) @@ -533,7 +534,7 @@ index 15d8b8372e..939e55dfd8 100644 $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT} ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET} ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED} -@@ -204,36 +285,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -261,36 +340,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) endif() @@ -589,7 +590,7 @@ index 15d8b8372e..939e55dfd8 100644 macro(_process_prl_file PRL_FILE_LOCATION CONFIGURATION) if (EXISTS \"${PRL_FILE_LOCATION}\") file(STRINGS \"${PRL_FILE_LOCATION}\" prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE\") -@@ -257,37 +343,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -312,37 +396,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endmacro() !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) @@ -650,7 +651,7 @@ index 15d8b8372e..939e55dfd8 100644 # Find plugin targets file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\") -@@ -301,7 +398,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -356,7 +451,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endforeach() endif() @@ -662,7 +663,7 @@ index 15d8b8372e..939e55dfd8 100644 set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG}) !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) -@@ -309,7 +410,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -364,7 +463,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") !!ENDIF @@ -674,7 +675,7 @@ index 15d8b8372e..939e55dfd8 100644 set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location} ) -@@ -340,16 +445,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -395,16 +498,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endif() set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE) @@ -695,15 +696,20 @@ index 15d8b8372e..939e55dfd8 100644 ) set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS) foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}) -@@ -357,66 +462,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private) +@@ -413,69 +516,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endif() endforeach() + !!IF !isEmpty(CMAKE_STATIC_TYPE) +- _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME}Private ALL \"Qt5::$${CMAKE_MODULE_NAME};${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}\") ++ _qt5_add_dependencies(${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private ALL ++ \"${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME};${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}\") + !!ELSE - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY - INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS} + set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY + INTERFACE_LINK_LIBRARIES ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS} ) + !!ENDIF // CMAKE_STATIC_TYPE endif() !!IF !equals(TEMPLATE, aux) @@ -786,7 +792,7 @@ index 15d8b8372e..939e55dfd8 100644 if (EXISTS !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" -@@ -429,7 +536,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -488,7 +594,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF @@ -795,7 +801,7 @@ index 15d8b8372e..939e55dfd8 100644 endif() !!ENDIF // CMAKE_STATIC_TYPE -@@ -439,19 +546,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -498,19 +604,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF // CMAKE_DEBUG_TYPE !!ELSE // TEMPLATE != aux @@ -997,5 +1003,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64-angle/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index 3e45a2fc..802c6e2c 100644 --- a/qt5-base/mingw-w64-angle/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/qt5-base/mingw-w64-angle/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From 5decd2ed0bdfafd01c119357c73fc91e470b9f61 Mon Sep 17 00:00:00 2001 +From 25143b06d43a9a4cceb6d038f4f97d5f2af53c8e Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 24/34] Adjust linker flags for static build with @@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644 +unset(_isExe) +!!ENDIF -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0025-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-angle/0025-Use-correct-pkg-config-static-flag.patch index 37356540..f7b5d243 100644 --- a/qt5-base/mingw-w64-angle/0025-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64-angle/0025-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From 9a0c4a937083e14ad32a8a25feb92333b5015dda Mon Sep 17 00:00:00 2001 +From 348b46baa42d1001d2a650a0fe44a2254068bb8e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 25/34] Use correct pkg-config --static flag @@ -8,7 +8,7 @@ Subject: [PATCH 25/34] Use correct pkg-config --static flag 1 file changed, 3 insertions(+) diff --git a/configure.pri b/configure.pri -index 3136889a2f..601629c047 100644 +index b4822af13f..addb27b6d7 100644 --- a/configure.pri +++ b/configure.pri @@ -328,6 +328,9 @@ defineTest(qtConfTest_detectPkgConfig) { @@ -22,5 +22,5 @@ index 3136889a2f..601629c047 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0026-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-angle/0026-Fix-macro-invoking-moc-rcc-and-uic.patch index d0b8a9b1..2050d214 100644 --- a/qt5-base/mingw-w64-angle/0026-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/qt5-base/mingw-w64-angle/0026-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From ad4a59bd142b2b3ab402ed8d0337ac972f77e76c Mon Sep 17 00:00:00 2001 +From 7fc63fcd9c5e8a2c864c7de9fa14338ce3e82969 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 26/34] Fix macro invoking moc, rcc and uic @@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0027-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-angle/0027-Ignore-errors-about-missing-feature-static.patch index 69d58afc..1dfa7de0 100644 --- a/qt5-base/mingw-w64-angle/0027-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64-angle/0027-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From a17249171793a58d2a0308879e96465e96c362f1 Mon Sep 17 00:00:00 2001 +From 93aba1e6a5106bc91b34fada1d5343ff25b9ce43 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 27/34] Ignore errors about missing feature static @@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0028-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-angle/0028-Enable-and-fix-use-of-iconv.patch index da8f6d75..4a1c752f 100644 --- a/qt5-base/mingw-w64-angle/0028-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64-angle/0028-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 94bf26c2b8ae87dc5add63ef4df8b765e4067651 Mon Sep 17 00:00:00 2001 +From 512be5eb5add4a5f2146ca0a0b3a8b7a434c600a Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 28/34] Enable and fix use of iconv @@ -74,5 +74,5 @@ index a22a7459bd..b7ed2f7281 100644 }, "icu": { -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0029-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-angle/0029-Ignore-failing-pkg-config-test.patch index d4c91f65..4ff09302 100644 --- a/qt5-base/mingw-w64-angle/0029-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64-angle/0029-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From 93dcee644f3059e381310bd0e4f905caeebfa05b Mon Sep 17 00:00:00 2001 +From 41e9bbfc0c70d1a94f7c90aef50493e3341389b7 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 29/34] Ignore failing pkg-config test @@ -21,5 +21,5 @@ index 15b0f21e58..46cc841148 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-angle/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch index cb4dc10d..1bf91a24 100644 --- a/qt5-base/mingw-w64-angle/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64-angle/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From e917a88d58047cdb3fb46c1b07fb78648bf74358 Mon Sep 17 00:00:00 2001 +From f41ba61108dd735410e4feac87fa23b321d0a20f Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 30/34] Prevent qmake from messing static lib dependencies @@ -11,7 +11,7 @@ static freetype2 and harfbuzz 2 files changed, 6 insertions(+) diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp -index 4cbe06d9dc..47535f60d5 100644 +index 7f42fbe09e..e27428c0f2 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -393,6 +393,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) @@ -39,5 +39,5 @@ index 4592fed7b2..b93d0df473 100644 for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) dirs.append(QMakeLocalFileName(dlib.toQString())); -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0031-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64-angle/0031-Hardcode-linker-flags-for-platform-plugins.patch index 958a86f8..35a1cd46 100644 --- a/qt5-base/mingw-w64-angle/0031-Hardcode-linker-flags-for-platform-plugins.patch +++ b/qt5-base/mingw-w64-angle/0031-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From fe25b3abe19208154631b6315587fce9bacc4991 Mon Sep 17 00:00:00 2001 +From 2c28928b34fc030330b00f16fcb546a477c48621 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 31/34] Hardcode linker flags for platform plugins @@ -82,7 +82,7 @@ index a1a2da547b..7ef91b574d 100644 DEFINES += QT_NO_FOREACH diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro -index 6652cefd86..a322b17cc5 100644 +index 392ee8bed1..f1f266e2c2 100644 --- a/src/plugins/platforms/offscreen/offscreen.pro +++ b/src/plugins/platforms/offscreen/offscreen.pro @@ -1,8 +1,18 @@ @@ -149,5 +149,5 @@ index 174bc7b609..e66488e364 100644 include(windows.pri) -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0032-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64-angle/0032-Fix-linking-against-static-plugins-with-qmake.patch index 937d57db..7f7d9551 100644 --- a/qt5-base/mingw-w64-angle/0032-Fix-linking-against-static-plugins-with-qmake.patch +++ b/qt5-base/mingw-w64-angle/0032-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From 1cd9a4e98c177d3b794f2c0549b6f74ddf0e6e65 Mon Sep 17 00:00:00 2001 +From 00034061c0b8ad7c875ef00a687d95c2100f15f3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 32/34] Fix linking against static plugins with qmake @@ -11,7 +11,7 @@ approach 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 5b05aa9e2a..2732c94797 100644 +index 167b8dbf2c..5cfb4f62c9 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -69,7 +69,7 @@ all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_d @@ -33,5 +33,5 @@ index 5b05aa9e2a..2732c94797 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.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0033-Disable-hardware-randomizer-for-32-bit.patch b/qt5-base/mingw-w64-angle/0033-Disable-hardware-randomizer-for-32-bit.patch index 63dc75a9..502a8a95 100644 --- a/qt5-base/mingw-w64-angle/0033-Disable-hardware-randomizer-for-32-bit.patch +++ b/qt5-base/mingw-w64-angle/0033-Disable-hardware-randomizer-for-32-bit.patch @@ -1,4 +1,4 @@ -From b26414fad10e9ff16f305b3484670260e07df70e Mon Sep 17 00:00:00 2001 +From f3ec9ba64cd4a80639959abbef537ce718dc70d6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 26 May 2018 03:47:14 +0200 Subject: [PATCH 33/34] Disable hardware randomizer for 32-bit @@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644 #else return false; -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch b/qt5-base/mingw-w64-angle/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch index 376fb282..4f5f7b1a 100644 --- a/qt5-base/mingw-w64-angle/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch +++ b/qt5-base/mingw-w64-angle/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch @@ -1,4 +1,4 @@ -From 62ddbd09af7ddeb08d21ccbaf2c8724a12c52ef6 Mon Sep 17 00:00:00 2001 +From ee1d9dbd64b6123280c47b8633daf3d407f12ae6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 3 Feb 2019 14:34:42 +0100 Subject: [PATCH 34/34] Prevent static build to prefer dynamic libraries @@ -10,10 +10,10 @@ in order to get a fully statically linked binary in the end. 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf -index c45439c3ef..7953cdd19e 100644 +index 7ca65c92b3..48fa54a166 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf -@@ -541,12 +541,12 @@ defineTest(qtConfResolveLibs) { +@@ -553,12 +553,12 @@ defineTest(qtConfResolveLibs) { # Under Windows, we look only for static libraries, as even for DLLs # one actually links against a static import library. mingw { @@ -33,5 +33,5 @@ index c45439c3ef..7953cdd19e 100644 lcan += $${lib}.lib } -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-angle/PKGBUILD b/qt5-base/mingw-w64-angle/PKGBUILD index f1ca11e6..9159d897 100644 --- a/qt5-base/mingw-w64-angle/PKGBUILD +++ b/qt5-base/mingw-w64-angle/PKGBUILD @@ -36,7 +36,7 @@ isNoOpenGL() { } pkgname=mingw-w64-qt5-base-angle -pkgver=5.12.1 +pkgver=5.12.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 @@ -86,41 +86,41 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0032-Fix-linking-against-static-plugins-with-qmake.patch' '0033-Disable-hardware-randomizer-for-32-bit.patch' '0034-Prevent-static-build-to-prefer-dynamic-libraries.patch') -sha256sums=('533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049' - '4e1dbb878b77dbba96a9564ecbded6dbd74482b52e1cf4becaa1ce741c8cf489' - 'f54815ff2fede9dbdc0ade572305ff684940714ca65e76d25f5b15cd0cb0a3da' - 'c60e6cef5d0c95b6d034ade75fde3cf150e1570f5ca62d6b32d942abcb937f86' - '0a82cde28edae5abb8d624cea407db515c1d52e8963f07aa8430c1d1f810e54a' - '39059ed786851c1cdf416c4d0a9a5b042edda83bddd03b5bfcbcae1eaf8f7694' - '4ef83cf4d211c446a5715cfa422f130492ae18bfb5cb42db9ff6516ed7fb29f1' - '48ee96ffc01d5ab7c648f4aae6cee286992e4eb406e48718058092206f8ad2eb' - '58f27f2359b3571aac44a3770a705692eed9e6fd24b6e6bf730e7aad5ee4a030' - 'cf6154d83655efbf30281c4f83d29feb252fd104849f8e2ad495da688e581314' - 'edf080092f4d158d2e42cedd50f80b3b5715ae47f740b16fa43132f1dc68cf9d' - '1c3c46c26809e59e91732d2ff082a445dac4986294f400277272c2337d8c21f3' - '3ee7b4f4ed6ea86794a5d119c7000033d0f61208150e37f35428e52611f7ae3f' - '1d18e225c4bda89fe024a47834a8b79d9c8e4d1ba884d7dc6b07a93bf0307a85' - '2affe7ac03016cfd536f63d61c0f5bd42932fc3823b7f2dbabca9c2db5a53ae6' - 'd0a2e33d20c4d6063f7546fbc84d2f6a5a96955f998ba7af4320bc005fa2a722' - '9941e9c883496bb3409a12ef3f73b6f3d76e106061381deb74380eafb1ac472f' - 'f336402daf227aa529080ab31612a205c936438ecbfab3627252164d8903c1b1' - '8cf716c22bf0fface6e3c015cd4d621425e3b20771b15ab03eeeeb59db248756' - '95f9847a1fe05ad78ae4a682208894d995becc0ca4f3463d39781e8a52543017' - '132fc790cfa528063fe95c3bc104826cb82105cd24e05ed77593115212987dc3' - '8ace42d2ec1b7a05a6bacf93f899775906c407f349efbbd2533b942fb474f200' - '8849864de4abf2dd70ffe2fe70aabb608c296eccdc41e6f4061645bd39f63c50' - '60ca9adfe6ae46d6dc7b4874c3202b46bc57f6649a45fb5301e4e4b63e70aa5e' - '47f83f04256afe1bd8701c31673e00e445b65840b5fe2bd132a98c8f292aa9c4' - '305b30fad80fba756bd3ad6c34c95030fc3927d52a3dc9b90d2705b390831734' - '91f37e9098e78881c1953c85e592e108be27dae08a83278f4a9885cb296a6871' - '9ca5f2175d8679b7312d8cb718ddc648e161a6aae631b5d4c9e528594a020d1a' - '3a5619542cb549ba7cc2bf1f9b77d524e5f9aa78d1e8dea6cd75c4f09b6aabc9' - 'e30cf84af1ff7764cb0e0644a7bfbde920f463af9c24aab53abef9cf3410ceb3' - 'fdd36ed82c5a8df7a0157b4ce9a3be16ec4c2b98cdf071a2be662603045da652' - '55b42d68ca7981ef777a7f081f840b1b80ada8c0dc9508092ec9fba151a88dfd' - '06f98f6ce25da7010e7398111ee7b79f380b79a7ab125eba3ef6d051af92cf8a' - '5a097dc80dc07aa755e77c50a469c3c08bf5b562ad9b116dbbf891a072e7bdc2' - '66047e08db2282d69563b3081b847fa7c041c3c387ab00ca72ff481b91124925') +sha256sums=('562c095a59c95f393762ec53bc05c0d80fad1758fd5ff7a5231967d1a98d56c1' + 'c00565f03113cde30d3a7f8badb93162013a88399bb06eaae70592912df8d4c5' + '050ce8f1b6c7c95b5a6c47357e8a49b078fd1df5b918466678f9e4a289069944' + 'eae6d4d5fdc434279e445cde156cb3a7e20ce490c6b0d57dbb306d879147dcf9' + 'd1b594a807f19a788ade63d13fd47d110e6ef03178ec26aab0dd0d00e328e0d7' + '8f70f6fc4b7e1cfd68717a5f0814a4bd70f4800ef052b43006c8602b793d59ec' + '06b313e9c95ed32c3b82592e7e8824c44b3a1fc554bc47ba151c5f36b46e05e2' + 'c0eee68dc34518ed4164711b3a69d50f99d4fbb0c6173c8e38dd6b5517c19536' + '545d351d7986c72b8d662d1417b28957db5a47e667e72a858bf8942f97ede6cb' + '2ba1bca2e3be4615c8b1f9f73e8868543aa3c8e4ab932a503a97ad6ccdfedf50' + 'eb04c06b8a1427efebf3c1a833a49877c697785e2f109dff233626c36cfeb007' + '3011580418c55e8bd232e5f1d9b43c9ec65dbe3339e795c8687ba1f744d89813' + '2dd37f28b8d816858e6bbed179f14036443c129c1afc7f7a768e7429afef2863' + 'da364a529d5e152ffe4e1f72a9267943ee1bb85ce44433ce4e12675e7cea27cf' + '8fe5700557c7e7ec3b24758d253dd6f6b42a32b1f739daf856fe038e2ba96425' + '61d28c257322907a4334dbe755c28d49bb66a1bc6944b5cb5d578d2cdb568e25' + '2048f2f03ae14f7687426b512fe956b7e1eea4cafba570eb9909790c745c4fe9' + 'ecef2faaba4a4e6f05f24d56b52d99518531581541dbd213d37acc579539d1c3' + '5fb06a23b7d14ed06270f34f34c972227c8674d5684d32517c5f0bcddd3d7050' + 'a77c0710c9a3f8e0cf50e6eb25b509e01284fa00409288ca885541b6e472d127' + '187deaccba8407bc8f363e1032cd5e14578c363b2d79c063ebfe131d985605f8' + '73dd1bb7cd31cbe90eda80065679aed7cad89899d6bdb531fbc062391836b2ff' + '74090e540b4276c2cf8722b3a72d99ad1fa10b44d25c980e363629b9aed87579' + 'ad74076f636d1a88d54002e8918074be29157a32a5122def2e20803bd2c0af1d' + '97be647f6d5ad29bcf9f313efbd641ca9895757d7032c740ab00bcad8d114b54' + 'c42240c548594ff05e555ff24d4b17d630cbcd2e5e90952ff88bfc85630de527' + '10aef30b86431746a002bff9e5ce5af46cb138b31a5e182aa3b9f9dbda3be22f' + 'afdabb26ec027f41f52ca6c736cfaf8a95c5c59d28061a240a20f7d521dfde2e' + 'f766bc129f5ad8e2fca7705fb5d135fbc1144aa8dddca004b141b11bc193efe1' + '65d0ac8597be9eb0a695153396b231079204d9451337807685734304b4f672ed' + 'f56f00584a77a7c80428b6218ac4a848758cf49ca047ef1b7f11b81a2b55aaee' + '7ef1fcb918d6079ae6cc97a12730faf3819f94b68f4005afb3c7cbd3c8cbb186' + 'fe65e9657a337a8fab9e362478d6d1ba794f90315a277660b05577c4c044cebb' + '586dc48f77e001152e59c28c1afdaad64c03957d0052e4905b34c2ef2bcd308a' + '46f454f756dcc298629ec6b73cb15c643edf9ace7a0e181b43055575e3e86190') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-base/mingw-w64-dynamic/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/qt5-base/mingw-w64-dynamic/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch index 96b590a3..a705f71a 100644 --- a/qt5-base/mingw-w64-dynamic/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch +++ b/qt5-base/mingw-w64-dynamic/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch @@ -1,4 +1,4 @@ -From 2ac45582566cb492858de99cf06cabf2fa575e30 Mon Sep 17 00:00:00 2001 +From 7b26289a1e7fafff7da844cdaac26b997febbc94 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/34] Adjust win32-g++ profile for cross compilation with @@ -161,5 +161,5 @@ index ed131c6823..b8e08df0be 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index e3d0f710..c7649a9c 100644 --- a/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch +++ b/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch @@ -1,4 +1,4 @@ -From 1083693a799b03cde91c83ff25d890640c01d780 Mon Sep 17 00:00:00 2001 +From 71303c275da3c576a5386dc50d4916ce21a58b16 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL @@ -23,5 +23,5 @@ index 00287b0665..35ad3007d1 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch index f364abc5..43cc3f94 100644 --- a/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch +++ b/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch @@ -1,4 +1,4 @@ -From 0be0cdb753a85725e603a02ada330cc9fd2c161e Mon Sep 17 00:00:00 2001 +From 1e421ad10dfb855e5a8626124854fb6e9ab568ca Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:41:38 +0200 Subject: [PATCH 03/34] Use external ANGLE library @@ -93,5 +93,5 @@ index 1c76a2e46f..6a5f046b34 100644 SUBDIRS += src_3rdparty_libpng src_3rdparty_freetype.depends += src_3rdparty_libpng -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 6261b628..2d00f691 100644 --- a/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From 987045e209769c2b4f8f48046167b5ef9106dd70 Mon Sep 17 00:00:00 2001 +From 200e74dca03f63bac8ef550403454e069c450239 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory @@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch index 77cc1ad1..194b1fc0 100644 --- a/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 08286bb3f862fdc5f6cbdbb104d56d29d06b840a Mon Sep 17 00:00:00 2001 +From 77b28d91f16838274c5e6ac28cf10a0d8794c225 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 05/34] Make sure *.pc files are installed correctly @@ -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 f824f12bce..07abba9e5f 100644 +index 7762e47f41..bc466d35b3 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3227,7 +3227,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index f824f12bce..07abba9e5f 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3252,7 +3252,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3255,7 +3255,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 f824f12bce..07abba9e5f 100644 return ret; } diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h -index 0535017ff6..b2f8b961c0 100644 +index 350ebd377a..d0c234b864 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -92,7 +92,7 @@ protected: @@ -62,5 +62,5 @@ index 6046e5791e..87157f31ae 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch index 842d9c28..2f8e9c3b 100644 --- a/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From fdec0d79a76384fcefd55c06722380a2eccbbe22 Mon Sep 17 00:00:00 2001 +From 81db0b14c6a54d49f9150f20a30a3e188ec97052 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 06/34] Don't add resource files to LIBS parameter @@ -24,5 +24,5 @@ index de7363e51b..b2b9d01799 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch index bc386a79..ae6ecec7 100644 --- a/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From a7d2f0dacfb8e30058dcacf34450a467a5ff5d94 Mon Sep 17 00:00:00 2001 +From 5242deeb9bda4e9e692bb56a2cc681d4311cb0e5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 07/34] Prevent debug library names in pkg-config files @@ -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 07abba9e5f..e640fb8079 100644 +index bc466d35b3..67d97f520a 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3241,6 +3241,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (dot != -1) ret = ret.left(dot); } @@ -29,5 +29,5 @@ index 07abba9e5f..e640fb8079 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch index c6d0a2cb..e61a9a3e 100644 --- a/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From 95710d93c0d010afaa8ac7433b99827346bc011b Mon Sep 17 00:00:00 2001 +From 658b08047664f3f83caa324dcbfd3281e2a375cc Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 08/34] Fix linking against shared/static libpng @@ -9,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 89934c8f1d..9124e3e77e 100644 +index 44140bc7b6..19fd92bce7 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -385,8 +385,10 @@ +@@ -387,8 +387,10 @@ { "type": "pkgConfig", "args": "libpng" }, { "libs": "-llibpng16", "condition": "config.msvc" }, { "libs": "-llibpng", "condition": "config.msvc" }, @@ -26,5 +26,5 @@ index 89934c8f1d..9124e3e77e 100644 ], "use": [ -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch index db73366a..913bc60e 100644 --- a/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From 5c645a6510d3ac66a845b695c5e30c76944f22a0 Mon Sep 17 00:00:00 2001 +From 1ca21f0dc5e507ad26f16232dd75cb351ded1d6a Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 09/34] Fix linking against static D-Bus @@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644 # include #else -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64-dynamic/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index deddac80..7c5998b6 100644 --- a/qt5-base/mingw-w64-dynamic/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/qt5-base/mingw-w64-dynamic/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 75d943609ad0a9814656ce151a353fb391b5df33 Mon Sep 17 00:00:00 2001 +From aef97271acabe3732d92e6c291f9b9f844bc1f29 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library @@ -25,5 +25,5 @@ index c673f9a5fc..15b0f21e58 100644 }, "condition": "config.win32 && features.shared" -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-freetype2.patch index bcbdbf74..0908b405 100644 --- a/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From 54e2fd21f8daa2f61c44d764ea19f31e03390b1d Mon Sep 17 00:00:00 2001 +From d318f8d851e848936b2e171d38ebda142f733455 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 11/34] Fix linking against static freetype2 @@ -8,10 +8,10 @@ Subject: [PATCH 11/34] Fix linking against static freetype2 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 9124e3e77e..f3628f415d 100644 +index 19fd92bce7..822214a0aa 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -237,8 +237,11 @@ +@@ -238,8 +238,11 @@ }, "headers": "ft2build.h", "sources": [ @@ -22,9 +22,9 @@ index 9124e3e77e..f3628f415d 100644 + { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" }, + { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" }, + { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" }, - { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" } + { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }, + { "libs": "-lfreetype" } ], - "use": [ -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-harfbuzz.patch index ee2b3334..c552550a 100644 --- a/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From bdfd1226b5fcf7ede805676a2bb4bb8fbe047d6a Mon Sep 17 00:00:00 2001 +From 49fd90a7d66176f95ace73a34d7c2b3aca3206bd Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 12/34] Fix linking against static harfbuzz @@ -8,10 +8,10 @@ Subject: [PATCH 12/34] Fix linking against static harfbuzz 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index f3628f415d..b12a0e8ff2 100644 +index 822214a0aa..da4cab79a0 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -304,7 +304,11 @@ +@@ -306,7 +306,11 @@ }, "headers": "harfbuzz/hb.h", "sources": [ @@ -25,5 +25,5 @@ index f3628f415d..b12a0e8ff2 100644 }, "imf": { -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-static-pcre.patch index a2042b98..598b53c7 100644 --- a/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From 52634efb9b9b2f3de1a2941297c7670ec7d4bdfc Mon Sep 17 00:00:00 2001 +From 1b56343203f3a75b0e1ae237da4f42f6b235940b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 13/34] Fix linking against static pcre @@ -24,5 +24,5 @@ index bdaa2d3243..90f8250c03 100644 #include -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-MariaDB.patch index 77c84b11..cdbca05c 100644 --- a/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From 6d8c6ce62a3a418cc30a6e3016eaf38ff945697b Mon Sep 17 00:00:00 2001 +From 697338ba4c3626e99aa3a501c0942a411ce55a5f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 14/34] Fix linking against shared/static MariaDB @@ -22,5 +22,5 @@ index cd20eef1df..babd0465ce 100644 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64-dynamic/0015-Fix-linking-against-shared-static-PostgreSQL.patch index dd9d6232..1ef4aa2c 100644 --- a/qt5-base/mingw-w64-dynamic/0015-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64-dynamic/0015-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From 0c7b1782160144c9a0839f02efd365716816400d Mon Sep 17 00:00:00 2001 +From bc71e0b2ee8e5ce96091e0fc65f2fdc986438376 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL @@ -24,5 +24,5 @@ index babd0465ce..b4b3bdec6b 100644 ] }, -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch index cfec875b..c97528bf 100644 --- a/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From c37572ff090abe65285eacaedf7e7022af92aae6 Mon Sep 17 00:00:00 2001 +From 53eb02bb30a316f3562e5886cd3fae8ad02af7a0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 16/34] Rename qtmain to qt5main @@ -53,7 +53,7 @@ index ecb167bf18..7c9368c3b3 100644 QMAKE_LIBS += -L$$QT.core.libs CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro -index 61e9f29d23..a1795bf265 100644 +index 9cb6ab0c59..4327ba365e 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -2,7 +2,7 @@ @@ -66,5 +66,5 @@ index 61e9f29d23..a1795bf265 100644 CONFIG += static -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch index 719a0360..72e387e7 100644 --- a/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch +++ b/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch @@ -1,4 +1,4 @@ -From 901d666dd3a5609f40b5fce75620b9016660b4c5 Mon Sep 17 00:00:00 2001 +From 1289a32f82d05281db146165a94fc4d06d432972 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:27:28 +0200 Subject: [PATCH 17/34] Build dynamic host libraries @@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644 -INSTALLS = lib +INSTALLS += lib -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0018-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64-dynamic/0018-Enable-rpath-for-build-tools.patch index d8537cdc..67323501 100644 --- a/qt5-base/mingw-w64-dynamic/0018-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64-dynamic/0018-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From 8ae9fed6ff5f5bf2e4c1d031baa7c03282268b35 Mon Sep 17 00:00:00 2001 +From 8f12c750711b71fded02ad3e6bee6e88f93f4bae Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 18/34] Enable rpath for build tools @@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644 INSTALLS += target -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0019-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64-dynamic/0019-Use-system-zlib-for-build-tools.patch index fd0e8883..075f79e0 100644 --- a/qt5-base/mingw-w64-dynamic/0019-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64-dynamic/0019-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 9056f0faf07d8493969ead198f30edc958f86fd7 Mon Sep 17 00:00:00 2001 +From 6e6bc8bbffff9972c86d660d3fdd99029e6c7c8a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 19/34] Use system zlib for build tools @@ -23,5 +23,5 @@ index 83e44ff9a4..4734623936 100644 } else { CONFIG += no_core_dep -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch index e6b4ff5d..3fe7ac92 100644 --- a/qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From 5e28a49dd99a5b682fcc9cd78985fc138a1cbc2f Mon Sep 17 00:00:00 2001 +From cf9f7a67dedc858d1f8b1e16747a31747787cb4e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 20/34] Use *.dll.a as import lib extension @@ -62,5 +62,5 @@ index 87157f31ae..4592fed7b2 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch index 142e2ceb..82176cd2 100644 --- a/qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From d21a2fde18007e8abbde3407ae20b967b137069e Mon Sep 17 00:00:00 2001 +From 0e8a2cab1c1a9257ad85cfa3869433c9b454f860 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 21/34] Merge shared and static library trees @@ -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 b3b3e27c44..3136889a2f 100644 +index 629ca78ff1..b4822af13f 100644 --- a/configure.pri +++ b/configure.pri -@@ -1312,3 +1312,12 @@ defineTest(createConfigStatus) { +@@ -1315,3 +1315,12 @@ defineTest(createConfigStatus) { QMAKE_POST_CONFIGURE += \ "createConfigStatus()" @@ -51,10 +51,10 @@ index fbf1f3b8df..c261c46e72 100644 !have_target:!force_qt: CONFIG -= qt diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 5da82fdb5b..5b05aa9e2a 100644 +index d8d5acaafd..167b8dbf2c 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf -@@ -246,6 +246,23 @@ for(ever) { +@@ -238,6 +238,23 @@ for(ever) { !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \ WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE } @@ -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 e640fb8079..fc7f729ae6 100644 +index 67d97f520a..a802c645c7 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3247,6 +3247,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -114,7 +114,7 @@ index e640fb8079..fc7f729ae6 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3418,9 +3421,9 @@ MakefileGenerator::writePkgConfigFile() +@@ -3421,9 +3424,9 @@ MakefileGenerator::writePkgConfigFile() t << endl; // requires @@ -128,5 +128,5 @@ index e640fb8079..fc7f729ae6 100644 t << endl; -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64-dynamic/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index d7b6a73c..fc9e517e 100644 --- a/qt5-base/mingw-w64-dynamic/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/qt5-base/mingw-w64-dynamic/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From 7f561d87a70af23d5d2a0c89e08ba5744b2f9585 Mon Sep 17 00:00:00 2001 +From b2d749f5e3b7b6d35345dff54c7eb76d2e1a3a44 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 22/34] Pull dependencies of static libraries in CMake modules @@ -7,18 +7,78 @@ When doing a static build of Qt, the dependencies of the Qt libraries and plugins itself must be specified when linking the final application. --- - .../data/cmake/Qt5BasicConfig.cmake.in | 148 ++++++++++++++---- + .../data/cmake/Qt5BasicConfig.cmake.in | 207 +++++++++++++++--- .../data/cmake/Qt5PluginTarget.cmake.in | 11 +- qmake/generators/makefile.cpp | 16 +- - 3 files changed, 133 insertions(+), 42 deletions(-) + 3 files changed, 192 insertions(+), 42 deletions(-) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 3ed6dd5889..15d8b8372e 100644 +index 3ed6dd5889..9325bb3190 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -49,35 +49,52 @@ but not all the files it references. +@@ -48,36 +48,110 @@ but not all the files it references. + endif() endmacro() ++!!IF !isEmpty(CMAKE_STATIC_TYPE) ++if(NOT COMMAND _qt5_add_dependencies) ++ # add dependencies via imported targets with their absolute file path so CMake does not mess with them ++ macro(_qt5_add_dependencies IMPORTED_TARGET_NAME IMPORTED_TARGET_CONFIG STATIC_DEPENDENCIES) ++ # prefer static libs ++ set(DEFAULT_CMAKE_FIND_LIBRARY_SUFFIXES \"${CMAKE_FIND_LIBRARY_SUFFIXES}\") ++ set(DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES \"${CMAKE_FIND_LIBRARY_PREFIXES}\") ++ set(CMAKE_FIND_LIBRARY_SUFFIXES .a .lib) ++ set(CMAKE_FIND_LIBRARY_PREFIXES lib \"\") ++ ++ set(DEPENDENCY_INDEX 0) ++ unset(EXTRA_PATHS) ++ unset(DEPENDENCY_TARGETS) ++ ++ foreach(LIBRARY_NAME ${STATIC_DEPENDENCIES}) ++ if (TARGET \"${LIBRARY_NAME}\") ++ list(APPEND DEPENDENCY_TARGETS \"${LIBRARY_NAME}\") ++ continue() ++ endif() ++ set(DEPENDENCY_NAME ${IMPORTED_TARGET_NAME}_DEPENDENCY_${DEPENDENCY_INDEX}) ++ if (NOT TARGET \"${DEPENDENCY_NAME}\") ++ if(EXISTS \"${LIBRARY_NAME}\") ++ set(IMPORTED_LOCATION ${LIBRARY_NAME}) ++ elseif(\"${LIBRARY_NAME}\" MATCHES \" *-l(.*)\") ++ set(LIBRARY_NAME \"${CMAKE_MATCH_1}\") ++ find_library(\"${DEPENDENCY_NAME}_LIBRARY_PATH\" \"${LIBRARY_NAME}\" PATHS \"${EXTRA_PATHS}\") ++ if (NOT EXISTS "${${DEPENDENCY_NAME}_LIBRARY_PATH}") ++ message(WARNING \"Unable to find dependency ${LIBRARY_NAME} for static Qt target (was looking in ${EXTRA_PATHS}).\") ++ continue() ++ endif() ++ set(IMPORTED_LOCATION \"${${DEPENDENCY_NAME}_LIBRARY_PATH}\") ++ elseif(\"${LIBRARY_NAME}\" MATCHES \" *-L(.*)\") ++ list(APPEND EXTRA_PATHS \"${CMAKE_MATCH_1}\") ++ else() ++ set(IMPORTED_LOCATION ${LIBRARY_NAME}) ++ message(WARNING \"Format of dependency unknown: ${LIBRARY_NAME}\") ++ endif() ++ add_library(${DEPENDENCY_NAME} STATIC IMPORTED) ++ set_property(TARGET ${DEPENDENCY_NAME} PROPERTY IMPORTED_LOCATION ${IMPORTED_LOCATION}) ++ endif() ++ if (TARGET ${DEPENDENCY_NAME}) ++ list(APPEND DEPENDENCY_TARGETS ${DEPENDENCY_NAME}) ++ endif() ++ math(EXPR DEPENDENCY_INDEX \"${DEPENDENCY_INDEX} + 1\") ++ endforeach() ++ ++ if (\"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"ALL\") ++ set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES ${DEPENDENCY_TARGETS}) ++ else() ++ set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES_${IMPORTED_TARGET_CONFIG} ${DEPENDENCY_TARGETS}) ++ endif() ++ ++ # restore previous setup ++ set(CMAKE_FIND_LIBRARY_SUFFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_SUFFIXES}\") ++ set(CMAKE_FIND_LIBRARY_PREFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES}\") ++ endmacro() ++endif() ++!!ENDIF ++ !!IF !equals(TEMPLATE, aux) -macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -38,14 +98,12 @@ index 3ed6dd5889..15d8b8372e 100644 + set(_list_sep \";\") + endif() + set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -+ \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\" + \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} +!!IF !isEmpty(CMAKE_LIB_SONAME) + \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" +!!ENDIF -+ # For backward compatibility with CMake < 2.8.12 -+ \"IMPORTED_LINK_INTERFACE_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\" + ) ++ _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\") +!!ELSE set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES - \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" @@ -77,7 +135,7 @@ index 3ed6dd5889..15d8b8372e 100644 ) endif() !!ENDIF -@@ -217,13 +234,47 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -217,13 +291,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!IF !isEmpty(CMAKE_STATIC_TYPE) add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") @@ -98,19 +156,17 @@ index 3ed6dd5889..15d8b8372e 100644 + file(STRINGS "${PRL_FILE_LOCATION}" prl_strings REGEX "QMAKE_PRL_LIBS_FOR_CMAKE") + string(REGEX REPLACE \"QMAKE_PRL_LIBS_FOR_CMAKE *= *([^\n]*)\" \"\\\\1\" static_depends ${prl_strings}) + string(REGEX REPLACE \"\\\\$\\\\$\\\\[QT_INSTALL_LIBS\\\\]\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" static_depends \"${static_depends}\") -+ set_property(TARGET ${PLUGIN_TARGET_NAME} PROPERTY -+ INTERFACE_LINK_LIBRARIES ${static_depends} -+ ) ++ _qt5_add_dependencies(\"${PLUGIN_TARGET_NAME}\" ALL \"${static_depends}\") + endmacro() + +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) + _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG) - !!ELSE ++!!ELSE + _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG) +!!ENDIF +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) + _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE) -+!!ELSE + !!ELSE + _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE) +!!ENDIF + @@ -126,7 +182,7 @@ index 3ed6dd5889..15d8b8372e 100644 !!IF !equals(TEMPLATE, aux) !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1) -@@ -238,6 +289,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -238,6 +344,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_ENABLED_FEATURES $$join(QT.$${MODULE}.enabled_features, ";")) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_DISABLED_FEATURES $$join(QT.$${MODULE}.disabled_features, ";")) @@ -183,7 +239,21 @@ index 3ed6dd5889..15d8b8372e 100644 set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE) foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}) if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR}) -@@ -328,9 +429,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -256,9 +412,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private) + endif() + endforeach() ++!!IF !isEmpty(CMAKE_STATIC_TYPE) ++ _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME}Private ALL \"Qt5::$${CMAKE_MODULE_NAME};${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}\") ++!!ELSE + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY + INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS} + ) ++!!ENDIF // CMAKE_STATIC_TYPE + endif() + + !!IF !equals(TEMPLATE, aux) +@@ -328,9 +488,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF @@ -197,7 +267,7 @@ index 3ed6dd5889..15d8b8372e 100644 !!ENDIF // CMAKE_RELEASE_TYPE !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD -@@ -341,29 +444,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -341,29 +503,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) !!ENDIF // TEMPLATE != aux @@ -251,7 +321,7 @@ index 5baf0fdb10..ec5f3cc437 100644 + +endif() diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index fc7f729ae6..095b4d2720 100644 +index a802c645c7..30756d9b64 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1019,10 +1019,18 @@ MakefileGenerator::writePrlFile(QTextStream &t) @@ -278,5 +348,5 @@ index fc7f729ae6..095b4d2720 100644 } -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0023-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-dynamic/0023-Allow-usage-of-static-version-with-CMake.patch index a530bbb6..bc5a767d 100644 --- a/qt5-base/mingw-w64-dynamic/0023-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64-dynamic/0023-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From c49f1674465685e03c0d95b869d6cea45dcf5447 Mon Sep 17 00:00:00 2001 +From af97d60e4f62cffec74c0c4905b79b49aab598af Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 23/34] Allow usage of static version with CMake @@ -12,13 +12,13 @@ installed in the same prefix via regular find_package(Qt5Core) --- mkspecs/features/create_cmake.prf | 103 +++--- - .../data/cmake/Qt5BasicConfig.cmake.in | 302 ++++++++++++------ + .../data/cmake/Qt5BasicConfig.cmake.in | 305 ++++++++++++------ .../data/cmake/Qt5PluginTarget.cmake.in | 18 +- .../cmake/Qt5StaticOnlyRedirection.cmake.in | 11 + src/corelib/Qt5CoreConfigExtras.cmake.in | 24 +- src/gui/Qt5GuiConfigExtras.cmake.in | 8 +- src/testlib/Qt5TestConfigExtras.cmake.in | 2 +- - 7 files changed, 315 insertions(+), 153 deletions(-) + 7 files changed, 316 insertions(+), 155 deletions(-) create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf @@ -244,7 +244,7 @@ index 2a94964b49..839a51f377 100644 # We are generating cmake files. Most developers of Qt are not aware of cmake, # so we require automatic tests to be available. The only module which should diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 15d8b8372e..939e55dfd8 100644 +index 9325bb3190..7ee0c86130 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -3,6 +3,33 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) @@ -307,19 +307,19 @@ index 15d8b8372e..939e55dfd8 100644 but this file does not exist. Possible reasons include: * The file was deleted, renamed, or moved to another location. * An install or uninstall procedure did not complete successfully. -@@ -48,23 +79,60 @@ but not all the files it references. - endif() - endmacro() - -+!!IF !isEmpty(CMAKE_STATIC_TYPE) +@@ -105,33 +136,68 @@ if(NOT COMMAND _qt5_add_dependencies) + set(CMAKE_FIND_LIBRARY_PREFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES}\") + endmacro() + endif() ++ +# ensure also regular/dynamic macro exists because it might be used in some extra config +if(NOT COMMAND _qt5_$${CMAKE_MODULE_NAME}_check_file_exists) + macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists FILE) -+ _qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static("${FILE}") ++ _qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static(\"${FILE}\") + endmacro() +endif() -+!!ENDIF -+ + !!ENDIF + !!IF !equals(TEMPLATE, aux) -macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATION IMPLIB_LOCATION) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${TARGET_CONFIG}) @@ -368,19 +368,20 @@ index 15d8b8372e..939e55dfd8 100644 endif() - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(${TARGET_NAME} PROPERTIES - \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\" \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} !!IF !isEmpty(CMAKE_LIB_SONAME) -@@ -74,7 +142,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI - \"IMPORTED_LINK_INTERFACE_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\" + \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" + !!ENDIF ) +- _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\") ++ _qt5_add_dependencies(\"${TARGET_NAME}\" \"${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\") !!ELSE - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(${TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} !!IF !isEmpty(CMAKE_LIB_SONAME) -@@ -91,9 +159,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI +@@ -148,9 +214,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI !!ELSE set(imported_implib \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF @@ -395,7 +396,7 @@ index 15d8b8372e..939e55dfd8 100644 \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib} ) endif() -@@ -101,8 +173,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI +@@ -158,8 +228,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI endmacro() !!ENDIF @@ -406,7 +407,7 @@ index 15d8b8372e..939e55dfd8 100644 !!IF !no_module_headers !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS -@@ -110,46 +183,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -167,46 +238,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" ) !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) @@ -474,7 +475,7 @@ index 15d8b8372e..939e55dfd8 100644 endforeach() !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK) -@@ -158,16 +235,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -215,16 +290,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(FIND Qt5$${CMAKE_MODULE_NAME}_FIND_COMPONENTS Private _check_private) if (NOT _check_private STREQUAL -1) foreach(_dir ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS}) @@ -498,7 +499,7 @@ index 15d8b8372e..939e55dfd8 100644 !!ENDIF // TEMPLATE != aux set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\") -@@ -175,10 +256,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -232,10 +311,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\") !!ENDIF @@ -511,7 +512,7 @@ index 15d8b8372e..939e55dfd8 100644 set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED) endif() set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET) -@@ -186,17 +267,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -243,17 +322,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET) endif() set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT) @@ -533,7 +534,7 @@ index 15d8b8372e..939e55dfd8 100644 $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT} ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET} ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED} -@@ -204,36 +285,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -261,36 +340,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) endif() @@ -589,7 +590,7 @@ index 15d8b8372e..939e55dfd8 100644 macro(_process_prl_file PRL_FILE_LOCATION CONFIGURATION) if (EXISTS \"${PRL_FILE_LOCATION}\") file(STRINGS \"${PRL_FILE_LOCATION}\" prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE\") -@@ -257,37 +343,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -312,37 +396,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endmacro() !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) @@ -650,7 +651,7 @@ index 15d8b8372e..939e55dfd8 100644 # Find plugin targets file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\") -@@ -301,7 +398,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -356,7 +451,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endforeach() endif() @@ -662,7 +663,7 @@ index 15d8b8372e..939e55dfd8 100644 set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG}) !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) -@@ -309,7 +410,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -364,7 +463,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") !!ENDIF @@ -674,7 +675,7 @@ index 15d8b8372e..939e55dfd8 100644 set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location} ) -@@ -340,16 +445,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -395,16 +498,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endif() set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE) @@ -695,15 +696,20 @@ index 15d8b8372e..939e55dfd8 100644 ) set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS) foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}) -@@ -357,66 +462,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private) +@@ -413,69 +516,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endif() endforeach() + !!IF !isEmpty(CMAKE_STATIC_TYPE) +- _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME}Private ALL \"Qt5::$${CMAKE_MODULE_NAME};${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}\") ++ _qt5_add_dependencies(${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private ALL ++ \"${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME};${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}\") + !!ELSE - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY - INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS} + set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY + INTERFACE_LINK_LIBRARIES ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS} ) + !!ENDIF // CMAKE_STATIC_TYPE endif() !!IF !equals(TEMPLATE, aux) @@ -786,7 +792,7 @@ index 15d8b8372e..939e55dfd8 100644 if (EXISTS !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" -@@ -429,7 +536,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -488,7 +594,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF @@ -795,7 +801,7 @@ index 15d8b8372e..939e55dfd8 100644 endif() !!ENDIF // CMAKE_STATIC_TYPE -@@ -439,19 +546,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -498,19 +604,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF // CMAKE_DEBUG_TYPE !!ELSE // TEMPLATE != aux @@ -997,5 +1003,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64-dynamic/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index 3e45a2fc..802c6e2c 100644 --- a/qt5-base/mingw-w64-dynamic/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/qt5-base/mingw-w64-dynamic/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From 5decd2ed0bdfafd01c119357c73fc91e470b9f61 Mon Sep 17 00:00:00 2001 +From 25143b06d43a9a4cceb6d038f4f97d5f2af53c8e Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 24/34] Adjust linker flags for static build with @@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644 +unset(_isExe) +!!ENDIF -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0025-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-dynamic/0025-Use-correct-pkg-config-static-flag.patch index 37356540..f7b5d243 100644 --- a/qt5-base/mingw-w64-dynamic/0025-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64-dynamic/0025-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From 9a0c4a937083e14ad32a8a25feb92333b5015dda Mon Sep 17 00:00:00 2001 +From 348b46baa42d1001d2a650a0fe44a2254068bb8e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 25/34] Use correct pkg-config --static flag @@ -8,7 +8,7 @@ Subject: [PATCH 25/34] Use correct pkg-config --static flag 1 file changed, 3 insertions(+) diff --git a/configure.pri b/configure.pri -index 3136889a2f..601629c047 100644 +index b4822af13f..addb27b6d7 100644 --- a/configure.pri +++ b/configure.pri @@ -328,6 +328,9 @@ defineTest(qtConfTest_detectPkgConfig) { @@ -22,5 +22,5 @@ index 3136889a2f..601629c047 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0026-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-dynamic/0026-Fix-macro-invoking-moc-rcc-and-uic.patch index d0b8a9b1..2050d214 100644 --- a/qt5-base/mingw-w64-dynamic/0026-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/qt5-base/mingw-w64-dynamic/0026-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From ad4a59bd142b2b3ab402ed8d0337ac972f77e76c Mon Sep 17 00:00:00 2001 +From 7fc63fcd9c5e8a2c864c7de9fa14338ce3e82969 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 26/34] Fix macro invoking moc, rcc and uic @@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0027-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-dynamic/0027-Ignore-errors-about-missing-feature-static.patch index 69d58afc..1dfa7de0 100644 --- a/qt5-base/mingw-w64-dynamic/0027-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64-dynamic/0027-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From a17249171793a58d2a0308879e96465e96c362f1 Mon Sep 17 00:00:00 2001 +From 93aba1e6a5106bc91b34fada1d5343ff25b9ce43 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 27/34] Ignore errors about missing feature static @@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0028-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-dynamic/0028-Enable-and-fix-use-of-iconv.patch index da8f6d75..4a1c752f 100644 --- a/qt5-base/mingw-w64-dynamic/0028-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64-dynamic/0028-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 94bf26c2b8ae87dc5add63ef4df8b765e4067651 Mon Sep 17 00:00:00 2001 +From 512be5eb5add4a5f2146ca0a0b3a8b7a434c600a Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 28/34] Enable and fix use of iconv @@ -74,5 +74,5 @@ index a22a7459bd..b7ed2f7281 100644 }, "icu": { -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0029-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-dynamic/0029-Ignore-failing-pkg-config-test.patch index d4c91f65..4ff09302 100644 --- a/qt5-base/mingw-w64-dynamic/0029-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64-dynamic/0029-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From 93dcee644f3059e381310bd0e4f905caeebfa05b Mon Sep 17 00:00:00 2001 +From 41e9bbfc0c70d1a94f7c90aef50493e3341389b7 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 29/34] Ignore failing pkg-config test @@ -21,5 +21,5 @@ index 15b0f21e58..46cc841148 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-dynamic/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch index cb4dc10d..1bf91a24 100644 --- a/qt5-base/mingw-w64-dynamic/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64-dynamic/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From e917a88d58047cdb3fb46c1b07fb78648bf74358 Mon Sep 17 00:00:00 2001 +From f41ba61108dd735410e4feac87fa23b321d0a20f Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 30/34] Prevent qmake from messing static lib dependencies @@ -11,7 +11,7 @@ static freetype2 and harfbuzz 2 files changed, 6 insertions(+) diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp -index 4cbe06d9dc..47535f60d5 100644 +index 7f42fbe09e..e27428c0f2 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -393,6 +393,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) @@ -39,5 +39,5 @@ index 4592fed7b2..b93d0df473 100644 for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) dirs.append(QMakeLocalFileName(dlib.toQString())); -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0031-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64-dynamic/0031-Hardcode-linker-flags-for-platform-plugins.patch index 958a86f8..35a1cd46 100644 --- a/qt5-base/mingw-w64-dynamic/0031-Hardcode-linker-flags-for-platform-plugins.patch +++ b/qt5-base/mingw-w64-dynamic/0031-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From fe25b3abe19208154631b6315587fce9bacc4991 Mon Sep 17 00:00:00 2001 +From 2c28928b34fc030330b00f16fcb546a477c48621 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 31/34] Hardcode linker flags for platform plugins @@ -82,7 +82,7 @@ index a1a2da547b..7ef91b574d 100644 DEFINES += QT_NO_FOREACH diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro -index 6652cefd86..a322b17cc5 100644 +index 392ee8bed1..f1f266e2c2 100644 --- a/src/plugins/platforms/offscreen/offscreen.pro +++ b/src/plugins/platforms/offscreen/offscreen.pro @@ -1,8 +1,18 @@ @@ -149,5 +149,5 @@ index 174bc7b609..e66488e364 100644 include(windows.pri) -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0032-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64-dynamic/0032-Fix-linking-against-static-plugins-with-qmake.patch index 937d57db..7f7d9551 100644 --- a/qt5-base/mingw-w64-dynamic/0032-Fix-linking-against-static-plugins-with-qmake.patch +++ b/qt5-base/mingw-w64-dynamic/0032-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From 1cd9a4e98c177d3b794f2c0549b6f74ddf0e6e65 Mon Sep 17 00:00:00 2001 +From 00034061c0b8ad7c875ef00a687d95c2100f15f3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 32/34] Fix linking against static plugins with qmake @@ -11,7 +11,7 @@ approach 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 5b05aa9e2a..2732c94797 100644 +index 167b8dbf2c..5cfb4f62c9 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -69,7 +69,7 @@ all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_d @@ -33,5 +33,5 @@ index 5b05aa9e2a..2732c94797 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.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0033-Disable-hardware-randomizer-for-32-bit.patch b/qt5-base/mingw-w64-dynamic/0033-Disable-hardware-randomizer-for-32-bit.patch index 63dc75a9..502a8a95 100644 --- a/qt5-base/mingw-w64-dynamic/0033-Disable-hardware-randomizer-for-32-bit.patch +++ b/qt5-base/mingw-w64-dynamic/0033-Disable-hardware-randomizer-for-32-bit.patch @@ -1,4 +1,4 @@ -From b26414fad10e9ff16f305b3484670260e07df70e Mon Sep 17 00:00:00 2001 +From f3ec9ba64cd4a80639959abbef537ce718dc70d6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 26 May 2018 03:47:14 +0200 Subject: [PATCH 33/34] Disable hardware randomizer for 32-bit @@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644 #else return false; -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch b/qt5-base/mingw-w64-dynamic/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch index 376fb282..4f5f7b1a 100644 --- a/qt5-base/mingw-w64-dynamic/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch +++ b/qt5-base/mingw-w64-dynamic/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch @@ -1,4 +1,4 @@ -From 62ddbd09af7ddeb08d21ccbaf2c8724a12c52ef6 Mon Sep 17 00:00:00 2001 +From ee1d9dbd64b6123280c47b8633daf3d407f12ae6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 3 Feb 2019 14:34:42 +0100 Subject: [PATCH 34/34] Prevent static build to prefer dynamic libraries @@ -10,10 +10,10 @@ in order to get a fully statically linked binary in the end. 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf -index c45439c3ef..7953cdd19e 100644 +index 7ca65c92b3..48fa54a166 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf -@@ -541,12 +541,12 @@ defineTest(qtConfResolveLibs) { +@@ -553,12 +553,12 @@ defineTest(qtConfResolveLibs) { # Under Windows, we look only for static libraries, as even for DLLs # one actually links against a static import library. mingw { @@ -33,5 +33,5 @@ index c45439c3ef..7953cdd19e 100644 lcan += $${lib}.lib } -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-dynamic/PKGBUILD b/qt5-base/mingw-w64-dynamic/PKGBUILD index e6fe231d..45f75fe2 100644 --- a/qt5-base/mingw-w64-dynamic/PKGBUILD +++ b/qt5-base/mingw-w64-dynamic/PKGBUILD @@ -36,7 +36,7 @@ isNoOpenGL() { } pkgname=mingw-w64-qt5-base-dynamic -pkgver=5.12.1 +pkgver=5.12.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 @@ -86,41 +86,41 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0032-Fix-linking-against-static-plugins-with-qmake.patch' '0033-Disable-hardware-randomizer-for-32-bit.patch' '0034-Prevent-static-build-to-prefer-dynamic-libraries.patch') -sha256sums=('533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049' - '4e1dbb878b77dbba96a9564ecbded6dbd74482b52e1cf4becaa1ce741c8cf489' - 'f54815ff2fede9dbdc0ade572305ff684940714ca65e76d25f5b15cd0cb0a3da' - 'c60e6cef5d0c95b6d034ade75fde3cf150e1570f5ca62d6b32d942abcb937f86' - '0a82cde28edae5abb8d624cea407db515c1d52e8963f07aa8430c1d1f810e54a' - '39059ed786851c1cdf416c4d0a9a5b042edda83bddd03b5bfcbcae1eaf8f7694' - '4ef83cf4d211c446a5715cfa422f130492ae18bfb5cb42db9ff6516ed7fb29f1' - '48ee96ffc01d5ab7c648f4aae6cee286992e4eb406e48718058092206f8ad2eb' - '58f27f2359b3571aac44a3770a705692eed9e6fd24b6e6bf730e7aad5ee4a030' - 'cf6154d83655efbf30281c4f83d29feb252fd104849f8e2ad495da688e581314' - 'edf080092f4d158d2e42cedd50f80b3b5715ae47f740b16fa43132f1dc68cf9d' - '1c3c46c26809e59e91732d2ff082a445dac4986294f400277272c2337d8c21f3' - '3ee7b4f4ed6ea86794a5d119c7000033d0f61208150e37f35428e52611f7ae3f' - '1d18e225c4bda89fe024a47834a8b79d9c8e4d1ba884d7dc6b07a93bf0307a85' - '2affe7ac03016cfd536f63d61c0f5bd42932fc3823b7f2dbabca9c2db5a53ae6' - 'd0a2e33d20c4d6063f7546fbc84d2f6a5a96955f998ba7af4320bc005fa2a722' - '9941e9c883496bb3409a12ef3f73b6f3d76e106061381deb74380eafb1ac472f' - 'f336402daf227aa529080ab31612a205c936438ecbfab3627252164d8903c1b1' - '8cf716c22bf0fface6e3c015cd4d621425e3b20771b15ab03eeeeb59db248756' - '95f9847a1fe05ad78ae4a682208894d995becc0ca4f3463d39781e8a52543017' - '132fc790cfa528063fe95c3bc104826cb82105cd24e05ed77593115212987dc3' - '8ace42d2ec1b7a05a6bacf93f899775906c407f349efbbd2533b942fb474f200' - '8849864de4abf2dd70ffe2fe70aabb608c296eccdc41e6f4061645bd39f63c50' - '60ca9adfe6ae46d6dc7b4874c3202b46bc57f6649a45fb5301e4e4b63e70aa5e' - '47f83f04256afe1bd8701c31673e00e445b65840b5fe2bd132a98c8f292aa9c4' - '305b30fad80fba756bd3ad6c34c95030fc3927d52a3dc9b90d2705b390831734' - '91f37e9098e78881c1953c85e592e108be27dae08a83278f4a9885cb296a6871' - '9ca5f2175d8679b7312d8cb718ddc648e161a6aae631b5d4c9e528594a020d1a' - '3a5619542cb549ba7cc2bf1f9b77d524e5f9aa78d1e8dea6cd75c4f09b6aabc9' - 'e30cf84af1ff7764cb0e0644a7bfbde920f463af9c24aab53abef9cf3410ceb3' - 'fdd36ed82c5a8df7a0157b4ce9a3be16ec4c2b98cdf071a2be662603045da652' - '55b42d68ca7981ef777a7f081f840b1b80ada8c0dc9508092ec9fba151a88dfd' - '06f98f6ce25da7010e7398111ee7b79f380b79a7ab125eba3ef6d051af92cf8a' - '5a097dc80dc07aa755e77c50a469c3c08bf5b562ad9b116dbbf891a072e7bdc2' - '66047e08db2282d69563b3081b847fa7c041c3c387ab00ca72ff481b91124925') +sha256sums=('562c095a59c95f393762ec53bc05c0d80fad1758fd5ff7a5231967d1a98d56c1' + 'c00565f03113cde30d3a7f8badb93162013a88399bb06eaae70592912df8d4c5' + '050ce8f1b6c7c95b5a6c47357e8a49b078fd1df5b918466678f9e4a289069944' + 'eae6d4d5fdc434279e445cde156cb3a7e20ce490c6b0d57dbb306d879147dcf9' + 'd1b594a807f19a788ade63d13fd47d110e6ef03178ec26aab0dd0d00e328e0d7' + '8f70f6fc4b7e1cfd68717a5f0814a4bd70f4800ef052b43006c8602b793d59ec' + '06b313e9c95ed32c3b82592e7e8824c44b3a1fc554bc47ba151c5f36b46e05e2' + 'c0eee68dc34518ed4164711b3a69d50f99d4fbb0c6173c8e38dd6b5517c19536' + '545d351d7986c72b8d662d1417b28957db5a47e667e72a858bf8942f97ede6cb' + '2ba1bca2e3be4615c8b1f9f73e8868543aa3c8e4ab932a503a97ad6ccdfedf50' + 'eb04c06b8a1427efebf3c1a833a49877c697785e2f109dff233626c36cfeb007' + '3011580418c55e8bd232e5f1d9b43c9ec65dbe3339e795c8687ba1f744d89813' + '2dd37f28b8d816858e6bbed179f14036443c129c1afc7f7a768e7429afef2863' + 'da364a529d5e152ffe4e1f72a9267943ee1bb85ce44433ce4e12675e7cea27cf' + '8fe5700557c7e7ec3b24758d253dd6f6b42a32b1f739daf856fe038e2ba96425' + '61d28c257322907a4334dbe755c28d49bb66a1bc6944b5cb5d578d2cdb568e25' + '2048f2f03ae14f7687426b512fe956b7e1eea4cafba570eb9909790c745c4fe9' + 'ecef2faaba4a4e6f05f24d56b52d99518531581541dbd213d37acc579539d1c3' + '5fb06a23b7d14ed06270f34f34c972227c8674d5684d32517c5f0bcddd3d7050' + 'a77c0710c9a3f8e0cf50e6eb25b509e01284fa00409288ca885541b6e472d127' + '187deaccba8407bc8f363e1032cd5e14578c363b2d79c063ebfe131d985605f8' + '73dd1bb7cd31cbe90eda80065679aed7cad89899d6bdb531fbc062391836b2ff' + '74090e540b4276c2cf8722b3a72d99ad1fa10b44d25c980e363629b9aed87579' + 'ad74076f636d1a88d54002e8918074be29157a32a5122def2e20803bd2c0af1d' + '97be647f6d5ad29bcf9f313efbd641ca9895757d7032c740ab00bcad8d114b54' + 'c42240c548594ff05e555ff24d4b17d630cbcd2e5e90952ff88bfc85630de527' + '10aef30b86431746a002bff9e5ce5af46cb138b31a5e182aa3b9f9dbda3be22f' + 'afdabb26ec027f41f52ca6c736cfaf8a95c5c59d28061a240a20f7d521dfde2e' + 'f766bc129f5ad8e2fca7705fb5d135fbc1144aa8dddca004b141b11bc193efe1' + '65d0ac8597be9eb0a695153396b231079204d9451337807685734304b4f672ed' + 'f56f00584a77a7c80428b6218ac4a848758cf49ca047ef1b7f11b81a2b55aaee' + '7ef1fcb918d6079ae6cc97a12730faf3819f94b68f4005afb3c7cbd3c8cbb186' + 'fe65e9657a337a8fab9e362478d6d1ba794f90315a277660b05577c4c044cebb' + '586dc48f77e001152e59c28c1afdaad64c03957d0052e4905b34c2ef2bcd308a' + '46f454f756dcc298629ec6b73cb15c643edf9ace7a0e181b43055575e3e86190') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-base/mingw-w64-static/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/qt5-base/mingw-w64-static/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch index 96b590a3..a705f71a 100644 --- a/qt5-base/mingw-w64-static/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch +++ b/qt5-base/mingw-w64-static/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch @@ -1,4 +1,4 @@ -From 2ac45582566cb492858de99cf06cabf2fa575e30 Mon Sep 17 00:00:00 2001 +From 7b26289a1e7fafff7da844cdaac26b997febbc94 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/34] Adjust win32-g++ profile for cross compilation with @@ -161,5 +161,5 @@ index ed131c6823..b8e08df0be 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index e3d0f710..c7649a9c 100644 --- a/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch +++ b/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch @@ -1,4 +1,4 @@ -From 1083693a799b03cde91c83ff25d890640c01d780 Mon Sep 17 00:00:00 2001 +From 71303c275da3c576a5386dc50d4916ce21a58b16 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL @@ -23,5 +23,5 @@ index 00287b0665..35ad3007d1 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch index f364abc5..43cc3f94 100644 --- a/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch +++ b/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch @@ -1,4 +1,4 @@ -From 0be0cdb753a85725e603a02ada330cc9fd2c161e Mon Sep 17 00:00:00 2001 +From 1e421ad10dfb855e5a8626124854fb6e9ab568ca Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:41:38 +0200 Subject: [PATCH 03/34] Use external ANGLE library @@ -93,5 +93,5 @@ index 1c76a2e46f..6a5f046b34 100644 SUBDIRS += src_3rdparty_libpng src_3rdparty_freetype.depends += src_3rdparty_libpng -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 6261b628..2d00f691 100644 --- a/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From 987045e209769c2b4f8f48046167b5ef9106dd70 Mon Sep 17 00:00:00 2001 +From 200e74dca03f63bac8ef550403454e069c450239 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory @@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch index 77cc1ad1..194b1fc0 100644 --- a/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 08286bb3f862fdc5f6cbdbb104d56d29d06b840a Mon Sep 17 00:00:00 2001 +From 77b28d91f16838274c5e6ac28cf10a0d8794c225 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 05/34] Make sure *.pc files are installed correctly @@ -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 f824f12bce..07abba9e5f 100644 +index 7762e47f41..bc466d35b3 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3227,7 +3227,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index f824f12bce..07abba9e5f 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3252,7 +3252,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3255,7 +3255,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 f824f12bce..07abba9e5f 100644 return ret; } diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h -index 0535017ff6..b2f8b961c0 100644 +index 350ebd377a..d0c234b864 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -92,7 +92,7 @@ protected: @@ -62,5 +62,5 @@ index 6046e5791e..87157f31ae 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch index 842d9c28..2f8e9c3b 100644 --- a/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From fdec0d79a76384fcefd55c06722380a2eccbbe22 Mon Sep 17 00:00:00 2001 +From 81db0b14c6a54d49f9150f20a30a3e188ec97052 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 06/34] Don't add resource files to LIBS parameter @@ -24,5 +24,5 @@ index de7363e51b..b2b9d01799 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch index bc386a79..ae6ecec7 100644 --- a/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From a7d2f0dacfb8e30058dcacf34450a467a5ff5d94 Mon Sep 17 00:00:00 2001 +From 5242deeb9bda4e9e692bb56a2cc681d4311cb0e5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 07/34] Prevent debug library names in pkg-config files @@ -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 07abba9e5f..e640fb8079 100644 +index bc466d35b3..67d97f520a 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3241,6 +3241,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (dot != -1) ret = ret.left(dot); } @@ -29,5 +29,5 @@ index 07abba9e5f..e640fb8079 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch index c6d0a2cb..e61a9a3e 100644 --- a/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From 95710d93c0d010afaa8ac7433b99827346bc011b Mon Sep 17 00:00:00 2001 +From 658b08047664f3f83caa324dcbfd3281e2a375cc Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 08/34] Fix linking against shared/static libpng @@ -9,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 89934c8f1d..9124e3e77e 100644 +index 44140bc7b6..19fd92bce7 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -385,8 +385,10 @@ +@@ -387,8 +387,10 @@ { "type": "pkgConfig", "args": "libpng" }, { "libs": "-llibpng16", "condition": "config.msvc" }, { "libs": "-llibpng", "condition": "config.msvc" }, @@ -26,5 +26,5 @@ index 89934c8f1d..9124e3e77e 100644 ], "use": [ -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch index db73366a..913bc60e 100644 --- a/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From 5c645a6510d3ac66a845b695c5e30c76944f22a0 Mon Sep 17 00:00:00 2001 +From 1ca21f0dc5e507ad26f16232dd75cb351ded1d6a Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 09/34] Fix linking against static D-Bus @@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644 # include #else -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64-static/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index deddac80..7c5998b6 100644 --- a/qt5-base/mingw-w64-static/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/qt5-base/mingw-w64-static/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 75d943609ad0a9814656ce151a353fb391b5df33 Mon Sep 17 00:00:00 2001 +From aef97271acabe3732d92e6c291f9b9f844bc1f29 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library @@ -25,5 +25,5 @@ index c673f9a5fc..15b0f21e58 100644 }, "condition": "config.win32 && features.shared" -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch index bcbdbf74..0908b405 100644 --- a/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From 54e2fd21f8daa2f61c44d764ea19f31e03390b1d Mon Sep 17 00:00:00 2001 +From d318f8d851e848936b2e171d38ebda142f733455 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 11/34] Fix linking against static freetype2 @@ -8,10 +8,10 @@ Subject: [PATCH 11/34] Fix linking against static freetype2 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 9124e3e77e..f3628f415d 100644 +index 19fd92bce7..822214a0aa 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -237,8 +237,11 @@ +@@ -238,8 +238,11 @@ }, "headers": "ft2build.h", "sources": [ @@ -22,9 +22,9 @@ index 9124e3e77e..f3628f415d 100644 + { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" }, + { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" }, + { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" }, - { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" } + { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }, + { "libs": "-lfreetype" } ], - "use": [ -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-harfbuzz.patch index ee2b3334..c552550a 100644 --- a/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From bdfd1226b5fcf7ede805676a2bb4bb8fbe047d6a Mon Sep 17 00:00:00 2001 +From 49fd90a7d66176f95ace73a34d7c2b3aca3206bd Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 12/34] Fix linking against static harfbuzz @@ -8,10 +8,10 @@ Subject: [PATCH 12/34] Fix linking against static harfbuzz 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index f3628f415d..b12a0e8ff2 100644 +index 822214a0aa..da4cab79a0 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -304,7 +304,11 @@ +@@ -306,7 +306,11 @@ }, "headers": "harfbuzz/hb.h", "sources": [ @@ -25,5 +25,5 @@ index f3628f415d..b12a0e8ff2 100644 }, "imf": { -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0013-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-static/0013-Fix-linking-against-static-pcre.patch index a2042b98..598b53c7 100644 --- a/qt5-base/mingw-w64-static/0013-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64-static/0013-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From 52634efb9b9b2f3de1a2941297c7670ec7d4bdfc Mon Sep 17 00:00:00 2001 +From 1b56343203f3a75b0e1ae237da4f42f6b235940b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 13/34] Fix linking against static pcre @@ -24,5 +24,5 @@ index bdaa2d3243..90f8250c03 100644 #include -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-MariaDB.patch index 77c84b11..cdbca05c 100644 --- a/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From 6d8c6ce62a3a418cc30a6e3016eaf38ff945697b Mon Sep 17 00:00:00 2001 +From 697338ba4c3626e99aa3a501c0942a411ce55a5f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 14/34] Fix linking against shared/static MariaDB @@ -22,5 +22,5 @@ index cd20eef1df..babd0465ce 100644 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64-static/0015-Fix-linking-against-shared-static-PostgreSQL.patch index dd9d6232..1ef4aa2c 100644 --- a/qt5-base/mingw-w64-static/0015-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64-static/0015-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From 0c7b1782160144c9a0839f02efd365716816400d Mon Sep 17 00:00:00 2001 +From bc71e0b2ee8e5ce96091e0fc65f2fdc986438376 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL @@ -24,5 +24,5 @@ index babd0465ce..b4b3bdec6b 100644 ] }, -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch index cfec875b..c97528bf 100644 --- a/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From c37572ff090abe65285eacaedf7e7022af92aae6 Mon Sep 17 00:00:00 2001 +From 53eb02bb30a316f3562e5886cd3fae8ad02af7a0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 16/34] Rename qtmain to qt5main @@ -53,7 +53,7 @@ index ecb167bf18..7c9368c3b3 100644 QMAKE_LIBS += -L$$QT.core.libs CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro -index 61e9f29d23..a1795bf265 100644 +index 9cb6ab0c59..4327ba365e 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -2,7 +2,7 @@ @@ -66,5 +66,5 @@ index 61e9f29d23..a1795bf265 100644 CONFIG += static -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch index 719a0360..72e387e7 100644 --- a/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch +++ b/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch @@ -1,4 +1,4 @@ -From 901d666dd3a5609f40b5fce75620b9016660b4c5 Mon Sep 17 00:00:00 2001 +From 1289a32f82d05281db146165a94fc4d06d432972 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:27:28 +0200 Subject: [PATCH 17/34] Build dynamic host libraries @@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644 -INSTALLS = lib +INSTALLS += lib -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0018-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64-static/0018-Enable-rpath-for-build-tools.patch index d8537cdc..67323501 100644 --- a/qt5-base/mingw-w64-static/0018-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64-static/0018-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From 8ae9fed6ff5f5bf2e4c1d031baa7c03282268b35 Mon Sep 17 00:00:00 2001 +From 8f12c750711b71fded02ad3e6bee6e88f93f4bae Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 18/34] Enable rpath for build tools @@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644 INSTALLS += target -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0019-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64-static/0019-Use-system-zlib-for-build-tools.patch index fd0e8883..075f79e0 100644 --- a/qt5-base/mingw-w64-static/0019-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64-static/0019-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 9056f0faf07d8493969ead198f30edc958f86fd7 Mon Sep 17 00:00:00 2001 +From 6e6bc8bbffff9972c86d660d3fdd99029e6c7c8a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 19/34] Use system zlib for build tools @@ -23,5 +23,5 @@ index 83e44ff9a4..4734623936 100644 } else { CONFIG += no_core_dep -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch index e6b4ff5d..3fe7ac92 100644 --- a/qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From 5e28a49dd99a5b682fcc9cd78985fc138a1cbc2f Mon Sep 17 00:00:00 2001 +From cf9f7a67dedc858d1f8b1e16747a31747787cb4e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 20/34] Use *.dll.a as import lib extension @@ -62,5 +62,5 @@ index 87157f31ae..4592fed7b2 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch index 142e2ceb..82176cd2 100644 --- a/qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From d21a2fde18007e8abbde3407ae20b967b137069e Mon Sep 17 00:00:00 2001 +From 0e8a2cab1c1a9257ad85cfa3869433c9b454f860 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 21/34] Merge shared and static library trees @@ -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 b3b3e27c44..3136889a2f 100644 +index 629ca78ff1..b4822af13f 100644 --- a/configure.pri +++ b/configure.pri -@@ -1312,3 +1312,12 @@ defineTest(createConfigStatus) { +@@ -1315,3 +1315,12 @@ defineTest(createConfigStatus) { QMAKE_POST_CONFIGURE += \ "createConfigStatus()" @@ -51,10 +51,10 @@ index fbf1f3b8df..c261c46e72 100644 !have_target:!force_qt: CONFIG -= qt diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 5da82fdb5b..5b05aa9e2a 100644 +index d8d5acaafd..167b8dbf2c 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf -@@ -246,6 +246,23 @@ for(ever) { +@@ -238,6 +238,23 @@ for(ever) { !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \ WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE } @@ -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 e640fb8079..fc7f729ae6 100644 +index 67d97f520a..a802c645c7 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3247,6 +3247,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -114,7 +114,7 @@ index e640fb8079..fc7f729ae6 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3418,9 +3421,9 @@ MakefileGenerator::writePkgConfigFile() +@@ -3421,9 +3424,9 @@ MakefileGenerator::writePkgConfigFile() t << endl; // requires @@ -128,5 +128,5 @@ index e640fb8079..fc7f729ae6 100644 t << endl; -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64-static/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index d7b6a73c..fc9e517e 100644 --- a/qt5-base/mingw-w64-static/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/qt5-base/mingw-w64-static/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From 7f561d87a70af23d5d2a0c89e08ba5744b2f9585 Mon Sep 17 00:00:00 2001 +From b2d749f5e3b7b6d35345dff54c7eb76d2e1a3a44 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 22/34] Pull dependencies of static libraries in CMake modules @@ -7,18 +7,78 @@ When doing a static build of Qt, the dependencies of the Qt libraries and plugins itself must be specified when linking the final application. --- - .../data/cmake/Qt5BasicConfig.cmake.in | 148 ++++++++++++++---- + .../data/cmake/Qt5BasicConfig.cmake.in | 207 +++++++++++++++--- .../data/cmake/Qt5PluginTarget.cmake.in | 11 +- qmake/generators/makefile.cpp | 16 +- - 3 files changed, 133 insertions(+), 42 deletions(-) + 3 files changed, 192 insertions(+), 42 deletions(-) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 3ed6dd5889..15d8b8372e 100644 +index 3ed6dd5889..9325bb3190 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -49,35 +49,52 @@ but not all the files it references. +@@ -48,36 +48,110 @@ but not all the files it references. + endif() endmacro() ++!!IF !isEmpty(CMAKE_STATIC_TYPE) ++if(NOT COMMAND _qt5_add_dependencies) ++ # add dependencies via imported targets with their absolute file path so CMake does not mess with them ++ macro(_qt5_add_dependencies IMPORTED_TARGET_NAME IMPORTED_TARGET_CONFIG STATIC_DEPENDENCIES) ++ # prefer static libs ++ set(DEFAULT_CMAKE_FIND_LIBRARY_SUFFIXES \"${CMAKE_FIND_LIBRARY_SUFFIXES}\") ++ set(DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES \"${CMAKE_FIND_LIBRARY_PREFIXES}\") ++ set(CMAKE_FIND_LIBRARY_SUFFIXES .a .lib) ++ set(CMAKE_FIND_LIBRARY_PREFIXES lib \"\") ++ ++ set(DEPENDENCY_INDEX 0) ++ unset(EXTRA_PATHS) ++ unset(DEPENDENCY_TARGETS) ++ ++ foreach(LIBRARY_NAME ${STATIC_DEPENDENCIES}) ++ if (TARGET \"${LIBRARY_NAME}\") ++ list(APPEND DEPENDENCY_TARGETS \"${LIBRARY_NAME}\") ++ continue() ++ endif() ++ set(DEPENDENCY_NAME ${IMPORTED_TARGET_NAME}_DEPENDENCY_${DEPENDENCY_INDEX}) ++ if (NOT TARGET \"${DEPENDENCY_NAME}\") ++ if(EXISTS \"${LIBRARY_NAME}\") ++ set(IMPORTED_LOCATION ${LIBRARY_NAME}) ++ elseif(\"${LIBRARY_NAME}\" MATCHES \" *-l(.*)\") ++ set(LIBRARY_NAME \"${CMAKE_MATCH_1}\") ++ find_library(\"${DEPENDENCY_NAME}_LIBRARY_PATH\" \"${LIBRARY_NAME}\" PATHS \"${EXTRA_PATHS}\") ++ if (NOT EXISTS "${${DEPENDENCY_NAME}_LIBRARY_PATH}") ++ message(WARNING \"Unable to find dependency ${LIBRARY_NAME} for static Qt target (was looking in ${EXTRA_PATHS}).\") ++ continue() ++ endif() ++ set(IMPORTED_LOCATION \"${${DEPENDENCY_NAME}_LIBRARY_PATH}\") ++ elseif(\"${LIBRARY_NAME}\" MATCHES \" *-L(.*)\") ++ list(APPEND EXTRA_PATHS \"${CMAKE_MATCH_1}\") ++ else() ++ set(IMPORTED_LOCATION ${LIBRARY_NAME}) ++ message(WARNING \"Format of dependency unknown: ${LIBRARY_NAME}\") ++ endif() ++ add_library(${DEPENDENCY_NAME} STATIC IMPORTED) ++ set_property(TARGET ${DEPENDENCY_NAME} PROPERTY IMPORTED_LOCATION ${IMPORTED_LOCATION}) ++ endif() ++ if (TARGET ${DEPENDENCY_NAME}) ++ list(APPEND DEPENDENCY_TARGETS ${DEPENDENCY_NAME}) ++ endif() ++ math(EXPR DEPENDENCY_INDEX \"${DEPENDENCY_INDEX} + 1\") ++ endforeach() ++ ++ if (\"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"ALL\") ++ set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES ${DEPENDENCY_TARGETS}) ++ else() ++ set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES_${IMPORTED_TARGET_CONFIG} ${DEPENDENCY_TARGETS}) ++ endif() ++ ++ # restore previous setup ++ set(CMAKE_FIND_LIBRARY_SUFFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_SUFFIXES}\") ++ set(CMAKE_FIND_LIBRARY_PREFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES}\") ++ endmacro() ++endif() ++!!ENDIF ++ !!IF !equals(TEMPLATE, aux) -macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -38,14 +98,12 @@ index 3ed6dd5889..15d8b8372e 100644 + set(_list_sep \";\") + endif() + set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -+ \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\" + \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} +!!IF !isEmpty(CMAKE_LIB_SONAME) + \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" +!!ENDIF -+ # For backward compatibility with CMake < 2.8.12 -+ \"IMPORTED_LINK_INTERFACE_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\" + ) ++ _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\") +!!ELSE set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES - \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" @@ -77,7 +135,7 @@ index 3ed6dd5889..15d8b8372e 100644 ) endif() !!ENDIF -@@ -217,13 +234,47 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -217,13 +291,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!IF !isEmpty(CMAKE_STATIC_TYPE) add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") @@ -98,19 +156,17 @@ index 3ed6dd5889..15d8b8372e 100644 + file(STRINGS "${PRL_FILE_LOCATION}" prl_strings REGEX "QMAKE_PRL_LIBS_FOR_CMAKE") + string(REGEX REPLACE \"QMAKE_PRL_LIBS_FOR_CMAKE *= *([^\n]*)\" \"\\\\1\" static_depends ${prl_strings}) + string(REGEX REPLACE \"\\\\$\\\\$\\\\[QT_INSTALL_LIBS\\\\]\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" static_depends \"${static_depends}\") -+ set_property(TARGET ${PLUGIN_TARGET_NAME} PROPERTY -+ INTERFACE_LINK_LIBRARIES ${static_depends} -+ ) ++ _qt5_add_dependencies(\"${PLUGIN_TARGET_NAME}\" ALL \"${static_depends}\") + endmacro() + +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) + _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG) - !!ELSE ++!!ELSE + _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG) +!!ENDIF +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) + _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE) -+!!ELSE + !!ELSE + _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE) +!!ENDIF + @@ -126,7 +182,7 @@ index 3ed6dd5889..15d8b8372e 100644 !!IF !equals(TEMPLATE, aux) !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1) -@@ -238,6 +289,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -238,6 +344,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_ENABLED_FEATURES $$join(QT.$${MODULE}.enabled_features, ";")) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_DISABLED_FEATURES $$join(QT.$${MODULE}.disabled_features, ";")) @@ -183,7 +239,21 @@ index 3ed6dd5889..15d8b8372e 100644 set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE) foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}) if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR}) -@@ -328,9 +429,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -256,9 +412,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private) + endif() + endforeach() ++!!IF !isEmpty(CMAKE_STATIC_TYPE) ++ _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME}Private ALL \"Qt5::$${CMAKE_MODULE_NAME};${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}\") ++!!ELSE + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY + INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS} + ) ++!!ENDIF // CMAKE_STATIC_TYPE + endif() + + !!IF !equals(TEMPLATE, aux) +@@ -328,9 +488,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF @@ -197,7 +267,7 @@ index 3ed6dd5889..15d8b8372e 100644 !!ENDIF // CMAKE_RELEASE_TYPE !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD -@@ -341,29 +444,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -341,29 +503,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) !!ENDIF // TEMPLATE != aux @@ -251,7 +321,7 @@ index 5baf0fdb10..ec5f3cc437 100644 + +endif() diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index fc7f729ae6..095b4d2720 100644 +index a802c645c7..30756d9b64 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1019,10 +1019,18 @@ MakefileGenerator::writePrlFile(QTextStream &t) @@ -278,5 +348,5 @@ index fc7f729ae6..095b4d2720 100644 } -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0023-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-static/0023-Allow-usage-of-static-version-with-CMake.patch index a530bbb6..bc5a767d 100644 --- a/qt5-base/mingw-w64-static/0023-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64-static/0023-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From c49f1674465685e03c0d95b869d6cea45dcf5447 Mon Sep 17 00:00:00 2001 +From af97d60e4f62cffec74c0c4905b79b49aab598af Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 23/34] Allow usage of static version with CMake @@ -12,13 +12,13 @@ installed in the same prefix via regular find_package(Qt5Core) --- mkspecs/features/create_cmake.prf | 103 +++--- - .../data/cmake/Qt5BasicConfig.cmake.in | 302 ++++++++++++------ + .../data/cmake/Qt5BasicConfig.cmake.in | 305 ++++++++++++------ .../data/cmake/Qt5PluginTarget.cmake.in | 18 +- .../cmake/Qt5StaticOnlyRedirection.cmake.in | 11 + src/corelib/Qt5CoreConfigExtras.cmake.in | 24 +- src/gui/Qt5GuiConfigExtras.cmake.in | 8 +- src/testlib/Qt5TestConfigExtras.cmake.in | 2 +- - 7 files changed, 315 insertions(+), 153 deletions(-) + 7 files changed, 316 insertions(+), 155 deletions(-) create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf @@ -244,7 +244,7 @@ index 2a94964b49..839a51f377 100644 # We are generating cmake files. Most developers of Qt are not aware of cmake, # so we require automatic tests to be available. The only module which should diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 15d8b8372e..939e55dfd8 100644 +index 9325bb3190..7ee0c86130 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -3,6 +3,33 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) @@ -307,19 +307,19 @@ index 15d8b8372e..939e55dfd8 100644 but this file does not exist. Possible reasons include: * The file was deleted, renamed, or moved to another location. * An install or uninstall procedure did not complete successfully. -@@ -48,23 +79,60 @@ but not all the files it references. - endif() - endmacro() - -+!!IF !isEmpty(CMAKE_STATIC_TYPE) +@@ -105,33 +136,68 @@ if(NOT COMMAND _qt5_add_dependencies) + set(CMAKE_FIND_LIBRARY_PREFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES}\") + endmacro() + endif() ++ +# ensure also regular/dynamic macro exists because it might be used in some extra config +if(NOT COMMAND _qt5_$${CMAKE_MODULE_NAME}_check_file_exists) + macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists FILE) -+ _qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static("${FILE}") ++ _qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static(\"${FILE}\") + endmacro() +endif() -+!!ENDIF -+ + !!ENDIF + !!IF !equals(TEMPLATE, aux) -macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATION IMPLIB_LOCATION) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${TARGET_CONFIG}) @@ -368,19 +368,20 @@ index 15d8b8372e..939e55dfd8 100644 endif() - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(${TARGET_NAME} PROPERTIES - \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\" \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} !!IF !isEmpty(CMAKE_LIB_SONAME) -@@ -74,7 +142,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI - \"IMPORTED_LINK_INTERFACE_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\" + \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" + !!ENDIF ) +- _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\") ++ _qt5_add_dependencies(\"${TARGET_NAME}\" \"${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\") !!ELSE - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(${TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} !!IF !isEmpty(CMAKE_LIB_SONAME) -@@ -91,9 +159,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI +@@ -148,9 +214,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI !!ELSE set(imported_implib \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF @@ -395,7 +396,7 @@ index 15d8b8372e..939e55dfd8 100644 \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib} ) endif() -@@ -101,8 +173,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI +@@ -158,8 +228,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI endmacro() !!ENDIF @@ -406,7 +407,7 @@ index 15d8b8372e..939e55dfd8 100644 !!IF !no_module_headers !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS -@@ -110,46 +183,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -167,46 +238,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" ) !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) @@ -474,7 +475,7 @@ index 15d8b8372e..939e55dfd8 100644 endforeach() !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK) -@@ -158,16 +235,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -215,16 +290,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(FIND Qt5$${CMAKE_MODULE_NAME}_FIND_COMPONENTS Private _check_private) if (NOT _check_private STREQUAL -1) foreach(_dir ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS}) @@ -498,7 +499,7 @@ index 15d8b8372e..939e55dfd8 100644 !!ENDIF // TEMPLATE != aux set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\") -@@ -175,10 +256,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -232,10 +311,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\") !!ENDIF @@ -511,7 +512,7 @@ index 15d8b8372e..939e55dfd8 100644 set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED) endif() set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET) -@@ -186,17 +267,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -243,17 +322,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET) endif() set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT) @@ -533,7 +534,7 @@ index 15d8b8372e..939e55dfd8 100644 $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT} ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET} ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED} -@@ -204,36 +285,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -261,36 +340,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) endif() @@ -589,7 +590,7 @@ index 15d8b8372e..939e55dfd8 100644 macro(_process_prl_file PRL_FILE_LOCATION CONFIGURATION) if (EXISTS \"${PRL_FILE_LOCATION}\") file(STRINGS \"${PRL_FILE_LOCATION}\" prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE\") -@@ -257,37 +343,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -312,37 +396,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endmacro() !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) @@ -650,7 +651,7 @@ index 15d8b8372e..939e55dfd8 100644 # Find plugin targets file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\") -@@ -301,7 +398,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -356,7 +451,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endforeach() endif() @@ -662,7 +663,7 @@ index 15d8b8372e..939e55dfd8 100644 set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG}) !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) -@@ -309,7 +410,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -364,7 +463,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") !!ENDIF @@ -674,7 +675,7 @@ index 15d8b8372e..939e55dfd8 100644 set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location} ) -@@ -340,16 +445,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -395,16 +498,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endif() set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE) @@ -695,15 +696,20 @@ index 15d8b8372e..939e55dfd8 100644 ) set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS) foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}) -@@ -357,66 +462,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private) +@@ -413,69 +516,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endif() endforeach() + !!IF !isEmpty(CMAKE_STATIC_TYPE) +- _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME}Private ALL \"Qt5::$${CMAKE_MODULE_NAME};${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}\") ++ _qt5_add_dependencies(${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private ALL ++ \"${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME};${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}\") + !!ELSE - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY - INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS} + set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY + INTERFACE_LINK_LIBRARIES ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS} ) + !!ENDIF // CMAKE_STATIC_TYPE endif() !!IF !equals(TEMPLATE, aux) @@ -786,7 +792,7 @@ index 15d8b8372e..939e55dfd8 100644 if (EXISTS !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" -@@ -429,7 +536,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -488,7 +594,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF @@ -795,7 +801,7 @@ index 15d8b8372e..939e55dfd8 100644 endif() !!ENDIF // CMAKE_STATIC_TYPE -@@ -439,19 +546,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -498,19 +604,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF // CMAKE_DEBUG_TYPE !!ELSE // TEMPLATE != aux @@ -997,5 +1003,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64-static/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index 3e45a2fc..802c6e2c 100644 --- a/qt5-base/mingw-w64-static/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/qt5-base/mingw-w64-static/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From 5decd2ed0bdfafd01c119357c73fc91e470b9f61 Mon Sep 17 00:00:00 2001 +From 25143b06d43a9a4cceb6d038f4f97d5f2af53c8e Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 24/34] Adjust linker flags for static build with @@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644 +unset(_isExe) +!!ENDIF -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0025-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-static/0025-Use-correct-pkg-config-static-flag.patch index 37356540..f7b5d243 100644 --- a/qt5-base/mingw-w64-static/0025-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64-static/0025-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From 9a0c4a937083e14ad32a8a25feb92333b5015dda Mon Sep 17 00:00:00 2001 +From 348b46baa42d1001d2a650a0fe44a2254068bb8e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 25/34] Use correct pkg-config --static flag @@ -8,7 +8,7 @@ Subject: [PATCH 25/34] Use correct pkg-config --static flag 1 file changed, 3 insertions(+) diff --git a/configure.pri b/configure.pri -index 3136889a2f..601629c047 100644 +index b4822af13f..addb27b6d7 100644 --- a/configure.pri +++ b/configure.pri @@ -328,6 +328,9 @@ defineTest(qtConfTest_detectPkgConfig) { @@ -22,5 +22,5 @@ index 3136889a2f..601629c047 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0026-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-static/0026-Fix-macro-invoking-moc-rcc-and-uic.patch index d0b8a9b1..2050d214 100644 --- a/qt5-base/mingw-w64-static/0026-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/qt5-base/mingw-w64-static/0026-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From ad4a59bd142b2b3ab402ed8d0337ac972f77e76c Mon Sep 17 00:00:00 2001 +From 7fc63fcd9c5e8a2c864c7de9fa14338ce3e82969 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 26/34] Fix macro invoking moc, rcc and uic @@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0027-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-static/0027-Ignore-errors-about-missing-feature-static.patch index 69d58afc..1dfa7de0 100644 --- a/qt5-base/mingw-w64-static/0027-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64-static/0027-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From a17249171793a58d2a0308879e96465e96c362f1 Mon Sep 17 00:00:00 2001 +From 93aba1e6a5106bc91b34fada1d5343ff25b9ce43 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 27/34] Ignore errors about missing feature static @@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0028-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-static/0028-Enable-and-fix-use-of-iconv.patch index da8f6d75..4a1c752f 100644 --- a/qt5-base/mingw-w64-static/0028-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64-static/0028-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 94bf26c2b8ae87dc5add63ef4df8b765e4067651 Mon Sep 17 00:00:00 2001 +From 512be5eb5add4a5f2146ca0a0b3a8b7a434c600a Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 28/34] Enable and fix use of iconv @@ -74,5 +74,5 @@ index a22a7459bd..b7ed2f7281 100644 }, "icu": { -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0029-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-static/0029-Ignore-failing-pkg-config-test.patch index d4c91f65..4ff09302 100644 --- a/qt5-base/mingw-w64-static/0029-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64-static/0029-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From 93dcee644f3059e381310bd0e4f905caeebfa05b Mon Sep 17 00:00:00 2001 +From 41e9bbfc0c70d1a94f7c90aef50493e3341389b7 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 29/34] Ignore failing pkg-config test @@ -21,5 +21,5 @@ index 15b0f21e58..46cc841148 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-static/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch index cb4dc10d..1bf91a24 100644 --- a/qt5-base/mingw-w64-static/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64-static/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From e917a88d58047cdb3fb46c1b07fb78648bf74358 Mon Sep 17 00:00:00 2001 +From f41ba61108dd735410e4feac87fa23b321d0a20f Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 30/34] Prevent qmake from messing static lib dependencies @@ -11,7 +11,7 @@ static freetype2 and harfbuzz 2 files changed, 6 insertions(+) diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp -index 4cbe06d9dc..47535f60d5 100644 +index 7f42fbe09e..e27428c0f2 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -393,6 +393,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) @@ -39,5 +39,5 @@ index 4592fed7b2..b93d0df473 100644 for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) dirs.append(QMakeLocalFileName(dlib.toQString())); -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0031-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64-static/0031-Hardcode-linker-flags-for-platform-plugins.patch index 958a86f8..35a1cd46 100644 --- a/qt5-base/mingw-w64-static/0031-Hardcode-linker-flags-for-platform-plugins.patch +++ b/qt5-base/mingw-w64-static/0031-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From fe25b3abe19208154631b6315587fce9bacc4991 Mon Sep 17 00:00:00 2001 +From 2c28928b34fc030330b00f16fcb546a477c48621 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 31/34] Hardcode linker flags for platform plugins @@ -82,7 +82,7 @@ index a1a2da547b..7ef91b574d 100644 DEFINES += QT_NO_FOREACH diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro -index 6652cefd86..a322b17cc5 100644 +index 392ee8bed1..f1f266e2c2 100644 --- a/src/plugins/platforms/offscreen/offscreen.pro +++ b/src/plugins/platforms/offscreen/offscreen.pro @@ -1,8 +1,18 @@ @@ -149,5 +149,5 @@ index 174bc7b609..e66488e364 100644 include(windows.pri) -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0032-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64-static/0032-Fix-linking-against-static-plugins-with-qmake.patch index 937d57db..7f7d9551 100644 --- a/qt5-base/mingw-w64-static/0032-Fix-linking-against-static-plugins-with-qmake.patch +++ b/qt5-base/mingw-w64-static/0032-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From 1cd9a4e98c177d3b794f2c0549b6f74ddf0e6e65 Mon Sep 17 00:00:00 2001 +From 00034061c0b8ad7c875ef00a687d95c2100f15f3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 32/34] Fix linking against static plugins with qmake @@ -11,7 +11,7 @@ approach 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 5b05aa9e2a..2732c94797 100644 +index 167b8dbf2c..5cfb4f62c9 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -69,7 +69,7 @@ all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_d @@ -33,5 +33,5 @@ index 5b05aa9e2a..2732c94797 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.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0033-Disable-hardware-randomizer-for-32-bit.patch b/qt5-base/mingw-w64-static/0033-Disable-hardware-randomizer-for-32-bit.patch index 63dc75a9..502a8a95 100644 --- a/qt5-base/mingw-w64-static/0033-Disable-hardware-randomizer-for-32-bit.patch +++ b/qt5-base/mingw-w64-static/0033-Disable-hardware-randomizer-for-32-bit.patch @@ -1,4 +1,4 @@ -From b26414fad10e9ff16f305b3484670260e07df70e Mon Sep 17 00:00:00 2001 +From f3ec9ba64cd4a80639959abbef537ce718dc70d6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 26 May 2018 03:47:14 +0200 Subject: [PATCH 33/34] Disable hardware randomizer for 32-bit @@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644 #else return false; -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch b/qt5-base/mingw-w64-static/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch index 376fb282..4f5f7b1a 100644 --- a/qt5-base/mingw-w64-static/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch +++ b/qt5-base/mingw-w64-static/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch @@ -1,4 +1,4 @@ -From 62ddbd09af7ddeb08d21ccbaf2c8724a12c52ef6 Mon Sep 17 00:00:00 2001 +From ee1d9dbd64b6123280c47b8633daf3d407f12ae6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 3 Feb 2019 14:34:42 +0100 Subject: [PATCH 34/34] Prevent static build to prefer dynamic libraries @@ -10,10 +10,10 @@ in order to get a fully statically linked binary in the end. 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf -index c45439c3ef..7953cdd19e 100644 +index 7ca65c92b3..48fa54a166 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf -@@ -541,12 +541,12 @@ defineTest(qtConfResolveLibs) { +@@ -553,12 +553,12 @@ defineTest(qtConfResolveLibs) { # Under Windows, we look only for static libraries, as even for DLLs # one actually links against a static import library. mingw { @@ -33,5 +33,5 @@ index c45439c3ef..7953cdd19e 100644 lcan += $${lib}.lib } -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD index e6e08b4e..3a52687c 100644 --- a/qt5-base/mingw-w64-static/PKGBUILD +++ b/qt5-base/mingw-w64-static/PKGBUILD @@ -36,7 +36,7 @@ isNoOpenGL() { } pkgname=mingw-w64-qt5-base-static -pkgver=5.12.1 +pkgver=5.12.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 @@ -86,41 +86,41 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0032-Fix-linking-against-static-plugins-with-qmake.patch' '0033-Disable-hardware-randomizer-for-32-bit.patch' '0034-Prevent-static-build-to-prefer-dynamic-libraries.patch') -sha256sums=('533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049' - '4e1dbb878b77dbba96a9564ecbded6dbd74482b52e1cf4becaa1ce741c8cf489' - 'f54815ff2fede9dbdc0ade572305ff684940714ca65e76d25f5b15cd0cb0a3da' - 'c60e6cef5d0c95b6d034ade75fde3cf150e1570f5ca62d6b32d942abcb937f86' - '0a82cde28edae5abb8d624cea407db515c1d52e8963f07aa8430c1d1f810e54a' - '39059ed786851c1cdf416c4d0a9a5b042edda83bddd03b5bfcbcae1eaf8f7694' - '4ef83cf4d211c446a5715cfa422f130492ae18bfb5cb42db9ff6516ed7fb29f1' - '48ee96ffc01d5ab7c648f4aae6cee286992e4eb406e48718058092206f8ad2eb' - '58f27f2359b3571aac44a3770a705692eed9e6fd24b6e6bf730e7aad5ee4a030' - 'cf6154d83655efbf30281c4f83d29feb252fd104849f8e2ad495da688e581314' - 'edf080092f4d158d2e42cedd50f80b3b5715ae47f740b16fa43132f1dc68cf9d' - '1c3c46c26809e59e91732d2ff082a445dac4986294f400277272c2337d8c21f3' - '3ee7b4f4ed6ea86794a5d119c7000033d0f61208150e37f35428e52611f7ae3f' - '1d18e225c4bda89fe024a47834a8b79d9c8e4d1ba884d7dc6b07a93bf0307a85' - '2affe7ac03016cfd536f63d61c0f5bd42932fc3823b7f2dbabca9c2db5a53ae6' - 'd0a2e33d20c4d6063f7546fbc84d2f6a5a96955f998ba7af4320bc005fa2a722' - '9941e9c883496bb3409a12ef3f73b6f3d76e106061381deb74380eafb1ac472f' - 'f336402daf227aa529080ab31612a205c936438ecbfab3627252164d8903c1b1' - '8cf716c22bf0fface6e3c015cd4d621425e3b20771b15ab03eeeeb59db248756' - '95f9847a1fe05ad78ae4a682208894d995becc0ca4f3463d39781e8a52543017' - '132fc790cfa528063fe95c3bc104826cb82105cd24e05ed77593115212987dc3' - '8ace42d2ec1b7a05a6bacf93f899775906c407f349efbbd2533b942fb474f200' - '8849864de4abf2dd70ffe2fe70aabb608c296eccdc41e6f4061645bd39f63c50' - '60ca9adfe6ae46d6dc7b4874c3202b46bc57f6649a45fb5301e4e4b63e70aa5e' - '47f83f04256afe1bd8701c31673e00e445b65840b5fe2bd132a98c8f292aa9c4' - '305b30fad80fba756bd3ad6c34c95030fc3927d52a3dc9b90d2705b390831734' - '91f37e9098e78881c1953c85e592e108be27dae08a83278f4a9885cb296a6871' - '9ca5f2175d8679b7312d8cb718ddc648e161a6aae631b5d4c9e528594a020d1a' - '3a5619542cb549ba7cc2bf1f9b77d524e5f9aa78d1e8dea6cd75c4f09b6aabc9' - 'e30cf84af1ff7764cb0e0644a7bfbde920f463af9c24aab53abef9cf3410ceb3' - 'fdd36ed82c5a8df7a0157b4ce9a3be16ec4c2b98cdf071a2be662603045da652' - '55b42d68ca7981ef777a7f081f840b1b80ada8c0dc9508092ec9fba151a88dfd' - '06f98f6ce25da7010e7398111ee7b79f380b79a7ab125eba3ef6d051af92cf8a' - '5a097dc80dc07aa755e77c50a469c3c08bf5b562ad9b116dbbf891a072e7bdc2' - '66047e08db2282d69563b3081b847fa7c041c3c387ab00ca72ff481b91124925') +sha256sums=('562c095a59c95f393762ec53bc05c0d80fad1758fd5ff7a5231967d1a98d56c1' + 'c00565f03113cde30d3a7f8badb93162013a88399bb06eaae70592912df8d4c5' + '050ce8f1b6c7c95b5a6c47357e8a49b078fd1df5b918466678f9e4a289069944' + 'eae6d4d5fdc434279e445cde156cb3a7e20ce490c6b0d57dbb306d879147dcf9' + 'd1b594a807f19a788ade63d13fd47d110e6ef03178ec26aab0dd0d00e328e0d7' + '8f70f6fc4b7e1cfd68717a5f0814a4bd70f4800ef052b43006c8602b793d59ec' + '06b313e9c95ed32c3b82592e7e8824c44b3a1fc554bc47ba151c5f36b46e05e2' + 'c0eee68dc34518ed4164711b3a69d50f99d4fbb0c6173c8e38dd6b5517c19536' + '545d351d7986c72b8d662d1417b28957db5a47e667e72a858bf8942f97ede6cb' + '2ba1bca2e3be4615c8b1f9f73e8868543aa3c8e4ab932a503a97ad6ccdfedf50' + 'eb04c06b8a1427efebf3c1a833a49877c697785e2f109dff233626c36cfeb007' + '3011580418c55e8bd232e5f1d9b43c9ec65dbe3339e795c8687ba1f744d89813' + '2dd37f28b8d816858e6bbed179f14036443c129c1afc7f7a768e7429afef2863' + 'da364a529d5e152ffe4e1f72a9267943ee1bb85ce44433ce4e12675e7cea27cf' + '8fe5700557c7e7ec3b24758d253dd6f6b42a32b1f739daf856fe038e2ba96425' + '61d28c257322907a4334dbe755c28d49bb66a1bc6944b5cb5d578d2cdb568e25' + '2048f2f03ae14f7687426b512fe956b7e1eea4cafba570eb9909790c745c4fe9' + 'ecef2faaba4a4e6f05f24d56b52d99518531581541dbd213d37acc579539d1c3' + '5fb06a23b7d14ed06270f34f34c972227c8674d5684d32517c5f0bcddd3d7050' + 'a77c0710c9a3f8e0cf50e6eb25b509e01284fa00409288ca885541b6e472d127' + '187deaccba8407bc8f363e1032cd5e14578c363b2d79c063ebfe131d985605f8' + '73dd1bb7cd31cbe90eda80065679aed7cad89899d6bdb531fbc062391836b2ff' + '74090e540b4276c2cf8722b3a72d99ad1fa10b44d25c980e363629b9aed87579' + 'ad74076f636d1a88d54002e8918074be29157a32a5122def2e20803bd2c0af1d' + '97be647f6d5ad29bcf9f313efbd641ca9895757d7032c740ab00bcad8d114b54' + 'c42240c548594ff05e555ff24d4b17d630cbcd2e5e90952ff88bfc85630de527' + '10aef30b86431746a002bff9e5ce5af46cb138b31a5e182aa3b9f9dbda3be22f' + 'afdabb26ec027f41f52ca6c736cfaf8a95c5c59d28061a240a20f7d521dfde2e' + 'f766bc129f5ad8e2fca7705fb5d135fbc1144aa8dddca004b141b11bc193efe1' + '65d0ac8597be9eb0a695153396b231079204d9451337807685734304b4f672ed' + 'f56f00584a77a7c80428b6218ac4a848758cf49ca047ef1b7f11b81a2b55aaee' + '7ef1fcb918d6079ae6cc97a12730faf3819f94b68f4005afb3c7cbd3c8cbb186' + 'fe65e9657a337a8fab9e362478d6d1ba794f90315a277660b05577c4c044cebb' + '586dc48f77e001152e59c28c1afdaad64c03957d0052e4905b34c2ef2bcd308a' + '46f454f756dcc298629ec6b73cb15c643edf9ace7a0e181b43055575e3e86190') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch index 96b590a3..a705f71a 100644 --- a/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch +++ b/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch @@ -1,4 +1,4 @@ -From 2ac45582566cb492858de99cf06cabf2fa575e30 Mon Sep 17 00:00:00 2001 +From 7b26289a1e7fafff7da844cdaac26b997febbc94 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/34] Adjust win32-g++ profile for cross compilation with @@ -161,5 +161,5 @@ index ed131c6823..b8e08df0be 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index e3d0f710..c7649a9c 100644 --- a/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch +++ b/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch @@ -1,4 +1,4 @@ -From 1083693a799b03cde91c83ff25d890640c01d780 Mon Sep 17 00:00:00 2001 +From 71303c275da3c576a5386dc50d4916ce21a58b16 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL @@ -23,5 +23,5 @@ index 00287b0665..35ad3007d1 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch index f364abc5..43cc3f94 100644 --- a/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch +++ b/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch @@ -1,4 +1,4 @@ -From 0be0cdb753a85725e603a02ada330cc9fd2c161e Mon Sep 17 00:00:00 2001 +From 1e421ad10dfb855e5a8626124854fb6e9ab568ca Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:41:38 +0200 Subject: [PATCH 03/34] Use external ANGLE library @@ -93,5 +93,5 @@ index 1c76a2e46f..6a5f046b34 100644 SUBDIRS += src_3rdparty_libpng src_3rdparty_freetype.depends += src_3rdparty_libpng -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 6261b628..2d00f691 100644 --- a/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From 987045e209769c2b4f8f48046167b5ef9106dd70 Mon Sep 17 00:00:00 2001 +From 200e74dca03f63bac8ef550403454e069c450239 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 04/34] Fix too many sections assemler error in OpenGL factory @@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch index 77cc1ad1..194b1fc0 100644 --- a/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 08286bb3f862fdc5f6cbdbb104d56d29d06b840a Mon Sep 17 00:00:00 2001 +From 77b28d91f16838274c5e6ac28cf10a0d8794c225 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 05/34] Make sure *.pc files are installed correctly @@ -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 f824f12bce..07abba9e5f 100644 +index 7762e47f41..bc466d35b3 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3227,7 +3227,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index f824f12bce..07abba9e5f 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3252,7 +3252,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3255,7 +3255,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 f824f12bce..07abba9e5f 100644 return ret; } diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h -index 0535017ff6..b2f8b961c0 100644 +index 350ebd377a..d0c234b864 100644 --- a/qmake/generators/makefile.h +++ b/qmake/generators/makefile.h @@ -92,7 +92,7 @@ protected: @@ -62,5 +62,5 @@ index 6046e5791e..87157f31ae 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch index 842d9c28..2f8e9c3b 100644 --- a/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From fdec0d79a76384fcefd55c06722380a2eccbbe22 Mon Sep 17 00:00:00 2001 +From 81db0b14c6a54d49f9150f20a30a3e188ec97052 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 06/34] Don't add resource files to LIBS parameter @@ -24,5 +24,5 @@ index de7363e51b..b2b9d01799 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch index bc386a79..ae6ecec7 100644 --- a/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From a7d2f0dacfb8e30058dcacf34450a467a5ff5d94 Mon Sep 17 00:00:00 2001 +From 5242deeb9bda4e9e692bb56a2cc681d4311cb0e5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 07/34] Prevent debug library names in pkg-config files @@ -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 07abba9e5f..e640fb8079 100644 +index bc466d35b3..67d97f520a 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3241,6 +3241,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (dot != -1) ret = ret.left(dot); } @@ -29,5 +29,5 @@ index 07abba9e5f..e640fb8079 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch index c6d0a2cb..e61a9a3e 100644 --- a/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From 95710d93c0d010afaa8ac7433b99827346bc011b Mon Sep 17 00:00:00 2001 +From 658b08047664f3f83caa324dcbfd3281e2a375cc Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 08/34] Fix linking against shared/static libpng @@ -9,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 89934c8f1d..9124e3e77e 100644 +index 44140bc7b6..19fd92bce7 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -385,8 +385,10 @@ +@@ -387,8 +387,10 @@ { "type": "pkgConfig", "args": "libpng" }, { "libs": "-llibpng16", "condition": "config.msvc" }, { "libs": "-llibpng", "condition": "config.msvc" }, @@ -26,5 +26,5 @@ index 89934c8f1d..9124e3e77e 100644 ], "use": [ -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch index db73366a..913bc60e 100644 --- a/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From 5c645a6510d3ac66a845b695c5e30c76944f22a0 Mon Sep 17 00:00:00 2001 +From 1ca21f0dc5e507ad26f16232dd75cb351ded1d6a Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 09/34] Fix linking against static D-Bus @@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644 # include #else -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index deddac80..7c5998b6 100644 --- a/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 75d943609ad0a9814656ce151a353fb391b5df33 Mon Sep 17 00:00:00 2001 +From aef97271acabe3732d92e6c291f9b9f844bc1f29 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library @@ -25,5 +25,5 @@ index c673f9a5fc..15b0f21e58 100644 }, "condition": "config.win32 && features.shared" -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch index bcbdbf74..0908b405 100644 --- a/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From 54e2fd21f8daa2f61c44d764ea19f31e03390b1d Mon Sep 17 00:00:00 2001 +From d318f8d851e848936b2e171d38ebda142f733455 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 11/34] Fix linking against static freetype2 @@ -8,10 +8,10 @@ Subject: [PATCH 11/34] Fix linking against static freetype2 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 9124e3e77e..f3628f415d 100644 +index 19fd92bce7..822214a0aa 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -237,8 +237,11 @@ +@@ -238,8 +238,11 @@ }, "headers": "ft2build.h", "sources": [ @@ -22,9 +22,9 @@ index 9124e3e77e..f3628f415d 100644 + { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" }, + { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" }, + { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" }, - { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" } + { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }, + { "libs": "-lfreetype" } ], - "use": [ -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch index ee2b3334..c552550a 100644 --- a/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From bdfd1226b5fcf7ede805676a2bb4bb8fbe047d6a Mon Sep 17 00:00:00 2001 +From 49fd90a7d66176f95ace73a34d7c2b3aca3206bd Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 12/34] Fix linking against static harfbuzz @@ -8,10 +8,10 @@ Subject: [PATCH 12/34] Fix linking against static harfbuzz 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index f3628f415d..b12a0e8ff2 100644 +index 822214a0aa..da4cab79a0 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json -@@ -304,7 +304,11 @@ +@@ -306,7 +306,11 @@ }, "headers": "harfbuzz/hb.h", "sources": [ @@ -25,5 +25,5 @@ index f3628f415d..b12a0e8ff2 100644 }, "imf": { -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch index a2042b98..598b53c7 100644 --- a/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From 52634efb9b9b2f3de1a2941297c7670ec7d4bdfc Mon Sep 17 00:00:00 2001 +From 1b56343203f3a75b0e1ae237da4f42f6b235940b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 13/34] Fix linking against static pcre @@ -24,5 +24,5 @@ index bdaa2d3243..90f8250c03 100644 #include -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch index 77c84b11..cdbca05c 100644 --- a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From 6d8c6ce62a3a418cc30a6e3016eaf38ff945697b Mon Sep 17 00:00:00 2001 +From 697338ba4c3626e99aa3a501c0942a411ce55a5f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 14/34] Fix linking against shared/static MariaDB @@ -22,5 +22,5 @@ index cd20eef1df..babd0465ce 100644 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch index dd9d6232..1ef4aa2c 100644 --- a/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From 0c7b1782160144c9a0839f02efd365716816400d Mon Sep 17 00:00:00 2001 +From bc71e0b2ee8e5ce96091e0fc65f2fdc986438376 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL @@ -24,5 +24,5 @@ index babd0465ce..b4b3bdec6b 100644 ] }, -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch index cfec875b..c97528bf 100644 --- a/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From c37572ff090abe65285eacaedf7e7022af92aae6 Mon Sep 17 00:00:00 2001 +From 53eb02bb30a316f3562e5886cd3fae8ad02af7a0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 16/34] Rename qtmain to qt5main @@ -53,7 +53,7 @@ index ecb167bf18..7c9368c3b3 100644 QMAKE_LIBS += -L$$QT.core.libs CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro -index 61e9f29d23..a1795bf265 100644 +index 9cb6ab0c59..4327ba365e 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -2,7 +2,7 @@ @@ -66,5 +66,5 @@ index 61e9f29d23..a1795bf265 100644 CONFIG += static -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch index 719a0360..72e387e7 100644 --- a/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch +++ b/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch @@ -1,4 +1,4 @@ -From 901d666dd3a5609f40b5fce75620b9016660b4c5 Mon Sep 17 00:00:00 2001 +From 1289a32f82d05281db146165a94fc4d06d432972 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:27:28 +0200 Subject: [PATCH 17/34] Build dynamic host libraries @@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644 -INSTALLS = lib +INSTALLS += lib -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch index d8537cdc..67323501 100644 --- a/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From 8ae9fed6ff5f5bf2e4c1d031baa7c03282268b35 Mon Sep 17 00:00:00 2001 +From 8f12c750711b71fded02ad3e6bee6e88f93f4bae Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 18/34] Enable rpath for build tools @@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644 INSTALLS += target -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch index fd0e8883..075f79e0 100644 --- a/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 9056f0faf07d8493969ead198f30edc958f86fd7 Mon Sep 17 00:00:00 2001 +From 6e6bc8bbffff9972c86d660d3fdd99029e6c7c8a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 19/34] Use system zlib for build tools @@ -23,5 +23,5 @@ index 83e44ff9a4..4734623936 100644 } else { CONFIG += no_core_dep -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0020-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64/0020-Use-.dll.a-as-import-lib-extension.patch index e6b4ff5d..3fe7ac92 100644 --- a/qt5-base/mingw-w64/0020-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64/0020-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From 5e28a49dd99a5b682fcc9cd78985fc138a1cbc2f Mon Sep 17 00:00:00 2001 +From cf9f7a67dedc858d1f8b1e16747a31747787cb4e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 20/34] Use *.dll.a as import lib extension @@ -62,5 +62,5 @@ index 87157f31ae..4592fed7b2 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0021-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64/0021-Merge-shared-and-static-library-trees.patch index 142e2ceb..82176cd2 100644 --- a/qt5-base/mingw-w64/0021-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64/0021-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From d21a2fde18007e8abbde3407ae20b967b137069e Mon Sep 17 00:00:00 2001 +From 0e8a2cab1c1a9257ad85cfa3869433c9b454f860 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 21/34] Merge shared and static library trees @@ -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 b3b3e27c44..3136889a2f 100644 +index 629ca78ff1..b4822af13f 100644 --- a/configure.pri +++ b/configure.pri -@@ -1312,3 +1312,12 @@ defineTest(createConfigStatus) { +@@ -1315,3 +1315,12 @@ defineTest(createConfigStatus) { QMAKE_POST_CONFIGURE += \ "createConfigStatus()" @@ -51,10 +51,10 @@ index fbf1f3b8df..c261c46e72 100644 !have_target:!force_qt: CONFIG -= qt diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 5da82fdb5b..5b05aa9e2a 100644 +index d8d5acaafd..167b8dbf2c 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf -@@ -246,6 +246,23 @@ for(ever) { +@@ -238,6 +238,23 @@ for(ever) { !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \ WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE } @@ -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 e640fb8079..fc7f729ae6 100644 +index 67d97f520a..a802c645c7 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3247,6 +3247,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -114,7 +114,7 @@ index e640fb8079..fc7f729ae6 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3418,9 +3421,9 @@ MakefileGenerator::writePkgConfigFile() +@@ -3421,9 +3424,9 @@ MakefileGenerator::writePkgConfigFile() t << endl; // requires @@ -128,5 +128,5 @@ index e640fb8079..fc7f729ae6 100644 t << endl; -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index d7b6a73c..fc9e517e 100644 --- a/qt5-base/mingw-w64/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/qt5-base/mingw-w64/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From 7f561d87a70af23d5d2a0c89e08ba5744b2f9585 Mon Sep 17 00:00:00 2001 +From b2d749f5e3b7b6d35345dff54c7eb76d2e1a3a44 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 22/34] Pull dependencies of static libraries in CMake modules @@ -7,18 +7,78 @@ When doing a static build of Qt, the dependencies of the Qt libraries and plugins itself must be specified when linking the final application. --- - .../data/cmake/Qt5BasicConfig.cmake.in | 148 ++++++++++++++---- + .../data/cmake/Qt5BasicConfig.cmake.in | 207 +++++++++++++++--- .../data/cmake/Qt5PluginTarget.cmake.in | 11 +- qmake/generators/makefile.cpp | 16 +- - 3 files changed, 133 insertions(+), 42 deletions(-) + 3 files changed, 192 insertions(+), 42 deletions(-) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 3ed6dd5889..15d8b8372e 100644 +index 3ed6dd5889..9325bb3190 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -@@ -49,35 +49,52 @@ but not all the files it references. +@@ -48,36 +48,110 @@ but not all the files it references. + endif() endmacro() ++!!IF !isEmpty(CMAKE_STATIC_TYPE) ++if(NOT COMMAND _qt5_add_dependencies) ++ # add dependencies via imported targets with their absolute file path so CMake does not mess with them ++ macro(_qt5_add_dependencies IMPORTED_TARGET_NAME IMPORTED_TARGET_CONFIG STATIC_DEPENDENCIES) ++ # prefer static libs ++ set(DEFAULT_CMAKE_FIND_LIBRARY_SUFFIXES \"${CMAKE_FIND_LIBRARY_SUFFIXES}\") ++ set(DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES \"${CMAKE_FIND_LIBRARY_PREFIXES}\") ++ set(CMAKE_FIND_LIBRARY_SUFFIXES .a .lib) ++ set(CMAKE_FIND_LIBRARY_PREFIXES lib \"\") ++ ++ set(DEPENDENCY_INDEX 0) ++ unset(EXTRA_PATHS) ++ unset(DEPENDENCY_TARGETS) ++ ++ foreach(LIBRARY_NAME ${STATIC_DEPENDENCIES}) ++ if (TARGET \"${LIBRARY_NAME}\") ++ list(APPEND DEPENDENCY_TARGETS \"${LIBRARY_NAME}\") ++ continue() ++ endif() ++ set(DEPENDENCY_NAME ${IMPORTED_TARGET_NAME}_DEPENDENCY_${DEPENDENCY_INDEX}) ++ if (NOT TARGET \"${DEPENDENCY_NAME}\") ++ if(EXISTS \"${LIBRARY_NAME}\") ++ set(IMPORTED_LOCATION ${LIBRARY_NAME}) ++ elseif(\"${LIBRARY_NAME}\" MATCHES \" *-l(.*)\") ++ set(LIBRARY_NAME \"${CMAKE_MATCH_1}\") ++ find_library(\"${DEPENDENCY_NAME}_LIBRARY_PATH\" \"${LIBRARY_NAME}\" PATHS \"${EXTRA_PATHS}\") ++ if (NOT EXISTS "${${DEPENDENCY_NAME}_LIBRARY_PATH}") ++ message(WARNING \"Unable to find dependency ${LIBRARY_NAME} for static Qt target (was looking in ${EXTRA_PATHS}).\") ++ continue() ++ endif() ++ set(IMPORTED_LOCATION \"${${DEPENDENCY_NAME}_LIBRARY_PATH}\") ++ elseif(\"${LIBRARY_NAME}\" MATCHES \" *-L(.*)\") ++ list(APPEND EXTRA_PATHS \"${CMAKE_MATCH_1}\") ++ else() ++ set(IMPORTED_LOCATION ${LIBRARY_NAME}) ++ message(WARNING \"Format of dependency unknown: ${LIBRARY_NAME}\") ++ endif() ++ add_library(${DEPENDENCY_NAME} STATIC IMPORTED) ++ set_property(TARGET ${DEPENDENCY_NAME} PROPERTY IMPORTED_LOCATION ${IMPORTED_LOCATION}) ++ endif() ++ if (TARGET ${DEPENDENCY_NAME}) ++ list(APPEND DEPENDENCY_TARGETS ${DEPENDENCY_NAME}) ++ endif() ++ math(EXPR DEPENDENCY_INDEX \"${DEPENDENCY_INDEX} + 1\") ++ endforeach() ++ ++ if (\"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"ALL\") ++ set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES ${DEPENDENCY_TARGETS}) ++ else() ++ set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES_${IMPORTED_TARGET_CONFIG} ${DEPENDENCY_TARGETS}) ++ endif() ++ ++ # restore previous setup ++ set(CMAKE_FIND_LIBRARY_SUFFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_SUFFIXES}\") ++ set(CMAKE_FIND_LIBRARY_PREFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES}\") ++ endmacro() ++endif() ++!!ENDIF ++ !!IF !equals(TEMPLATE, aux) -macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) @@ -38,14 +98,12 @@ index 3ed6dd5889..15d8b8372e 100644 + set(_list_sep \";\") + endif() + set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -+ \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\" + \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} +!!IF !isEmpty(CMAKE_LIB_SONAME) + \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" +!!ENDIF -+ # For backward compatibility with CMake < 2.8.12 -+ \"IMPORTED_LINK_INTERFACE_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\" + ) ++ _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\") +!!ELSE set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES - \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" @@ -77,7 +135,7 @@ index 3ed6dd5889..15d8b8372e 100644 ) endif() !!ENDIF -@@ -217,13 +234,47 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -217,13 +291,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!IF !isEmpty(CMAKE_STATIC_TYPE) add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") @@ -98,19 +156,17 @@ index 3ed6dd5889..15d8b8372e 100644 + file(STRINGS "${PRL_FILE_LOCATION}" prl_strings REGEX "QMAKE_PRL_LIBS_FOR_CMAKE") + string(REGEX REPLACE \"QMAKE_PRL_LIBS_FOR_CMAKE *= *([^\n]*)\" \"\\\\1\" static_depends ${prl_strings}) + string(REGEX REPLACE \"\\\\$\\\\$\\\\[QT_INSTALL_LIBS\\\\]\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" static_depends \"${static_depends}\") -+ set_property(TARGET ${PLUGIN_TARGET_NAME} PROPERTY -+ INTERFACE_LINK_LIBRARIES ${static_depends} -+ ) ++ _qt5_add_dependencies(\"${PLUGIN_TARGET_NAME}\" ALL \"${static_depends}\") + endmacro() + +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) + _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG) - !!ELSE ++!!ELSE + _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG) +!!ENDIF +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) + _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE) -+!!ELSE + !!ELSE + _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE) +!!ENDIF + @@ -126,7 +182,7 @@ index 3ed6dd5889..15d8b8372e 100644 !!IF !equals(TEMPLATE, aux) !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1) -@@ -238,6 +289,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -238,6 +344,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_ENABLED_FEATURES $$join(QT.$${MODULE}.enabled_features, ";")) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_DISABLED_FEATURES $$join(QT.$${MODULE}.disabled_features, ";")) @@ -183,7 +239,21 @@ index 3ed6dd5889..15d8b8372e 100644 set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE) foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS}) if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR}) -@@ -328,9 +429,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -256,9 +412,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) + list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private) + endif() + endforeach() ++!!IF !isEmpty(CMAKE_STATIC_TYPE) ++ _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME}Private ALL \"Qt5::$${CMAKE_MODULE_NAME};${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}\") ++!!ELSE + set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY + INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS} + ) ++!!ENDIF // CMAKE_STATIC_TYPE + endif() + + !!IF !equals(TEMPLATE, aux) +@@ -328,9 +488,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF @@ -197,7 +267,7 @@ index 3ed6dd5889..15d8b8372e 100644 !!ENDIF // CMAKE_RELEASE_TYPE !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD -@@ -341,29 +444,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -341,29 +503,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) !!ENDIF // TEMPLATE != aux @@ -251,7 +321,7 @@ index 5baf0fdb10..ec5f3cc437 100644 + +endif() diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index fc7f729ae6..095b4d2720 100644 +index a802c645c7..30756d9b64 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1019,10 +1019,18 @@ MakefileGenerator::writePrlFile(QTextStream &t) @@ -278,5 +348,5 @@ index fc7f729ae6..095b4d2720 100644 } -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0023-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64/0023-Allow-usage-of-static-version-with-CMake.patch index a530bbb6..bc5a767d 100644 --- a/qt5-base/mingw-w64/0023-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64/0023-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From c49f1674465685e03c0d95b869d6cea45dcf5447 Mon Sep 17 00:00:00 2001 +From af97d60e4f62cffec74c0c4905b79b49aab598af Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 23/34] Allow usage of static version with CMake @@ -12,13 +12,13 @@ installed in the same prefix via regular find_package(Qt5Core) --- mkspecs/features/create_cmake.prf | 103 +++--- - .../data/cmake/Qt5BasicConfig.cmake.in | 302 ++++++++++++------ + .../data/cmake/Qt5BasicConfig.cmake.in | 305 ++++++++++++------ .../data/cmake/Qt5PluginTarget.cmake.in | 18 +- .../cmake/Qt5StaticOnlyRedirection.cmake.in | 11 + src/corelib/Qt5CoreConfigExtras.cmake.in | 24 +- src/gui/Qt5GuiConfigExtras.cmake.in | 8 +- src/testlib/Qt5TestConfigExtras.cmake.in | 2 +- - 7 files changed, 315 insertions(+), 153 deletions(-) + 7 files changed, 316 insertions(+), 155 deletions(-) create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf @@ -244,7 +244,7 @@ index 2a94964b49..839a51f377 100644 # We are generating cmake files. Most developers of Qt are not aware of cmake, # so we require automatic tests to be available. The only module which should diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 15d8b8372e..939e55dfd8 100644 +index 9325bb3190..7ee0c86130 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -3,6 +3,33 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0) @@ -307,19 +307,19 @@ index 15d8b8372e..939e55dfd8 100644 but this file does not exist. Possible reasons include: * The file was deleted, renamed, or moved to another location. * An install or uninstall procedure did not complete successfully. -@@ -48,23 +79,60 @@ but not all the files it references. - endif() - endmacro() - -+!!IF !isEmpty(CMAKE_STATIC_TYPE) +@@ -105,33 +136,68 @@ if(NOT COMMAND _qt5_add_dependencies) + set(CMAKE_FIND_LIBRARY_PREFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES}\") + endmacro() + endif() ++ +# ensure also regular/dynamic macro exists because it might be used in some extra config +if(NOT COMMAND _qt5_$${CMAKE_MODULE_NAME}_check_file_exists) + macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists FILE) -+ _qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static("${FILE}") ++ _qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static(\"${FILE}\") + endmacro() +endif() -+!!ENDIF -+ + !!ENDIF + !!IF !equals(TEMPLATE, aux) -macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATION IMPLIB_LOCATION) - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${TARGET_CONFIG}) @@ -368,19 +368,20 @@ index 15d8b8372e..939e55dfd8 100644 endif() - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(${TARGET_NAME} PROPERTIES - \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\" \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} !!IF !isEmpty(CMAKE_LIB_SONAME) -@@ -74,7 +142,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI - \"IMPORTED_LINK_INTERFACE_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\" + \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" + !!ENDIF ) +- _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\") ++ _qt5_add_dependencies(\"${TARGET_NAME}\" \"${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\") !!ELSE - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(${TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\" \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} !!IF !isEmpty(CMAKE_LIB_SONAME) -@@ -91,9 +159,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI +@@ -148,9 +214,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI !!ELSE set(imported_implib \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF @@ -395,7 +396,7 @@ index 15d8b8372e..939e55dfd8 100644 \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib} ) endif() -@@ -101,8 +173,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI +@@ -158,8 +228,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI endmacro() !!ENDIF @@ -406,7 +407,7 @@ index 15d8b8372e..939e55dfd8 100644 !!IF !no_module_headers !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS -@@ -110,46 +183,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -167,46 +238,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\" ) !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) @@ -474,7 +475,7 @@ index 15d8b8372e..939e55dfd8 100644 endforeach() !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK) -@@ -158,16 +235,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -215,16 +290,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(FIND Qt5$${CMAKE_MODULE_NAME}_FIND_COMPONENTS Private _check_private) if (NOT _check_private STREQUAL -1) foreach(_dir ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS}) @@ -498,7 +499,7 @@ index 15d8b8372e..939e55dfd8 100644 !!ENDIF // TEMPLATE != aux set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\") -@@ -175,10 +256,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -232,10 +311,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\") !!ENDIF @@ -511,7 +512,7 @@ index 15d8b8372e..939e55dfd8 100644 set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED) endif() set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET) -@@ -186,17 +267,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -243,17 +322,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET) endif() set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT) @@ -533,7 +534,7 @@ index 15d8b8372e..939e55dfd8 100644 $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT} ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET} ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED} -@@ -204,36 +285,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -261,36 +340,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) endif() @@ -589,7 +590,7 @@ index 15d8b8372e..939e55dfd8 100644 macro(_process_prl_file PRL_FILE_LOCATION CONFIGURATION) if (EXISTS \"${PRL_FILE_LOCATION}\") file(STRINGS \"${PRL_FILE_LOCATION}\" prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE\") -@@ -257,37 +343,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -312,37 +396,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endmacro() !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) @@ -650,7 +651,7 @@ index 15d8b8372e..939e55dfd8 100644 # Find plugin targets file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\") -@@ -301,7 +398,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -356,7 +451,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endforeach() endif() @@ -662,7 +663,7 @@ index 15d8b8372e..939e55dfd8 100644 set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG}) !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) -@@ -309,7 +410,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -364,7 +463,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") !!ENDIF @@ -674,7 +675,7 @@ index 15d8b8372e..939e55dfd8 100644 set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location} ) -@@ -340,16 +445,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -395,16 +498,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endif() set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE) @@ -695,15 +696,20 @@ index 15d8b8372e..939e55dfd8 100644 ) set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS) foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}) -@@ -357,66 +462,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) - list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private) +@@ -413,69 +516,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endif() endforeach() + !!IF !isEmpty(CMAKE_STATIC_TYPE) +- _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME}Private ALL \"Qt5::$${CMAKE_MODULE_NAME};${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}\") ++ _qt5_add_dependencies(${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private ALL ++ \"${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME};${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}\") + !!ELSE - set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY - INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS} + set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY + INTERFACE_LINK_LIBRARIES ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS} ) + !!ENDIF // CMAKE_STATIC_TYPE endif() !!IF !equals(TEMPLATE, aux) @@ -786,7 +792,7 @@ index 15d8b8372e..939e55dfd8 100644 if (EXISTS !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" -@@ -429,7 +536,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -488,7 +594,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF @@ -795,7 +801,7 @@ index 15d8b8372e..939e55dfd8 100644 endif() !!ENDIF // CMAKE_STATIC_TYPE -@@ -439,19 +546,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -498,19 +604,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF // CMAKE_DEBUG_TYPE !!ELSE // TEMPLATE != aux @@ -997,5 +1003,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index 3e45a2fc..802c6e2c 100644 --- a/qt5-base/mingw-w64/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/qt5-base/mingw-w64/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From 5decd2ed0bdfafd01c119357c73fc91e470b9f61 Mon Sep 17 00:00:00 2001 +From 25143b06d43a9a4cceb6d038f4f97d5f2af53c8e Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 24/34] Adjust linker flags for static build with @@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644 +unset(_isExe) +!!ENDIF -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0025-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64/0025-Use-correct-pkg-config-static-flag.patch index 37356540..f7b5d243 100644 --- a/qt5-base/mingw-w64/0025-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64/0025-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From 9a0c4a937083e14ad32a8a25feb92333b5015dda Mon Sep 17 00:00:00 2001 +From 348b46baa42d1001d2a650a0fe44a2254068bb8e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 25/34] Use correct pkg-config --static flag @@ -8,7 +8,7 @@ Subject: [PATCH 25/34] Use correct pkg-config --static flag 1 file changed, 3 insertions(+) diff --git a/configure.pri b/configure.pri -index 3136889a2f..601629c047 100644 +index b4822af13f..addb27b6d7 100644 --- a/configure.pri +++ b/configure.pri @@ -328,6 +328,9 @@ defineTest(qtConfTest_detectPkgConfig) { @@ -22,5 +22,5 @@ index 3136889a2f..601629c047 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0026-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64/0026-Fix-macro-invoking-moc-rcc-and-uic.patch index d0b8a9b1..2050d214 100644 --- a/qt5-base/mingw-w64/0026-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/qt5-base/mingw-w64/0026-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From ad4a59bd142b2b3ab402ed8d0337ac972f77e76c Mon Sep 17 00:00:00 2001 +From 7fc63fcd9c5e8a2c864c7de9fa14338ce3e82969 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 26/34] Fix macro invoking moc, rcc and uic @@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0027-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64/0027-Ignore-errors-about-missing-feature-static.patch index 69d58afc..1dfa7de0 100644 --- a/qt5-base/mingw-w64/0027-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64/0027-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From a17249171793a58d2a0308879e96465e96c362f1 Mon Sep 17 00:00:00 2001 +From 93aba1e6a5106bc91b34fada1d5343ff25b9ce43 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 27/34] Ignore errors about missing feature static @@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0028-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64/0028-Enable-and-fix-use-of-iconv.patch index da8f6d75..4a1c752f 100644 --- a/qt5-base/mingw-w64/0028-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64/0028-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 94bf26c2b8ae87dc5add63ef4df8b765e4067651 Mon Sep 17 00:00:00 2001 +From 512be5eb5add4a5f2146ca0a0b3a8b7a434c600a Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 28/34] Enable and fix use of iconv @@ -74,5 +74,5 @@ index a22a7459bd..b7ed2f7281 100644 }, "icu": { -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0029-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64/0029-Ignore-failing-pkg-config-test.patch index d4c91f65..4ff09302 100644 --- a/qt5-base/mingw-w64/0029-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64/0029-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From 93dcee644f3059e381310bd0e4f905caeebfa05b Mon Sep 17 00:00:00 2001 +From 41e9bbfc0c70d1a94f7c90aef50493e3341389b7 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 29/34] Ignore failing pkg-config test @@ -21,5 +21,5 @@ index 15b0f21e58..46cc841148 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch index cb4dc10d..1bf91a24 100644 --- a/qt5-base/mingw-w64/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From e917a88d58047cdb3fb46c1b07fb78648bf74358 Mon Sep 17 00:00:00 2001 +From f41ba61108dd735410e4feac87fa23b321d0a20f Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 30/34] Prevent qmake from messing static lib dependencies @@ -11,7 +11,7 @@ static freetype2 and harfbuzz 2 files changed, 6 insertions(+) diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp -index 4cbe06d9dc..47535f60d5 100644 +index 7f42fbe09e..e27428c0f2 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -393,6 +393,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) @@ -39,5 +39,5 @@ index 4592fed7b2..b93d0df473 100644 for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) dirs.append(QMakeLocalFileName(dlib.toQString())); -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0031-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64/0031-Hardcode-linker-flags-for-platform-plugins.patch index 958a86f8..35a1cd46 100644 --- a/qt5-base/mingw-w64/0031-Hardcode-linker-flags-for-platform-plugins.patch +++ b/qt5-base/mingw-w64/0031-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From fe25b3abe19208154631b6315587fce9bacc4991 Mon Sep 17 00:00:00 2001 +From 2c28928b34fc030330b00f16fcb546a477c48621 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 31/34] Hardcode linker flags for platform plugins @@ -82,7 +82,7 @@ index a1a2da547b..7ef91b574d 100644 DEFINES += QT_NO_FOREACH diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro -index 6652cefd86..a322b17cc5 100644 +index 392ee8bed1..f1f266e2c2 100644 --- a/src/plugins/platforms/offscreen/offscreen.pro +++ b/src/plugins/platforms/offscreen/offscreen.pro @@ -1,8 +1,18 @@ @@ -149,5 +149,5 @@ index 174bc7b609..e66488e364 100644 include(windows.pri) -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0032-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64/0032-Fix-linking-against-static-plugins-with-qmake.patch index 937d57db..7f7d9551 100644 --- a/qt5-base/mingw-w64/0032-Fix-linking-against-static-plugins-with-qmake.patch +++ b/qt5-base/mingw-w64/0032-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From 1cd9a4e98c177d3b794f2c0549b6f74ddf0e6e65 Mon Sep 17 00:00:00 2001 +From 00034061c0b8ad7c875ef00a687d95c2100f15f3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 32/34] Fix linking against static plugins with qmake @@ -11,7 +11,7 @@ approach 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index 5b05aa9e2a..2732c94797 100644 +index 167b8dbf2c..5cfb4f62c9 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -69,7 +69,7 @@ all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_d @@ -33,5 +33,5 @@ index 5b05aa9e2a..2732c94797 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.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0033-Disable-hardware-randomizer-for-32-bit.patch b/qt5-base/mingw-w64/0033-Disable-hardware-randomizer-for-32-bit.patch index 63dc75a9..502a8a95 100644 --- a/qt5-base/mingw-w64/0033-Disable-hardware-randomizer-for-32-bit.patch +++ b/qt5-base/mingw-w64/0033-Disable-hardware-randomizer-for-32-bit.patch @@ -1,4 +1,4 @@ -From b26414fad10e9ff16f305b3484670260e07df70e Mon Sep 17 00:00:00 2001 +From f3ec9ba64cd4a80639959abbef537ce718dc70d6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 26 May 2018 03:47:14 +0200 Subject: [PATCH 33/34] Disable hardware randomizer for 32-bit @@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644 #else return false; -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch b/qt5-base/mingw-w64/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch index 376fb282..4f5f7b1a 100644 --- a/qt5-base/mingw-w64/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch +++ b/qt5-base/mingw-w64/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch @@ -1,4 +1,4 @@ -From 62ddbd09af7ddeb08d21ccbaf2c8724a12c52ef6 Mon Sep 17 00:00:00 2001 +From ee1d9dbd64b6123280c47b8633daf3d407f12ae6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 3 Feb 2019 14:34:42 +0100 Subject: [PATCH 34/34] Prevent static build to prefer dynamic libraries @@ -10,10 +10,10 @@ in order to get a fully statically linked binary in the end. 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf -index c45439c3ef..7953cdd19e 100644 +index 7ca65c92b3..48fa54a166 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf -@@ -541,12 +541,12 @@ defineTest(qtConfResolveLibs) { +@@ -553,12 +553,12 @@ defineTest(qtConfResolveLibs) { # Under Windows, we look only for static libraries, as even for DLLs # one actually links against a static import library. mingw { @@ -33,5 +33,5 @@ index c45439c3ef..7953cdd19e 100644 lcan += $${lib}.lib } -- -2.20.1 +2.21.0 diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD index 753e021f..64e28842 100644 --- a/qt5-base/mingw-w64/PKGBUILD +++ b/qt5-base/mingw-w64/PKGBUILD @@ -36,7 +36,7 @@ isNoOpenGL() { } pkgname=mingw-w64-qt5-base -pkgver=5.12.1 +pkgver=5.12.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 @@ -86,41 +86,41 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0032-Fix-linking-against-static-plugins-with-qmake.patch' '0033-Disable-hardware-randomizer-for-32-bit.patch' '0034-Prevent-static-build-to-prefer-dynamic-libraries.patch') -sha256sums=('533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049' - '4e1dbb878b77dbba96a9564ecbded6dbd74482b52e1cf4becaa1ce741c8cf489' - 'f54815ff2fede9dbdc0ade572305ff684940714ca65e76d25f5b15cd0cb0a3da' - 'c60e6cef5d0c95b6d034ade75fde3cf150e1570f5ca62d6b32d942abcb937f86' - '0a82cde28edae5abb8d624cea407db515c1d52e8963f07aa8430c1d1f810e54a' - '39059ed786851c1cdf416c4d0a9a5b042edda83bddd03b5bfcbcae1eaf8f7694' - '4ef83cf4d211c446a5715cfa422f130492ae18bfb5cb42db9ff6516ed7fb29f1' - '48ee96ffc01d5ab7c648f4aae6cee286992e4eb406e48718058092206f8ad2eb' - '58f27f2359b3571aac44a3770a705692eed9e6fd24b6e6bf730e7aad5ee4a030' - 'cf6154d83655efbf30281c4f83d29feb252fd104849f8e2ad495da688e581314' - 'edf080092f4d158d2e42cedd50f80b3b5715ae47f740b16fa43132f1dc68cf9d' - '1c3c46c26809e59e91732d2ff082a445dac4986294f400277272c2337d8c21f3' - '3ee7b4f4ed6ea86794a5d119c7000033d0f61208150e37f35428e52611f7ae3f' - '1d18e225c4bda89fe024a47834a8b79d9c8e4d1ba884d7dc6b07a93bf0307a85' - '2affe7ac03016cfd536f63d61c0f5bd42932fc3823b7f2dbabca9c2db5a53ae6' - 'd0a2e33d20c4d6063f7546fbc84d2f6a5a96955f998ba7af4320bc005fa2a722' - '9941e9c883496bb3409a12ef3f73b6f3d76e106061381deb74380eafb1ac472f' - 'f336402daf227aa529080ab31612a205c936438ecbfab3627252164d8903c1b1' - '8cf716c22bf0fface6e3c015cd4d621425e3b20771b15ab03eeeeb59db248756' - '95f9847a1fe05ad78ae4a682208894d995becc0ca4f3463d39781e8a52543017' - '132fc790cfa528063fe95c3bc104826cb82105cd24e05ed77593115212987dc3' - '8ace42d2ec1b7a05a6bacf93f899775906c407f349efbbd2533b942fb474f200' - '8849864de4abf2dd70ffe2fe70aabb608c296eccdc41e6f4061645bd39f63c50' - '60ca9adfe6ae46d6dc7b4874c3202b46bc57f6649a45fb5301e4e4b63e70aa5e' - '47f83f04256afe1bd8701c31673e00e445b65840b5fe2bd132a98c8f292aa9c4' - '305b30fad80fba756bd3ad6c34c95030fc3927d52a3dc9b90d2705b390831734' - '91f37e9098e78881c1953c85e592e108be27dae08a83278f4a9885cb296a6871' - '9ca5f2175d8679b7312d8cb718ddc648e161a6aae631b5d4c9e528594a020d1a' - '3a5619542cb549ba7cc2bf1f9b77d524e5f9aa78d1e8dea6cd75c4f09b6aabc9' - 'e30cf84af1ff7764cb0e0644a7bfbde920f463af9c24aab53abef9cf3410ceb3' - 'fdd36ed82c5a8df7a0157b4ce9a3be16ec4c2b98cdf071a2be662603045da652' - '55b42d68ca7981ef777a7f081f840b1b80ada8c0dc9508092ec9fba151a88dfd' - '06f98f6ce25da7010e7398111ee7b79f380b79a7ab125eba3ef6d051af92cf8a' - '5a097dc80dc07aa755e77c50a469c3c08bf5b562ad9b116dbbf891a072e7bdc2' - '66047e08db2282d69563b3081b847fa7c041c3c387ab00ca72ff481b91124925') +sha256sums=('562c095a59c95f393762ec53bc05c0d80fad1758fd5ff7a5231967d1a98d56c1' + 'c00565f03113cde30d3a7f8badb93162013a88399bb06eaae70592912df8d4c5' + '050ce8f1b6c7c95b5a6c47357e8a49b078fd1df5b918466678f9e4a289069944' + 'eae6d4d5fdc434279e445cde156cb3a7e20ce490c6b0d57dbb306d879147dcf9' + 'd1b594a807f19a788ade63d13fd47d110e6ef03178ec26aab0dd0d00e328e0d7' + '8f70f6fc4b7e1cfd68717a5f0814a4bd70f4800ef052b43006c8602b793d59ec' + '06b313e9c95ed32c3b82592e7e8824c44b3a1fc554bc47ba151c5f36b46e05e2' + 'c0eee68dc34518ed4164711b3a69d50f99d4fbb0c6173c8e38dd6b5517c19536' + '545d351d7986c72b8d662d1417b28957db5a47e667e72a858bf8942f97ede6cb' + '2ba1bca2e3be4615c8b1f9f73e8868543aa3c8e4ab932a503a97ad6ccdfedf50' + 'eb04c06b8a1427efebf3c1a833a49877c697785e2f109dff233626c36cfeb007' + '3011580418c55e8bd232e5f1d9b43c9ec65dbe3339e795c8687ba1f744d89813' + '2dd37f28b8d816858e6bbed179f14036443c129c1afc7f7a768e7429afef2863' + 'da364a529d5e152ffe4e1f72a9267943ee1bb85ce44433ce4e12675e7cea27cf' + '8fe5700557c7e7ec3b24758d253dd6f6b42a32b1f739daf856fe038e2ba96425' + '61d28c257322907a4334dbe755c28d49bb66a1bc6944b5cb5d578d2cdb568e25' + '2048f2f03ae14f7687426b512fe956b7e1eea4cafba570eb9909790c745c4fe9' + 'ecef2faaba4a4e6f05f24d56b52d99518531581541dbd213d37acc579539d1c3' + '5fb06a23b7d14ed06270f34f34c972227c8674d5684d32517c5f0bcddd3d7050' + 'a77c0710c9a3f8e0cf50e6eb25b509e01284fa00409288ca885541b6e472d127' + '187deaccba8407bc8f363e1032cd5e14578c363b2d79c063ebfe131d985605f8' + '73dd1bb7cd31cbe90eda80065679aed7cad89899d6bdb531fbc062391836b2ff' + '74090e540b4276c2cf8722b3a72d99ad1fa10b44d25c980e363629b9aed87579' + 'ad74076f636d1a88d54002e8918074be29157a32a5122def2e20803bd2c0af1d' + '97be647f6d5ad29bcf9f313efbd641ca9895757d7032c740ab00bcad8d114b54' + 'c42240c548594ff05e555ff24d4b17d630cbcd2e5e90952ff88bfc85630de527' + '10aef30b86431746a002bff9e5ce5af46cb138b31a5e182aa3b9f9dbda3be22f' + 'afdabb26ec027f41f52ca6c736cfaf8a95c5c59d28061a240a20f7d521dfde2e' + 'f766bc129f5ad8e2fca7705fb5d135fbc1144aa8dddca004b141b11bc193efe1' + '65d0ac8597be9eb0a695153396b231079204d9451337807685734304b4f672ed' + 'f56f00584a77a7c80428b6218ac4a848758cf49ca047ef1b7f11b81a2b55aaee' + '7ef1fcb918d6079ae6cc97a12730faf3819f94b68f4005afb3c7cbd3c8cbb186' + 'fe65e9657a337a8fab9e362478d6d1ba794f90315a277660b05577c4c044cebb' + '586dc48f77e001152e59c28c1afdaad64c03957d0052e4905b34c2ef2bcd308a' + '46f454f756dcc298629ec6b73cb15c643edf9ace7a0e181b43055575e3e86190') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-canvas3d/mingw-w64/PKGBUILD b/qt5-canvas3d/mingw-w64/PKGBUILD index 6a2566d6..7e98698a 100644 --- a/qt5-canvas3d/mingw-w64/PKGBUILD +++ b/qt5-canvas3d/mingw-w64/PKGBUILD @@ -8,7 +8,7 @@ _qt_module=qtcanvas3d pkgname="mingw-w64-qt5-canvas3d" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="A JavaScript 3D rendering API for Qt Quick (mingw-w64)" @@ -20,7 +20,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('c7c940a06062b1e5078fd697e1da0cdaeaa315b6fcea81de15308a9d3f8ac254') +sha256sums=('5e74b083294956505945621f6f56a3d7a314502277a109d6fb6b25c74dea2dca') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-charts/mingw-w64/PKGBUILD b/qt5-charts/mingw-w64/PKGBUILD index a74d8a02..e3d3776c 100644 --- a/qt5-charts/mingw-w64/PKGBUILD +++ b/qt5-charts/mingw-w64/PKGBUILD @@ -8,7 +8,7 @@ _qt_module=qtcharts pkgname="mingw-w64-qt5-charts" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Provides a set of easy to use chart components (mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('142eb2b87a0bc2220a9f12e56bf390b846968c201d135b1a2a2338545692fdc0') +sha256sums=('11d88d3e0ec86730219f7c2efa17f696ec8766415c488b208bfcb8f3c3a68a31') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-connectivity/mingw-w64/PKGBUILD b/qt5-connectivity/mingw-w64/PKGBUILD index fe90e950..b1f74298 100644 --- a/qt5-connectivity/mingw-w64/PKGBUILD +++ b/qt5-connectivity/mingw-w64/PKGBUILD @@ -8,7 +8,7 @@ _qt_module=qtconnectivity pkgname="mingw-w64-qt5-connectivity" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Provides access to Bluetooth hardware (mingw-w64)" @@ -20,7 +20,7 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('0edd0bd784a71809540dc23d24a842bd88dee2cdb5394b69c9e704f7e1ac8d6c') +sha256sums=('15eb21a1c102408e43c7204a82ad144e97ebe05dc4a15edb0900cd49762a226e') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-datavis3d/mingw-w64/PKGBUILD b/qt5-datavis3d/mingw-w64/PKGBUILD index ae920679..bfb0cd13 100644 --- a/qt5-datavis3d/mingw-w64/PKGBUILD +++ b/qt5-datavis3d/mingw-w64/PKGBUILD @@ -8,7 +8,7 @@ _qt_module=qtdatavis3d pkgname="mingw-w64-qt5-datavis3d" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Qt Data Visualization module (mingw-w64)" @@ -21,7 +21,7 @@ groups=('mingw-w64-qt5') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('8ebb94459e5eb5b978dcdac1d2d6503a7763d790ce74b03f78388beb480436a0') +sha256sums=('4758a8126335e90f194c2a3aadd4db5eb2e3926e34faf908695945aa4f0d4690') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-declarative/apple-darwin/PKGBUILD b/qt5-declarative/apple-darwin/PKGBUILD index 70c1822f..1e68d01d 100644 --- a/qt5-declarative/apple-darwin/PKGBUILD +++ b/qt5-declarative/apple-darwin/PKGBUILD @@ -5,7 +5,7 @@ _qt_module=qtdeclarative pkgname='apple-darwin-qt5-declarative' -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Classes for QML and JavaScript languages (apple-darwin)" diff --git a/qt5-declarative/mingw-w64/0001-Ensure-QML-dev-tools-is-built-as-static-library.patch b/qt5-declarative/mingw-w64/0001-Ensure-QML-dev-tools-is-built-as-static-library.patch index c628c865..8543f32d 100644 --- a/qt5-declarative/mingw-w64/0001-Ensure-QML-dev-tools-is-built-as-static-library.patch +++ b/qt5-declarative/mingw-w64/0001-Ensure-QML-dev-tools-is-built-as-static-library.patch @@ -1,4 +1,4 @@ -From 51631260ef9c2b4167827c0fe595bee0b25873ab Mon Sep 17 00:00:00 2001 +From edcc561d4bc083ed0e084d94cc764d90fabe5e05 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 25 Sep 2016 21:24:15 +0200 Subject: [PATCH 1/3] Ensure QML dev tools is built as static library @@ -23,5 +23,5 @@ index 05aa6f66f..e73c0c23d 100644 MODULE_INCNAME = QtQml INCLUDEPATH += $$OUT_PWD/../qml -- -2.20.1 +2.21.0 diff --git a/qt5-declarative/mingw-w64/0002-Ensure-static-plugins-are-exported.patch b/qt5-declarative/mingw-w64/0002-Ensure-static-plugins-are-exported.patch index 62100ea6..fee12d79 100644 --- a/qt5-declarative/mingw-w64/0002-Ensure-static-plugins-are-exported.patch +++ b/qt5-declarative/mingw-w64/0002-Ensure-static-plugins-are-exported.patch @@ -1,4 +1,4 @@ -From ec275db21807dcbea460303530c225bbffed1486 Mon Sep 17 00:00:00 2001 +From 25d470f26ed0dd8390d7554f0a52a0bbd7a62efa Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 23 Oct 2016 01:18:13 +0200 Subject: [PATCH 2/3] Ensure static plugins are exported @@ -18,5 +18,5 @@ index 9ddb9885c..9775d85e0 100644 foreach(_other_plugin ${_qt5qml_other_plugins}) include(${_other_plugin} OPTIONAL) -- -2.20.1 +2.21.0 diff --git a/qt5-declarative/mingw-w64/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch b/qt5-declarative/mingw-w64/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch index 3684d91a..c3250b54 100644 --- a/qt5-declarative/mingw-w64/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch +++ b/qt5-declarative/mingw-w64/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch @@ -1,4 +1,4 @@ -From 7cf7bef5622f7f9995cc8da057b3d58476241e17 Mon Sep 17 00:00:00 2001 +From 41520be651458402ce2c13c76a866d88aed1c680 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 4 Feb 2017 01:59:59 +0100 Subject: [PATCH 3/3] Prevent exporting QML parser symbols on static build @@ -33,5 +33,5 @@ index 0e195994b..8aa451e9d 100644 # define QML_PARSER_EXPORT # elif defined(QT_BUILD_QML_LIB) -- -2.20.1 +2.21.0 diff --git a/qt5-declarative/mingw-w64/PKGBUILD b/qt5-declarative/mingw-w64/PKGBUILD old mode 100644 new mode 100755 index 4dc194ee..3b8af0c9 --- a/qt5-declarative/mingw-w64/PKGBUILD +++ b/qt5-declarative/mingw-w64/PKGBUILD @@ -12,7 +12,7 @@ _qt_module=qtdeclarative pkgname=mingw-w64-qt5-declarative -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Classes for QML and JavaScript languages (mingw-w64)' @@ -27,10 +27,10 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0001-Ensure-QML-dev-tools-is-built-as-static-library.patch' '0002-Ensure-static-plugins-are-exported.patch' '0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch') -sha256sums=('a384a734d94f28a98aa74e076d50fa6b9724af83526feb6c371945545d8cb409' - 'e7e8c7d227e1be988c17c836b8620c7c3fb88fd28b40d34fc8f3be5e702cdcf0' - '479116791ba898c7ae6968221a1211abd487ab41500c5b975c99afa14fd1d20e' - '3cc1eabee1d0df1810f231bd5104d22d7b97fd2e7569da711e83741236421f52') +sha256sums=('470568745602e7fa21cdca42b1641162e4257cfeb7a2dcf8af24538c9516cc5b' + '1880f69559d8fd1947de64c43b706092fba2e99702a24586c4bd0785d1b09542' + 'a91e94966a0550b3b0df185f6aaec06eb0a012f7855f603dee5befd889efbc40' + '695397421de70a456e0231ed7a5542cb86bd0f67627d62de9b8209dce662c403') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-gamepad/mingw-w64/PKGBUILD b/qt5-gamepad/mingw-w64/PKGBUILD index 19010d25..d607eced 100644 --- a/qt5-gamepad/mingw-w64/PKGBUILD +++ b/qt5-gamepad/mingw-w64/PKGBUILD @@ -8,7 +8,7 @@ _qt_module=qtgamepad pkgname="mingw-w64-qt5-gamepad" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Adds support for getting events from gamepad devices (mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('717c11f8fba4e23c0096fcf3161d43223956038e866fcd7a18d2255755415d62') +sha256sums=('d289d8c983f4e88018c9ccb22bbde196c9f97efd20ecd48ae92994885f2334a7') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-graphicaleffects/mingw-w64/PKGBUILD b/qt5-graphicaleffects/mingw-w64/PKGBUILD index fc680c9d..6e33b478 100644 --- a/qt5-graphicaleffects/mingw-w64/PKGBUILD +++ b/qt5-graphicaleffects/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtgraphicaleffects pkgname="mingw-w64-qt5-graphicaleffects" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Graphical effects for use with Qt Quick 2 (mingw-w64)" @@ -22,7 +22,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-$pkgver" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('2e63abf6b02b86461b73b317eba00b6721601a9469c22da28e3f4ea1d5df68d7') +sha256sums=('429398b6c661897b3c7cd62fb3657a2de60ad9152578edeeca0abde6e7ae5a86') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-imageformats/apple-darwin/PKGBUILD b/qt5-imageformats/apple-darwin/PKGBUILD index 14e181ed..cb499a11 100644 --- a/qt5-imageformats/apple-darwin/PKGBUILD +++ b/qt5-imageformats/apple-darwin/PKGBUILD @@ -5,7 +5,7 @@ _qt_module=qtimageformats pkgname='apple-darwin-qt5-imageformats' -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (apple-darwin)" diff --git a/qt5-imageformats/mingw-w64/PKGBUILD b/qt5-imageformats/mingw-w64/PKGBUILD index 9a099ffe..e92929bc 100644 --- a/qt5-imageformats/mingw-w64/PKGBUILD +++ b/qt5-imageformats/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtimageformats pkgname="mingw-w64-qt5-imageformats" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)" @@ -26,7 +26,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('0425f35dbcc83cd5840e2d3a73ed4c57c426af9d6ac7b9fe3a40d23560653421') +sha256sums=('1ea757728f205deb6b3f5873f5c7c3129cded5993077500a9fb249559bee7a9c') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-location/mingw-w64/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch b/qt5-location/mingw-w64/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch index f9dfaaaa..98dc7c3d 100644 --- a/qt5-location/mingw-w64/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch +++ b/qt5-location/mingw-w64/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch @@ -1,4 +1,4 @@ -From 1caa80ef688a4e1c4274ccc825b537fef0564af3 Mon Sep 17 00:00:00 2001 +From 701a4e8a49e6aa78eba9debb2ccedbb4f5f26609 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 22 Dec 2016 22:30:59 +0100 Subject: [PATCH] Ensure static 3rdparty libs are linked correctly @@ -23,5 +23,5 @@ index dec1149b..ad57a5c5 100644 plugin.json \ qmldir -- -2.20.1 +2.21.0 diff --git a/qt5-location/mingw-w64/PKGBUILD b/qt5-location/mingw-w64/PKGBUILD index 16eca99d..28ccfc7f 100644 --- a/qt5-location/mingw-w64/PKGBUILD +++ b/qt5-location/mingw-w64/PKGBUILD @@ -14,7 +14,7 @@ _mapboxcfg='QT.global.disabled_features+=geoservices_mapboxgl' _qt_module=qtlocation pkgname=mingw-w64-qt5-location -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc='Provides access to position, satellite and area monitoring classes (mingw-w64)' @@ -27,8 +27,8 @@ url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" '0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch') -sha256sums=('8b922373e6eefd1b0e2a993dbf3d0b3f3df777bc720d40cad3ccb46e1936bc50' - 'c818be73a38a61f07b77663c0f525a26dd2296d7eec5c50bead9ab86e01fc87a') +sha256sums=('a31f27f457ac57e7203ae808b95ba0053d182e22425de03840af761e343d8bef' + 'e5cb1e46408fc8776f9345e21a7565d9b6a38fc0312cba66fc0228a0daaa29ad') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-multimedia/mingw-w64/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch b/qt5-multimedia/mingw-w64/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch index bd7bab05..2aa278f4 100644 --- a/qt5-multimedia/mingw-w64/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch +++ b/qt5-multimedia/mingw-w64/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch @@ -1,4 +1,4 @@ -From 2fe08c97f5832ffb51876908ee85ef09602148ba Mon Sep 17 00:00:00 2001 +From 43d59aa52d8a27d35e22e3a18d1ab8f101e403b6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 25 Sep 2016 21:36:56 +0200 Subject: [PATCH 1/3] Recorder includes to prevent conflict with vsnprintf @@ -37,5 +37,5 @@ index 5f391710..3ae3b8aa 100644 QT_BEGIN_NAMESPACE -- -2.20.1 +2.21.0 diff --git a/qt5-multimedia/mingw-w64/0002-Fix-build-with-ANGLE.patch b/qt5-multimedia/mingw-w64/0002-Fix-build-with-ANGLE.patch index 406f453f..742ee0a4 100644 --- a/qt5-multimedia/mingw-w64/0002-Fix-build-with-ANGLE.patch +++ b/qt5-multimedia/mingw-w64/0002-Fix-build-with-ANGLE.patch @@ -1,4 +1,4 @@ -From 6c827291b2a23f06379588ea10f6cd0f0d6aee8e Mon Sep 17 00:00:00 2001 +From a3f8d9f9a57e042a66586423b93bb0e37673fbdc Mon Sep 17 00:00:00 2001 From: Jose Santiago Date: Thu, 3 Nov 2016 14:36:10 -0500 Subject: [PATCH 2/3] Fix build with ANGLE @@ -25,5 +25,5 @@ index ab694b79..79fd34be 100644 #endif -- -2.20.1 +2.21.0 diff --git a/qt5-multimedia/mingw-w64/0003-Link-directshow-plugin-against-libamstrmid.patch b/qt5-multimedia/mingw-w64/0003-Link-directshow-plugin-against-libamstrmid.patch index a3112489..bdf2ec13 100644 --- a/qt5-multimedia/mingw-w64/0003-Link-directshow-plugin-against-libamstrmid.patch +++ b/qt5-multimedia/mingw-w64/0003-Link-directshow-plugin-against-libamstrmid.patch @@ -1,4 +1,4 @@ -From c0ecd0c32825a3c653898bc05773532f70ba3fde Mon Sep 17 00:00:00 2001 +From 96aabcf9e88901120924310bafd817de44e94ec3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 24 Sep 2018 20:10:19 +0200 Subject: [PATCH 3/3] Link directshow plugin against libamstrmid @@ -28,5 +28,5 @@ index 54d61716..e097d433 100644 SOURCES += dsserviceplugin.cpp -- -2.20.1 +2.21.0 diff --git a/qt5-multimedia/mingw-w64/PKGBUILD b/qt5-multimedia/mingw-w64/PKGBUILD index fbf865c9..b4a6abd3 100644 --- a/qt5-multimedia/mingw-w64/PKGBUILD +++ b/qt5-multimedia/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtmultimedia pkgname=mingw-w64-qt5-multimedia -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)' @@ -25,10 +25,10 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch' '0002-Fix-build-with-ANGLE.patch' '0003-Link-directshow-plugin-against-libamstrmid.patch') -sha256sums=('9c5ba11225f57d3a8124f109514443e290a9eb94e063a5b1f78e63edfb5f0b18' - 'dfeb1cfac258612f5d7ccf56443722931d0a88d46f98d08b9d8631fd7aa42cea' - 'a8056811f803dedcf8175029b9f5e5ea47893faa388c6c398d74461580ce29ef' - '4571f18a7d48ad1454c2d509c8dc111d67cd3c137011d7709fb04a0e7c280db7') +sha256sums=('5d3c90c546e64abf523432a3df5e7a3f1b5ad72e7d0b5ea6260729fbefeb30f5' + '578aecc05c3be335c5921fa07daa174d5f6c9474ac95d0063ce6bbb45c5c2299' + 'aa4b42522094bb924a216d4c0fd0e693b47a0c27876f57434da475a48dd0f351' + '76d3a346f309cfe1c5cff8e10891630a49fb0af61d3d95bfd591268b33e477d2') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-networkauth/mingw-w64/PKGBUILD b/qt5-networkauth/mingw-w64/PKGBUILD index 75d5ec9e..9d538356 100644 --- a/qt5-networkauth/mingw-w64/PKGBUILD +++ b/qt5-networkauth/mingw-w64/PKGBUILD @@ -8,7 +8,7 @@ _qt_module=qtnetworkauth pkgname="mingw-w64-qt5-networkauth" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Network authentication module (mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('090fbb6be35b2f2edf7cc4cb32f0f9c27a9a66defa06f6d23e1397836e31d44c') +sha256sums=('5876c1d8e37238eca8d5fbc945dfeb90bac013597bcac5c5beff23c12a8a4383') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-quickcontrols/mingw-w64/PKGBUILD b/qt5-quickcontrols/mingw-w64/PKGBUILD index fb62c35c..856b94b4 100644 --- a/qt5-quickcontrols/mingw-w64/PKGBUILD +++ b/qt5-quickcontrols/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtquickcontrols pkgname="mingw-w64-qt5-quickcontrols" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)" @@ -22,7 +22,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-$pkgver" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('15164b00921352b5145a4fc3be0015b8521138a0cb1ecfb9811f39fd35ecd62c') +sha256sums=('9b5c87605d08849927dd09bf9b03a939511461372b7e20004abe1116cf9fc73e') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-quickcontrols2/mingw-w64/PKGBUILD b/qt5-quickcontrols2/mingw-w64/PKGBUILD index 1f05538a..a9160c8e 100644 --- a/qt5-quickcontrols2/mingw-w64/PKGBUILD +++ b/qt5-quickcontrols2/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtquickcontrols2 pkgname="mingw-w64-qt5-quickcontrols2" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)" @@ -22,7 +22,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-$pkgver" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('caa47b6d771b11c65d595fdd0f0942c3d78cda2884d318e3b1da8ec67155a8e7') +sha256sums=('1fbd703612a2c0257861e07a2b709f6fbad00cb6df70a1c2c1fafa9de522e549') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-remoteobjects/mingw-w64/PKGBUILD b/qt5-remoteobjects/mingw-w64/PKGBUILD index 18695423..0e7328dd 100644 --- a/qt5-remoteobjects/mingw-w64/PKGBUILD +++ b/qt5-remoteobjects/mingw-w64/PKGBUILD @@ -8,7 +8,7 @@ _qt_module=qtremoteobjects pkgname="mingw-w64-qt5-remoteobjects" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Inter-process communication (IPC) module developed for Qt (mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('f18cfde8d060d76f5f56ffb701a27f6e0c39b5abdae3dbac933dbb41d191f740') +sha256sums=('2ae04817cd67c8550ccc685e6db9ca78ed2d7ec0b90e1de28a9fd7cda88d9811') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-script/mingw-w64/PKGBUILD b/qt5-script/mingw-w64/PKGBUILD index 04b96453..1018ed98 100644 --- a/qt5-script/mingw-w64/PKGBUILD +++ b/qt5-script/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtscript pkgname="mingw-w64-qt5-script" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility (mingw-w64)" @@ -22,7 +22,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('e5c158fb85799404d20d1ec5dd33a25d5f5736807e1008ce626f666a52c80624') +sha256sums=('f8717d51072b4d4455755ae081e45f23f3d0ce25602f96231dd7703bd818a2e6') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-scxml/mingw-w64/PKGBUILD b/qt5-scxml/mingw-w64/PKGBUILD index 6d945601..243f76af 100644 --- a/qt5-scxml/mingw-w64/PKGBUILD +++ b/qt5-scxml/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtscxml pkgname="mingw-w64-qt5-scxml" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Static and runtime integration of SCXML models into Qt code (mingw-w64)" @@ -22,7 +22,7 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('59a2aa1000fe03b0a3eff6fddd21f782e305408fcdd7af1f564a382331cb20b7') +sha256sums=('69592542fdf4b2efe6a6378ecb1bfdda9e7f48007e191d7f77a0009e213a8623') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-sensors/mingw-w64/PKGBUILD b/qt5-sensors/mingw-w64/PKGBUILD index e56cbe81..95584b68 100644 --- a/qt5-sensors/mingw-w64/PKGBUILD +++ b/qt5-sensors/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtsensors pkgname=mingw-w64-qt5-sensors -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Provides access to sensor hardware and motion gesture recognition (mingw-w64)" @@ -23,7 +23,7 @@ groups=('mingw-w64-qt5') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('ebc8b4bcfacf10c3bea3f400da7bf3fc7f44f90fa9eb0320c3b87f17307a63e4') +sha256sums=('758a131ad86c4b8b8364e48d659a680ed12d03c091c5ab2958d06b7b0aa2e50c') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-serialport/mingw-w64/PKGBUILD b/qt5-serialport/mingw-w64/PKGBUILD index 49de56ea..559e1503 100644 --- a/qt5-serialport/mingw-w64/PKGBUILD +++ b/qt5-serialport/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtserialport pkgname="mingw-w64-qt5-serialport" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Provides access to hardware and virtual serial ports (mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-$pkgver" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") -sha256sums=('243b2502283c45f5163d68c3f23c787d46eb0e3ba58f3d9a0560dc7968a6ce19') +sha256sums=('72163cedda4c6fa787db8666bec6b5057272dc87bf8de6addba3440dd472bd7f') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-speech/mingw-w64/PKGBUILD b/qt5-speech/mingw-w64/PKGBUILD index 3648e7d7..efba0866 100644 --- a/qt5-speech/mingw-w64/PKGBUILD +++ b/qt5-speech/mingw-w64/PKGBUILD @@ -8,7 +8,7 @@ _qt_module=qtspeech pkgname="mingw-w64-qt5-speech" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Qt module to make text to speech and speech recognition easy (mingw-w64)" @@ -24,7 +24,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('147524ba6f97c76784beb315ee939614b7a3b4eb1a6417cc0beea662cf0d9121') +sha256sums=('5ad4b5931d6a677d8c4569a2a9147b992653962b339bd2f233400ffb43955911') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-svg/apple-darwin/PKGBUILD b/qt5-svg/apple-darwin/PKGBUILD index c0571b7a..f4cd4651 100644 --- a/qt5-svg/apple-darwin/PKGBUILD +++ b/qt5-svg/apple-darwin/PKGBUILD @@ -5,7 +5,7 @@ _qt_module=qtsvg pkgname='apple-darwin-qt5-svg' -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Classes for displaying the contents of SVG files (apple-darwin)" diff --git a/qt5-svg/mingw-w64/PKGBUILD b/qt5-svg/mingw-w64/PKGBUILD index be0ed94e..ff79417a 100644 --- a/qt5-svg/mingw-w64/PKGBUILD +++ b/qt5-svg/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtsvg pkgname="mingw-w64-qt5-svg" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('5bc1f744d32c06f5aa4eff33759568106a995ce21fa1326a247dfa5f783f63c8') +sha256sums=('ed9f2118a6d33f53e5d9ed18dcd36f252a4fbaf68382a1c4a663ba75b25ae7bd') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-tools/apple-darwin/PKGBUILD b/qt5-tools/apple-darwin/PKGBUILD index 2ae35589..2f16acd8 100644 --- a/qt5-tools/apple-darwin/PKGBUILD +++ b/qt5-tools/apple-darwin/PKGBUILD @@ -5,7 +5,7 @@ _qt_module=qttools pkgname="apple-darwin-qt5-tools" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; apple-darwin)" diff --git a/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch b/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch index f3efcd7b..953a2819 100644 --- a/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch +++ b/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch @@ -1,7 +1,7 @@ -From d5b1888554bb78bd4a96705caa557bfae357e9fb Mon Sep 17 00:00:00 2001 +From 98202039059e7f96c2d6962a83c416cdcc2fd0b4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 25 Sep 2016 21:44:42 +0200 -Subject: [PATCH 1/2] Fix linguist macro +Subject: [PATCH] Fix linguist macro - Prevent CMake appending extra 'Qt5::lupdate'/'Qt5::lrelease' to command line when invoking lupdate/lrelease @@ -38,5 +38,5 @@ index b9959730..75776e0e 100644 DEPENDS ${_abs_FILE} VERBATIM ) -- -2.20.1 +2.21.0 diff --git a/qt5-tools/mingw-w64/0002-Make-windeployqt-cross-platform-again.patch b/qt5-tools/mingw-w64/0002-Make-windeployqt-cross-platform-again.patch deleted file mode 100644 index d904098f..00000000 --- a/qt5-tools/mingw-w64/0002-Make-windeployqt-cross-platform-again.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 230f11ae808dbb73b7675030b024fe63e0982397 Mon Sep 17 00:00:00 2001 -From: Martchus -Date: Sun, 3 Feb 2019 17:40:35 +0100 -Subject: [PATCH 2/2] Make windeployqt cross-platform (again) - ---- - src/windeployqt/main.cpp | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp -index 955a3077..2ad1a177 100644 ---- a/src/windeployqt/main.cpp -+++ b/src/windeployqt/main.cpp -@@ -40,7 +40,12 @@ - #include - #include - #include -+ -+#ifdef Q_OS_WIN - #include -+#else -+#define IMAGE_FILE_MACHINE_ARM64 0xaa64 -+#endif - - #include - #include -@@ -1100,6 +1105,7 @@ static QStringList compilerRunTimeLibs(Platform platform, bool isDebug, unsigned - result.append(dllFi.absoluteFilePath()); - } - break; -+#ifdef Q_OS_WIN - case WindowsDesktop: { // MSVC/Desktop: Add redistributable packages. - QString vcRedistDirName = vcRedistDir(); - if (vcRedistDirName.isEmpty()) -@@ -1138,6 +1144,7 @@ static QStringList compilerRunTimeLibs(Platform platform, bool isDebug, unsigned - } - result.append(redistFiles); - } -+#endif - default: - break; - } --- -2.20.1 - diff --git a/qt5-tools/mingw-w64/PKGBUILD b/qt5-tools/mingw-w64/PKGBUILD old mode 100644 new mode 100755 index ec73e013..c5c5394f --- a/qt5-tools/mingw-w64/PKGBUILD +++ b/qt5-tools/mingw-w64/PKGBUILD @@ -16,7 +16,7 @@ _qt_module=qttools pkgname="mingw-w64-qt5-tools" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)" @@ -28,11 +28,9 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" - '0001-Fix-linguist-macro.patch' - '0002-Make-windeployqt-cross-platform-again.patch') -sha256sums=('ab1da4fbd84a9d3873e4ed212a0ae614c6059b8e7dca2f0a599a6f7e61f6cbf3' - 'af21681c33589ae384c6582091ac9fe2b09abae33af19c8b0d5eb840c38d20ce' - 'ce38a762867b988de6b9b4ecea21272a19132c855c1a7438c9754ae2a8b0ee5f') + '0001-Fix-linguist-macro.patch') +sha256sums=('4aa3a089794ab1c629b666fffb5da4371351a9e85ea691d5d988c2ff63586005' + '6b1c35f587b31a0ec6aa813b836ea671b31639e7832351a9960402708f7d7906') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-translations/apple-darwin/PKGBUILD b/qt5-translations/apple-darwin/PKGBUILD index 5819fe9c..6b5199b2 100644 --- a/qt5-translations/apple-darwin/PKGBUILD +++ b/qt5-translations/apple-darwin/PKGBUILD @@ -5,7 +5,7 @@ _qt_module=qttranslations pkgname='apple-darwin-qt5-translations' -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="A cross-platform application and UI framework (translations, apple-darwin)" diff --git a/qt5-translations/mingw-w64/PKGBUILD b/qt5-translations/mingw-w64/PKGBUILD index e0eb3e87..a572c198 100644 --- a/qt5-translations/mingw-w64/PKGBUILD +++ b/qt5-translations/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qttranslations pkgname="mingw-w64-qt5-translations" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="A cross-platform application and UI framework (translations, mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('7443d70d8572321e810c52fbdd096666e61510e07e17437f1910f0b800cca6a7') +sha256sums=('bbe47b3995be8528ee5e78eae263a5ec224cd18e588219191716a17802e60c7b') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-virtualkeyboard/mingw-w64/PKGBUILD b/qt5-virtualkeyboard/mingw-w64/PKGBUILD index 56377b8d..f4874709 100644 --- a/qt5-virtualkeyboard/mingw-w64/PKGBUILD +++ b/qt5-virtualkeyboard/mingw-w64/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtvirtualkeyboard pkgname="mingw-w64-qt5-virtualkeyboard" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Virtual keyboard framework (translations, mingw-w64)" @@ -23,7 +23,7 @@ license=('GPL3') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('a9e3ed4786d603314144c7ad29a9fdeb6e5c3f2ea5a27f6545cc9777244cd683') +sha256sums=('7111de5c78f8a0d29394409727647b90ae5906fd5105c843af98c3ae3804248d') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-webchannel/mingw-w64/PKGBUILD b/qt5-webchannel/mingw-w64/PKGBUILD index 6c2d92aa..a1b627f5 100644 --- a/qt5-webchannel/mingw-w64/PKGBUILD +++ b/qt5-webchannel/mingw-w64/PKGBUILD @@ -8,7 +8,7 @@ _qt_module=qtwebchannel pkgname=mingw-w64-qt5-webchannel -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc='Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients (mingw-w64)' @@ -21,7 +21,7 @@ url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" groups=('mingw-w64-qt5') source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('40c3e74347c67a9864d0d54f14120555860e4ce529746407325b3cd6e9aeb5bf') +sha256sums=('8eb9cff9492937daa1bf5d001e39afec68c310ce5596807345e2a555dcc80b8e') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-webengine/mingw-w64/PKGBUILD b/qt5-webengine/mingw-w64/PKGBUILD index ccd14c6f..28ffa55e 100644 --- a/qt5-webengine/mingw-w64/PKGBUILD +++ b/qt5-webengine/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtwebengine pkgname=mingw-w64-qt5-webengine -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc='Provides support for web applications using the Chromium browser project (mingw-w64)' diff --git a/qt5-webglplugin/mingw-w64/0001-Hardcode-linker-flags-for-platform-plugin.patch b/qt5-webglplugin/mingw-w64/0001-Hardcode-linker-flags-for-platform-plugin.patch index cfa1b70b..99296838 100644 --- a/qt5-webglplugin/mingw-w64/0001-Hardcode-linker-flags-for-platform-plugin.patch +++ b/qt5-webglplugin/mingw-w64/0001-Hardcode-linker-flags-for-platform-plugin.patch @@ -1,4 +1,4 @@ -From ccdbd65df73988818b651fb665b640fcc69cbf9e Mon Sep 17 00:00:00 2001 +From 33cf02040a4933927da94fd1eed3fe1e7bac1d8e Mon Sep 17 00:00:00 2001 From: Marius Kittler Date: Wed, 12 Dec 2018 18:16:54 +0100 Subject: [PATCH] Hardcode linker flags for platform plugin @@ -42,5 +42,5 @@ index 7f7227c..45f8f66 100644 qtHaveModule(quick) { QT += quick -- -2.20.1 +2.21.0 diff --git a/qt5-webglplugin/mingw-w64/PKGBUILD b/qt5-webglplugin/mingw-w64/PKGBUILD index 6e36fe1e..126c7190 100644 --- a/qt5-webglplugin/mingw-w64/PKGBUILD +++ b/qt5-webglplugin/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtwebglplugin pkgname="mingw-w64-qt5-webglplugin" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="QPA plugin for running an application via a browser using streamed WebGL commands (mingw-w64)" @@ -22,8 +22,8 @@ url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" '0001-Hardcode-linker-flags-for-platform-plugin.patch') -sha256sums=('7ca4f9b6fb8f893fff50b586a4dfb9d6519c33dfaaab6747b462c143ed32a0de' - 'da00e3a71ea4bfdac261d6ae8b54026ca00d86fd30c861cc7e59d54af4af7b06') +sha256sums=('0ecf9c0cb123dd89c4360dc946957a7527a2fb1c334e1bcf124cc740ca2f9bba' + 'cfe1e4216ca28218d1b72adae8f4ed3c0210a88c2d729c2f6e427c91f0c1358a') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-websockets/mingw-w64/PKGBUILD b/qt5-websockets/mingw-w64/PKGBUILD index 6db10881..e3f18296 100644 --- a/qt5-websockets/mingw-w64/PKGBUILD +++ b/qt5-websockets/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtwebsockets pkgname="mingw-w64-qt5-websockets" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Provides WebSocket communication compliant with RFC 6455 (mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('2fd0627916d817599c5f855a97156113ed3625b90b350603be6f668762abfc79') +sha256sums=('ab9ce815b1466abe52910c9b50c0f61df8af74f9521574bb534f7f562d0e8c04') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-winextras/mingw-w64/0001-Revert-Directly-link-to-functions-available-from-Win.patch b/qt5-winextras/mingw-w64/0001-Revert-Directly-link-to-functions-available-from-Win.patch new file mode 100644 index 00000000..74a9687e --- /dev/null +++ b/qt5-winextras/mingw-w64/0001-Revert-Directly-link-to-functions-available-from-Win.patch @@ -0,0 +1,298 @@ +From 4dfb6bb558968399aeef98dd95407bd805a2375c Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Sun, 27 May 2018 14:23:11 +0200 +Subject: [PATCH] Revert "Directly link to functions available from Windows 7 + onwards" + +This reverts commit 07f6d25a00af112d46e939992fb9cf42879fc7c1. + +Otherwise the x86_64 version doesn't compile with mingw-w64-crt 5.0.3. + +Apparently those functions are absent in the libdwmapi.a library provided +by the CRT: +``` +grep DwmSetIconicThumbnail /usr/x86_64-w64-mingw32/lib/libdwmapi.a +[no further output] +``` + +This leads to the following linker error: +``` +x86_64-w64-mingw32-g++ -g -shared -Wl,-subsystem,windows -Wl,--out-implib,/build/mingw-w64-qt5-winextras/src/qtwinextras-everywhere-src-5.11.0/build-x86_64-w64-mingw32-shared/lib/libQt5WinExtras.dll.a -o ../../lib/Qt5WinExtras.dll object_script.Qt5WinExtras.Release -lglu32 -lopengl32 -lgdi32 -luser32 -lQt5Gui -lQt5Core -lole32 -lshlwapi -lshell32 -ldwmapi +./.obj/release/qwinthumbnailtoolbar.o: In function `QWinThumbnailToolBarPrivate::updateIconicPixmapsEnabled(bool)': +/build/mingw-w64-qt5-winextras/src/qtwinextras-everywhere-src-5.11.0/src/winextras/qwinthumbnailtoolbar.cpp:246: undefined reference to `DwmInvalidateIconicBitmaps' +./.obj/release/qwinthumbnailtoolbar.o: In function `QWinThumbnailToolBarPrivate::updateIconicLivePreview(tagMSG const*)': +/build/mingw-w64-qt5-winextras/src/qtwinextras-everywhere-src-5.11.0/src/winextras/qwinthumbnailtoolbar.cpp:411: undefined reference to `DwmSetIconicLivePreviewBitmap' +./.obj/release/qwinthumbnailtoolbar.o: In function `QWinThumbnailToolBarPrivate::updateIconicThumbnail(tagMSG const*)': +/build/mingw-w64-qt5-winextras/src/qtwinextras-everywhere-src-5.11.0/src/winextras/qwinthumbnailtoolbar.cpp:396: undefined reference to `DwmSetIconicThumbnail' +collect2: error: ld returned 1 exit status +``` + +Note that the i686 version has the required functions and links fine: +``` +grep DwmSetIconicThumbnail /usr/i686-w64-mingw32/lib/libdwmapi.a +Binary file /usr/i686-w64-mingw32/lib/libdwmapi.a matches +``` +--- + src/winextras/qwinfunctions.cpp | 14 ++--- + src/winextras/qwinfunctions_p.cpp | 74 ++++++++++++++++++++++++++ + src/winextras/qwinfunctions_p.h | 36 ++++++++++++- + src/winextras/qwinthumbnailtoolbar.cpp | 22 ++++---- + src/winextras/winextras.pro | 1 + + 5 files changed, 125 insertions(+), 22 deletions(-) + create mode 100644 src/winextras/qwinfunctions_p.cpp + +diff --git a/src/winextras/qwinfunctions.cpp b/src/winextras/qwinfunctions.cpp +index 82fd25b..4edf76f 100644 +--- a/src/winextras/qwinfunctions.cpp ++++ b/src/winextras/qwinfunctions.cpp +@@ -38,13 +38,6 @@ + ** + ****************************************************************************/ + +-#if defined(NTDDI_VERSION) && NTDDI_VERSION < 0x06010000 // NTDDI_WIN7 +-# undef NTDDI_VERSION +-#endif +-#if !defined(NTDDI_VERSION) +-# define NTDDI_VERSION 0x06010000 // Enable functions for MinGW +-#endif +- + #include "qwinfunctions.h" + #include "qwinfunctions_p.h" + #include "qwineventfilter_p.h" +@@ -1850,8 +1843,11 @@ bool QtWin::isCompositionOpaque() + */ + void QtWin::setCurrentProcessExplicitAppUserModelID(const QString &id) + { +- QScopedArrayPointer wid(qt_qstringToNullTerminated(id)); +- SetCurrentProcessExplicitAppUserModelID(wid.data()); ++ qtShell32Dll.init(); ++ if (qtShell32Dll.setCurrentProcessExplicitAppUserModelID) { ++ QScopedArrayPointer wid(qt_qstringToNullTerminated(id)); ++ qtShell32Dll.setCurrentProcessExplicitAppUserModelID(wid.data()); ++ } + } + + /*! +diff --git a/src/winextras/qwinfunctions_p.cpp b/src/winextras/qwinfunctions_p.cpp +new file mode 100644 +index 0000000..ea9dcf9 +--- /dev/null ++++ b/src/winextras/qwinfunctions_p.cpp +@@ -0,0 +1,74 @@ ++/**************************************************************************** ++ ** ++ ** Copyright (C) 2016 Ivan Vizir ++ ** Contact: https://www.qt.io/licensing/ ++ ** ++ ** This file is part of the QtWinExtras module of the Qt Toolkit. ++ ** ++ ** $QT_BEGIN_LICENSE:LGPL$ ++ ** Commercial License Usage ++ ** Licensees holding valid commercial Qt licenses may use this file in ++ ** accordance with the commercial license agreement provided with the ++ ** Software or, alternatively, in accordance with the terms contained in ++ ** a written agreement between you and The Qt Company. For licensing terms ++ ** and conditions see https://www.qt.io/terms-conditions. For further ++ ** information use the contact form at https://www.qt.io/contact-us. ++ ** ++ ** GNU Lesser General Public License Usage ++ ** Alternatively, this file may be used under the terms of the GNU Lesser ++ ** General Public License version 3 as published by the Free Software ++ ** Foundation and appearing in the file LICENSE.LGPL3 included in the ++ ** packaging of this file. Please review the following information to ++ ** ensure the GNU Lesser General Public License version 3 requirements ++ ** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. ++ ** ++ ** GNU General Public License Usage ++ ** Alternatively, this file may be used under the terms of the GNU ++ ** General Public License version 2.0 or (at your option) the GNU General ++ ** Public license version 3 or any later version approved by the KDE Free ++ ** Qt Foundation. The licenses are as published by the Free Software ++ ** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 ++ ** included in the packaging of this file. Please review the following ++ ** information to ensure the GNU General Public License requirements will ++ ** be met: https://www.gnu.org/licenses/gpl-2.0.html and ++ ** https://www.gnu.org/licenses/gpl-3.0.html. ++ ** ++ ** $QT_END_LICENSE$ ++ ** ++ ****************************************************************************/ ++ ++#include "qwinfunctions_p.h" ++ ++#include ++ ++QT_BEGIN_NAMESPACE ++ ++// in order to allow binary to load on WinXP... ++QtDwmApiDll qtDwmApiDll; ++QtShell32Dll qtShell32Dll; ++ ++void QtDwmApiDll::resolve() ++{ ++ if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS7) { ++ if (const HMODULE dwmapi = LoadLibraryW(L"dwmapi.dll")) { ++ dwmSetIconicThumbnail = ++ (DwmSetIconicThumbnail) GetProcAddress(dwmapi, "DwmSetIconicThumbnail"); ++ dwmSetIconicLivePreviewBitmap = ++ (DwmSetIconicLivePreviewBitmap) GetProcAddress(dwmapi, "DwmSetIconicLivePreviewBitmap"); ++ dwmInvalidateIconicBitmaps = ++ (DwmInvalidateIconicBitmaps) GetProcAddress(dwmapi, "DwmInvalidateIconicBitmaps"); ++ } ++ } ++} ++ ++void QtShell32Dll::resolve() ++{ ++ if (QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS7) { ++ if (const HMODULE shell32 = LoadLibraryW(L"shell32.dll")) { ++ setCurrentProcessExplicitAppUserModelID = ++ (SetCurrentProcessExplicitAppUserModelID) GetProcAddress(shell32, "SetCurrentProcessExplicitAppUserModelID"); ++ } ++ } ++} ++ ++QT_END_NAMESPACE +diff --git a/src/winextras/qwinfunctions_p.h b/src/winextras/qwinfunctions_p.h +index 03dff5e..31536bb 100644 +--- a/src/winextras/qwinfunctions_p.h ++++ b/src/winextras/qwinfunctions_p.h +@@ -64,8 +64,20 @@ enum qt_DWMWINDOWATTRIBUTE // Not present in MinGW 4.9 + qt_DWMWA_EXCLUDED_FROM_PEEK = 12, + }; + +-namespace QtDwmApiDll ++struct QtDwmApiDll + { ++ typedef HRESULT (STDAPICALLTYPE *DwmSetIconicThumbnail)(HWND, HBITMAP, DWORD); // Windows 7 ++ typedef HRESULT (STDAPICALLTYPE *DwmSetIconicLivePreviewBitmap)(HWND, HBITMAP, POINT *, DWORD); ++ typedef HRESULT (STDAPICALLTYPE *DwmInvalidateIconicBitmaps)(HWND); ++ ++ void init() ++ { ++ if (!dwmSetIconicThumbnail) ++ resolve(); ++ } ++ ++ void resolve(); ++ + template static T windowAttribute(HWND hwnd, DWORD attribute, T defaultValue); + template static void setWindowAttribute(HWND hwnd, DWORD attribute, T value); + +@@ -74,8 +86,30 @@ namespace QtDwmApiDll + + inline void setBooleanWindowAttribute(HWND hwnd, DWORD attribute, bool value) + { setWindowAttribute(hwnd, attribute, BOOL(value ? TRUE : FALSE)); } ++ ++ DwmSetIconicThumbnail dwmSetIconicThumbnail = nullptr; ++ DwmSetIconicLivePreviewBitmap dwmSetIconicLivePreviewBitmap = nullptr; ++ DwmInvalidateIconicBitmaps dwmInvalidateIconicBitmaps = nullptr; + }; + ++struct QtShell32Dll ++{ ++ typedef HRESULT (STDAPICALLTYPE *SetCurrentProcessExplicitAppUserModelID)(PCWSTR); ++ ++ void init() ++ { ++ if (!setCurrentProcessExplicitAppUserModelID) ++ resolve(); ++ } ++ ++ void resolve(); ++ ++ SetCurrentProcessExplicitAppUserModelID setCurrentProcessExplicitAppUserModelID = nullptr; // Windows 7 ++}; ++ ++extern QtDwmApiDll qtDwmApiDll; ++extern QtShell32Dll qtShell32Dll; ++ + inline void qt_qstringToNullTerminated(const QString &src, wchar_t *dst) + { + dst[src.toWCharArray(dst)] = 0; +diff --git a/src/winextras/qwinthumbnailtoolbar.cpp b/src/winextras/qwinthumbnailtoolbar.cpp +index 3aa39b6..d7eb4aa 100644 +--- a/src/winextras/qwinthumbnailtoolbar.cpp ++++ b/src/winextras/qwinthumbnailtoolbar.cpp +@@ -38,13 +38,6 @@ + ** + ****************************************************************************/ + +-#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0601 +-# undef _WIN32_WINNT +-#endif +-#if !defined(_WIN32_WINNT) +-# define _WIN32_WINNT 0x0601 // Enable functions for MinGW +-#endif +- + #include "qwinthumbnailtoolbar.h" + #include "qwinthumbnailtoolbar_p.h" + #include "qwinthumbnailtoolbutton.h" +@@ -232,15 +225,18 @@ int QWinThumbnailToolBar::count() const + void QWinThumbnailToolBarPrivate::updateIconicPixmapsEnabled(bool invalidate) + { + Q_Q(QWinThumbnailToolBar); ++ qtDwmApiDll.init(); + const HWND hwnd = handle(); + if (!hwnd) { + qWarning() << Q_FUNC_INFO << "invoked with hwnd=0"; + return; + } ++ if (!qtDwmApiDll.dwmInvalidateIconicBitmaps) ++ return; + const bool enabled = iconicThumbnail || iconicLivePreview; + q->setIconicPixmapNotificationsEnabled(enabled); + if (enabled && invalidate) { +- const HRESULT hr = DwmInvalidateIconicBitmaps(hwnd); ++ const HRESULT hr = qtDwmApiDll.dwmInvalidateIconicBitmaps(hwnd); + if (FAILED(hr)) + qWarning() << QWinThumbnailToolBarPrivate::msgComFailed("DwmInvalidateIconicBitmaps", hr); + } +@@ -386,11 +382,12 @@ QPixmap QWinThumbnailToolBar::iconicLivePreviewPixmap() const + + inline void QWinThumbnailToolBarPrivate::updateIconicThumbnail(const MSG *message) + { +- if (!iconicThumbnail) ++ qtDwmApiDll.init(); ++ if (!qtDwmApiDll.dwmSetIconicThumbnail || !iconicThumbnail) + return; + const QSize maxSize(HIWORD(message->lParam), LOWORD(message->lParam)); + if (const HBITMAP bitmap = iconicThumbnail.bitmap(maxSize)) { +- const HRESULT hr = DwmSetIconicThumbnail(message->hwnd, bitmap, dWM_SIT_DISPLAYFRAME); ++ const HRESULT hr = qtDwmApiDll.dwmSetIconicThumbnail(message->hwnd, bitmap, dWM_SIT_DISPLAYFRAME); + if (FAILED(hr)) + qWarning() << QWinThumbnailToolBarPrivate::msgComFailed("DwmSetIconicThumbnail", hr); + } +@@ -398,14 +395,15 @@ inline void QWinThumbnailToolBarPrivate::updateIconicThumbnail(const MSG *messag + + inline void QWinThumbnailToolBarPrivate::updateIconicLivePreview(const MSG *message) + { +- if (!iconicLivePreview) ++ qtDwmApiDll.init(); ++ if (!qtDwmApiDll.dwmSetIconicLivePreviewBitmap || !iconicLivePreview) + return; + RECT rect; + GetClientRect(message->hwnd, &rect); + const QSize maxSize(rect.right, rect.bottom); + POINT offset = {0, 0}; + if (const HBITMAP bitmap = iconicLivePreview.bitmap(maxSize)) { +- const HRESULT hr = DwmSetIconicLivePreviewBitmap(message->hwnd, bitmap, &offset, dWM_SIT_DISPLAYFRAME); ++ const HRESULT hr = qtDwmApiDll.dwmSetIconicLivePreviewBitmap(message->hwnd, bitmap, &offset, dWM_SIT_DISPLAYFRAME); + if (FAILED(hr)) + qWarning() << QWinThumbnailToolBarPrivate::msgComFailed("DwmSetIconicLivePreviewBitmap", hr); + } +diff --git a/src/winextras/winextras.pro b/src/winextras/winextras.pro +index 705c48c..5d93c6b 100644 +--- a/src/winextras/winextras.pro ++++ b/src/winextras/winextras.pro +@@ -6,6 +6,7 @@ DEFINES += QT_NO_FOREACH + + SOURCES += \ + qwinfunctions.cpp \ ++ qwinfunctions_p.cpp \ + qwintaskbarbutton.cpp \ + qwintaskbarprogress.cpp \ + windowsguidsdefs.cpp \ +-- +2.21.0 + diff --git a/qt5-winextras/mingw-w64/PKGBUILD b/qt5-winextras/mingw-w64/PKGBUILD index 84528ff4..caefc2ad 100644 --- a/qt5-winextras/mingw-w64/PKGBUILD +++ b/qt5-winextras/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtwinextras pkgname="mingw-w64-qt5-winextras" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Classes and functions that enable you to use Windows-specific functions (mingw-w64)" @@ -20,8 +20,10 @@ groups=('mingw-w64-qt5') license=('GPL3' 'LGPL3' 'LGPL2.1' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" -source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('8d312155a7da329df41cc2ea5d265eb632be7dd9cbd789fa3bc0206b4022f557') +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" + '0001-Revert-Directly-link-to-functions-available-from-Win.patch') +sha256sums=('3141027c4f7dbb2bcef8a35fd60d673adfff0e4fb20c36f73930570252136787' + '03ad2a77845d5aac183f99dc9e3af7d3a7dec3549d0dfb8b9817bce99ed9110b') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-xmlpatterns/mingw-w64/PKGBUILD b/qt5-xmlpatterns/mingw-w64/PKGBUILD index 280947dc..a2938489 100644 --- a/qt5-xmlpatterns/mingw-w64/PKGBUILD +++ b/qt5-xmlpatterns/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtxmlpatterns pkgname="mingw-w64-qt5-xmlpatterns" -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 arch=('any') pkgdesc="Support for XPath, XQuery, XSLT and XML schema validation (mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('76988ca9a7a184b9013b8a5864dad150e4603890c7eb7aecad4baad071802ecb') +sha256sums=('2e535ec17b542f2a0b87a9db93284666015cc07b6188894ace7e75104c6d860d') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5/android-aarch64/0001-Disable-mapboxgl.patch b/qt5/android-aarch64/0001-Disable-mapboxgl.patch index 4777677a..4d1e3e31 100644 --- a/qt5/android-aarch64/0001-Disable-mapboxgl.patch +++ b/qt5/android-aarch64/0001-Disable-mapboxgl.patch @@ -1,4 +1,4 @@ -From 795917c0a4dc64a7d9ee3bb4f02f953cf3db1849 Mon Sep 17 00:00:00 2001 +From aceefe5f7ae5fc126621c0771a16faff52c32e08 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Dec 2018 14:29:59 +0100 Subject: [PATCH] Disable mapboxgl @@ -25,5 +25,5 @@ index b81ad34a..98308c97 100644 - } -} -- -2.20.1 +2.21.0 diff --git a/qt5/android-aarch64/0001-Fix-clang-libc-build-under-Android.patch b/qt5/android-aarch64/0001-Fix-clang-libc-build-under-Android.patch index 703d4d38..b47e6371 100644 --- a/qt5/android-aarch64/0001-Fix-clang-libc-build-under-Android.patch +++ b/qt5/android-aarch64/0001-Fix-clang-libc-build-under-Android.patch @@ -1,4 +1,4 @@ -From d61ebca16545ec3eadabedd1a5b60bb8b4e45836 Mon Sep 17 00:00:00 2001 +From a2e98de3e73003272729e4393e32ac49fa991f5a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Dec 2018 14:28:07 +0100 Subject: [PATCH 1/2] Fix clang/libc++ build under Android @@ -8,13 +8,13 @@ Subject: [PATCH 1/2] Fix clang/libc++ build under Android 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf -index a0a369bb44..0efd86e43a 100644 +index a077c70cba..5cc6ee79e2 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf -@@ -31,11 +31,12 @@ else: equals(ANDROID_TARGET_ARCH, mips64): \ +@@ -34,11 +34,12 @@ QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH -fno-limit-debug-info + QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a + equals(ANDROID_TARGET_ARCH, armeabi-v7a): QMAKE_LINK += -Wl,--exclude-libs,libunwind.a - QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH - QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$NDK_ROOT/sysroot \ +QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$ANDROID_PLATFORM_ROOT_PATH \ -isystem $$NDK_ROOT/sysroot/usr/include/$$NDK_TOOLS_PREFIX \ @@ -26,7 +26,7 @@ index a0a369bb44..0efd86e43a 100644 ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH -@@ -45,6 +46,8 @@ ANDROID_USE_LLVM = true +@@ -48,6 +49,8 @@ ANDROID_USE_LLVM = true exists($$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so): \ ANDROID_CXX_STL_LIBS = -lc++ @@ -36,5 +36,5 @@ index a0a369bb44..0efd86e43a 100644 ANDROID_CXX_STL_LIBS = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so.$$replace(ANDROID_PLATFORM, "android-", "") -- -2.20.1 +2.21.0 diff --git a/qt5/android-aarch64/0002-Fix-androiddeployqt-search-paths.patch b/qt5/android-aarch64/0002-Fix-androiddeployqt-search-paths.patch index debb5ad1..ff09363c 100644 --- a/qt5/android-aarch64/0002-Fix-androiddeployqt-search-paths.patch +++ b/qt5/android-aarch64/0002-Fix-androiddeployqt-search-paths.patch @@ -1,4 +1,4 @@ -From f3db8f65bb0f3fd538dad81667354b963900072c Mon Sep 17 00:00:00 2001 +From e209f40d45c9ca8dfc8f7704904c49dd9998de28 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Dec 2018 14:31:30 +0100 Subject: [PATCH 2/2] Fix androiddeployqt search paths @@ -8,10 +8,10 @@ Subject: [PATCH 2/2] Fix androiddeployqt search paths 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp -index 76c521ca8f..0b0ba8dcae 100644 +index cf85c244cd..af1079cae0 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp -@@ -1686,7 +1686,7 @@ bool scanImports(Options *options, QSet *usedDependencies) +@@ -1721,7 +1721,7 @@ bool scanImports(Options *options, QSet *usedDependencies) rootPath += QLatin1Char('/'); QStringList importPaths; @@ -20,7 +20,7 @@ index 76c521ca8f..0b0ba8dcae 100644 importPaths += rootPath; for (const QString &qmlImportPath : qAsConst(options->qmlImportPaths)) importPaths += shellQuote(qmlImportPath); -@@ -1817,7 +1817,7 @@ bool readDependencies(Options *options) +@@ -1852,7 +1852,7 @@ bool readDependencies(Options *options) return false; // Jam in the dependencies of the platform plugin, since the application will crash without it @@ -30,5 +30,5 @@ index 76c521ca8f..0b0ba8dcae 100644 while (!remainingDependencies.isEmpty()) { -- -2.20.1 +2.21.0 diff --git a/qt5/android-aarch64/PKGBUILD b/qt5/android-aarch64/PKGBUILD index 002cbc20..a38f9478 100644 --- a/qt5/android-aarch64/PKGBUILD +++ b/qt5/android-aarch64/PKGBUILD @@ -20,7 +20,7 @@ export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT:-/opt/android-ndk} export ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT:-/opt/android-sdk} pkgname=android-$_pkg_arch-qt5 -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 pkgdesc="Qt 5 for Android" arch=('x86_64') @@ -35,8 +35,9 @@ makedepends=('libgl' 'gperf' 'libxslt' 'fontconfig' + 'java-environment-openjdk<=8' "android-$_pkg_arch-openssl") -depends=('jre-openjdk-headless' +depends=('java-runtime-headless-openjdk<=8' 'apache-ant' 'android-ndk' "android-platform-$ANDROID_MINIMUM_PLATFORM" @@ -78,10 +79,10 @@ source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:4}/${pkg '0001-Fix-clang-libc-build-under-Android.patch' '0002-Fix-androiddeployqt-search-paths.patch' '0001-Disable-mapboxgl.patch') -sha256sums=('caffbd625c7bc10ff8c5c7a27dbc7d84fa4de146975c0e1ffe904b514ccd6da4' - '361656ebccb24948eb1c7464b2d8c74ccf147e519b4f8bead05ddf13dd8fce24' - 'f1ae0ba6431c32403d8628e8757541c39e950307578f174c300f79c7e3be39be' - '7c26e6617b0721ea2cefb0dc69b1b182b7237b58e43c15b5d9686b047c3ad7f8') +sha256sums=('59b8cb4e728450b21224dcaaa40eb25bafc5196b6988f2225c394c6b7f881ff5' + '0a7e5d8d2192b69af5b648db57de2feb2e70348c73e0e7d9570d8dc170437aad' + 'a958611bef4385b4e2d91ece10ab5cd48f621628c07612a18e36abae3cfbf440' + 'add336aab427a319203205355029229592713cebcda2e8bc4ce99efdb0322b76') _pref=/opt/android-libs/$_pkg_arch diff --git a/qt5/android-armv7a-eabi/0001-Disable-mapboxgl.patch b/qt5/android-armv7a-eabi/0001-Disable-mapboxgl.patch index 4777677a..4d1e3e31 100644 --- a/qt5/android-armv7a-eabi/0001-Disable-mapboxgl.patch +++ b/qt5/android-armv7a-eabi/0001-Disable-mapboxgl.patch @@ -1,4 +1,4 @@ -From 795917c0a4dc64a7d9ee3bb4f02f953cf3db1849 Mon Sep 17 00:00:00 2001 +From aceefe5f7ae5fc126621c0771a16faff52c32e08 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Dec 2018 14:29:59 +0100 Subject: [PATCH] Disable mapboxgl @@ -25,5 +25,5 @@ index b81ad34a..98308c97 100644 - } -} -- -2.20.1 +2.21.0 diff --git a/qt5/android-armv7a-eabi/0001-Fix-clang-libc-build-under-Android.patch b/qt5/android-armv7a-eabi/0001-Fix-clang-libc-build-under-Android.patch index 703d4d38..b47e6371 100644 --- a/qt5/android-armv7a-eabi/0001-Fix-clang-libc-build-under-Android.patch +++ b/qt5/android-armv7a-eabi/0001-Fix-clang-libc-build-under-Android.patch @@ -1,4 +1,4 @@ -From d61ebca16545ec3eadabedd1a5b60bb8b4e45836 Mon Sep 17 00:00:00 2001 +From a2e98de3e73003272729e4393e32ac49fa991f5a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Dec 2018 14:28:07 +0100 Subject: [PATCH 1/2] Fix clang/libc++ build under Android @@ -8,13 +8,13 @@ Subject: [PATCH 1/2] Fix clang/libc++ build under Android 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mkspecs/android-clang/qmake.conf b/mkspecs/android-clang/qmake.conf -index a0a369bb44..0efd86e43a 100644 +index a077c70cba..5cc6ee79e2 100644 --- a/mkspecs/android-clang/qmake.conf +++ b/mkspecs/android-clang/qmake.conf -@@ -31,11 +31,12 @@ else: equals(ANDROID_TARGET_ARCH, mips64): \ +@@ -34,11 +34,12 @@ QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH -fno-limit-debug-info + QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a + equals(ANDROID_TARGET_ARCH, armeabi-v7a): QMAKE_LINK += -Wl,--exclude-libs,libunwind.a - QMAKE_CFLAGS += -gcc-toolchain $$NDK_TOOLCHAIN_PATH - QMAKE_LINK = $$QMAKE_CXX $$QMAKE_CFLAGS -Wl,--exclude-libs,libgcc.a -QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$NDK_ROOT/sysroot \ +QMAKE_CFLAGS += -DANDROID_HAS_WSTRING --sysroot=$$ANDROID_PLATFORM_ROOT_PATH \ -isystem $$NDK_ROOT/sysroot/usr/include/$$NDK_TOOLS_PREFIX \ @@ -26,7 +26,7 @@ index a0a369bb44..0efd86e43a 100644 ANDROID_SOURCES_CXX_STL_LIBDIR = $$NDK_ROOT/sources/cxx-stl/llvm-libc++/libs/$$ANDROID_TARGET_ARCH -@@ -45,6 +46,8 @@ ANDROID_USE_LLVM = true +@@ -48,6 +49,8 @@ ANDROID_USE_LLVM = true exists($$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so): \ ANDROID_CXX_STL_LIBS = -lc++ @@ -36,5 +36,5 @@ index a0a369bb44..0efd86e43a 100644 ANDROID_CXX_STL_LIBS = $$ANDROID_SOURCES_CXX_STL_LIBDIR/libc++.so.$$replace(ANDROID_PLATFORM, "android-", "") -- -2.20.1 +2.21.0 diff --git a/qt5/android-armv7a-eabi/0002-Fix-androiddeployqt-search-paths.patch b/qt5/android-armv7a-eabi/0002-Fix-androiddeployqt-search-paths.patch index debb5ad1..ff09363c 100644 --- a/qt5/android-armv7a-eabi/0002-Fix-androiddeployqt-search-paths.patch +++ b/qt5/android-armv7a-eabi/0002-Fix-androiddeployqt-search-paths.patch @@ -1,4 +1,4 @@ -From f3db8f65bb0f3fd538dad81667354b963900072c Mon Sep 17 00:00:00 2001 +From e209f40d45c9ca8dfc8f7704904c49dd9998de28 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 9 Dec 2018 14:31:30 +0100 Subject: [PATCH 2/2] Fix androiddeployqt search paths @@ -8,10 +8,10 @@ Subject: [PATCH 2/2] Fix androiddeployqt search paths 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp -index 76c521ca8f..0b0ba8dcae 100644 +index cf85c244cd..af1079cae0 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp -@@ -1686,7 +1686,7 @@ bool scanImports(Options *options, QSet *usedDependencies) +@@ -1721,7 +1721,7 @@ bool scanImports(Options *options, QSet *usedDependencies) rootPath += QLatin1Char('/'); QStringList importPaths; @@ -20,7 +20,7 @@ index 76c521ca8f..0b0ba8dcae 100644 importPaths += rootPath; for (const QString &qmlImportPath : qAsConst(options->qmlImportPaths)) importPaths += shellQuote(qmlImportPath); -@@ -1817,7 +1817,7 @@ bool readDependencies(Options *options) +@@ -1852,7 +1852,7 @@ bool readDependencies(Options *options) return false; // Jam in the dependencies of the platform plugin, since the application will crash without it @@ -30,5 +30,5 @@ index 76c521ca8f..0b0ba8dcae 100644 while (!remainingDependencies.isEmpty()) { -- -2.20.1 +2.21.0 diff --git a/qt5/android-armv7a-eabi/PKGBUILD b/qt5/android-armv7a-eabi/PKGBUILD index 9c64f24c..e00855ff 100644 --- a/qt5/android-armv7a-eabi/PKGBUILD +++ b/qt5/android-armv7a-eabi/PKGBUILD @@ -20,7 +20,7 @@ export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT:-/opt/android-ndk} export ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT:-/opt/android-sdk} pkgname=android-$_pkg_arch-qt5 -pkgver=5.12.1 +pkgver=5.12.2 pkgrel=1 pkgdesc="Qt 5 for Android" arch=('x86_64') @@ -35,8 +35,9 @@ makedepends=('libgl' 'gperf' 'libxslt' 'fontconfig' + 'java-environment-openjdk<=8' "android-$_pkg_arch-openssl") -depends=('jre-openjdk-headless' +depends=('java-runtime-headless-openjdk<=8' 'apache-ant' 'android-ndk' "android-platform-$ANDROID_MINIMUM_PLATFORM" @@ -78,10 +79,10 @@ source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:4}/${pkg '0001-Fix-clang-libc-build-under-Android.patch' '0002-Fix-androiddeployqt-search-paths.patch' '0001-Disable-mapboxgl.patch') -sha256sums=('356f42d9087718f22f03d13d0c2cdfb308f91dc3cf0c6318bed33f2094cd9d6c' - '8a32e92dbaab5a371467903c89781a4e27f8c2403fe47b9a0ef0dca65c80be41' - 'cfb3de9c62ed6956bb1fe9f7d13384de236e87ff949aa6a4bb8257078729c9e0' - '2ef1ddd8f84474b2dbe06c5e1a2db80a96ebd8cf529f1e1ce465fb6d406e366f') +sha256sums=('59b8cb4e728450b21224dcaaa40eb25bafc5196b6988f2225c394c6b7f881ff5' + '0a7e5d8d2192b69af5b648db57de2feb2e70348c73e0e7d9570d8dc170437aad' + 'a958611bef4385b4e2d91ece10ab5cd48f621628c07612a18e36abae3cfbf440' + 'add336aab427a319203205355029229592713cebcda2e8bc4ce99efdb0322b76') _pref=/opt/android-libs/$_pkg_arch