From 0b07d6a179f22bf5aae8d104548457b5033d72fd Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 8 Sep 2019 01:42:15 +0200 Subject: [PATCH] Update mingw-w64 Qt 5 packages to 5.13.1 --- qt5-3d/mingw-w64/PKGBUILD | 7 +- ...indows.h-when-using-native-Linux-gcc.patch | 4 +- ...dumpcpp-and-MetaObjectGenerator-read.patch | 4 +- qt5-activeqt/mingw-w64/PKGBUILD | 11 +- ...rofile-for-cross-compilation-with-mi.patch | 4 +- ...is-defined-when-using-dynamic-OpenGL.patch | 4 +- ...tions-assemler-error-in-OpenGL-facto.patch | 4 +- ...re-.pc-files-are-installed-correctly.patch | 12 +- ...add-resource-files-to-LIBS-parameter.patch | 8 +- ...ug-library-names-in-pkg-config-files.patch | 8 +- ...linking-against-shared-static-libpng.patch | 4 +- ...008-Fix-linking-against-static-D-Bus.patch | 6 +- ...o-use-debug-version-of-D-Bus-library.patch | 6 +- ...Fix-linking-against-static-freetype2.patch | 4 +- ...-Fix-linking-against-static-harfbuzz.patch | 4 +- ...0012-Fix-linking-against-static-pcre.patch | 4 +- ...inking-against-shared-static-MariaDB.patch | 4 +- ...ing-against-shared-static-PostgreSQL.patch | 4 +- .../0015-Rename-qtmain-to-qt5main.patch | 8 +- .../0016-Enable-rpath-for-build-tools.patch | 4 +- ...0017-Use-system-zlib-for-build-tools.patch | 4 +- ...erge-shared-and-static-library-trees.patch | 35 ++--- ...9-Use-.dll.a-as-import-lib-extension.patch | 10 +- ...s-of-static-libraries-in-CMake-modul.patch | 125 +++++++++-------- ...w-usage-of-static-version-with-CMake.patch | 128 +++++++++--------- ...ags-for-static-build-with-cmake-ming.patch | 4 +- ...3-Use-correct-pkg-config-static-flag.patch | 8 +- ...4-Fix-macro-invoking-moc-rcc-and-uic.patch | 6 +- ...-errors-about-missing-feature-static.patch | 8 +- .../0026-Enable-and-fix-use-of-iconv.patch | 4 +- .../0027-Ignore-failing-pkg-config-test.patch | 8 +- ...from-messing-static-lib-dependencies.patch | 8 +- ...de-linker-flags-for-platform-plugins.patch | 4 +- ...ng-against-static-plugins-with-qmake.patch | 4 +- ...sable-hardware-randomizer-for-32-bit.patch | 6 +- ...ic-build-to-prefer-dynamic-libraries.patch | 6 +- ...nnot-find-feature-windows_vulkan_sdk.patch | 37 ++--- qt5-base/mingw-w64-angle/PKGBUILD | 86 +++++++----- qt5-base/mingw-w64-dynamic/PKGBUILD | 5 +- ...rofile-for-cross-compilation-with-mi.patch | 4 +- ...is-defined-when-using-dynamic-OpenGL.patch | 4 +- ...tions-assemler-error-in-OpenGL-facto.patch | 4 +- ...re-.pc-files-are-installed-correctly.patch | 12 +- ...add-resource-files-to-LIBS-parameter.patch | 8 +- ...ug-library-names-in-pkg-config-files.patch | 8 +- ...linking-against-shared-static-libpng.patch | 4 +- ...008-Fix-linking-against-static-D-Bus.patch | 6 +- ...o-use-debug-version-of-D-Bus-library.patch | 6 +- ...Fix-linking-against-static-freetype2.patch | 4 +- ...-Fix-linking-against-static-harfbuzz.patch | 4 +- ...0012-Fix-linking-against-static-pcre.patch | 4 +- ...inking-against-shared-static-MariaDB.patch | 4 +- ...ing-against-shared-static-PostgreSQL.patch | 4 +- .../0015-Rename-qtmain-to-qt5main.patch | 8 +- .../0016-Enable-rpath-for-build-tools.patch | 4 +- ...0017-Use-system-zlib-for-build-tools.patch | 4 +- ...erge-shared-and-static-library-trees.patch | 35 ++--- ...9-Use-.dll.a-as-import-lib-extension.patch | 10 +- ...s-of-static-libraries-in-CMake-modul.patch | 125 +++++++++-------- ...w-usage-of-static-version-with-CMake.patch | 128 +++++++++--------- ...ags-for-static-build-with-cmake-ming.patch | 4 +- ...3-Use-correct-pkg-config-static-flag.patch | 8 +- ...4-Fix-macro-invoking-moc-rcc-and-uic.patch | 6 +- ...-errors-about-missing-feature-static.patch | 8 +- .../0026-Enable-and-fix-use-of-iconv.patch | 4 +- .../0027-Ignore-failing-pkg-config-test.patch | 8 +- ...from-messing-static-lib-dependencies.patch | 8 +- ...de-linker-flags-for-platform-plugins.patch | 4 +- ...ng-against-static-plugins-with-qmake.patch | 4 +- ...sable-hardware-randomizer-for-32-bit.patch | 6 +- ...ic-build-to-prefer-dynamic-libraries.patch | 6 +- ...nnot-find-feature-windows_vulkan_sdk.patch | 37 ++--- qt5-base/mingw-w64-opengl/PKGBUILD | 86 +++++++----- ...rofile-for-cross-compilation-with-mi.patch | 4 +- ...is-defined-when-using-dynamic-OpenGL.patch | 4 +- ...tions-assemler-error-in-OpenGL-facto.patch | 4 +- ...re-.pc-files-are-installed-correctly.patch | 12 +- ...add-resource-files-to-LIBS-parameter.patch | 8 +- ...ug-library-names-in-pkg-config-files.patch | 8 +- ...linking-against-shared-static-libpng.patch | 4 +- ...008-Fix-linking-against-static-D-Bus.patch | 6 +- ...o-use-debug-version-of-D-Bus-library.patch | 6 +- ...Fix-linking-against-static-freetype2.patch | 4 +- ...-Fix-linking-against-static-harfbuzz.patch | 4 +- ...0012-Fix-linking-against-static-pcre.patch | 4 +- ...inking-against-shared-static-MariaDB.patch | 4 +- ...ing-against-shared-static-PostgreSQL.patch | 4 +- .../0015-Rename-qtmain-to-qt5main.patch | 8 +- .../0016-Enable-rpath-for-build-tools.patch | 4 +- ...0017-Use-system-zlib-for-build-tools.patch | 4 +- ...erge-shared-and-static-library-trees.patch | 35 ++--- ...9-Use-.dll.a-as-import-lib-extension.patch | 10 +- ...s-of-static-libraries-in-CMake-modul.patch | 125 +++++++++-------- ...w-usage-of-static-version-with-CMake.patch | 128 +++++++++--------- ...ags-for-static-build-with-cmake-ming.patch | 4 +- ...3-Use-correct-pkg-config-static-flag.patch | 8 +- ...4-Fix-macro-invoking-moc-rcc-and-uic.patch | 6 +- ...-errors-about-missing-feature-static.patch | 8 +- .../0026-Enable-and-fix-use-of-iconv.patch | 4 +- .../0027-Ignore-failing-pkg-config-test.patch | 8 +- ...from-messing-static-lib-dependencies.patch | 8 +- ...de-linker-flags-for-platform-plugins.patch | 4 +- ...ng-against-static-plugins-with-qmake.patch | 4 +- ...sable-hardware-randomizer-for-32-bit.patch | 6 +- ...ic-build-to-prefer-dynamic-libraries.patch | 6 +- ...nnot-find-feature-windows_vulkan_sdk.patch | 37 ++--- qt5-base/mingw-w64-static/PKGBUILD | 86 +++++++----- ...rofile-for-cross-compilation-with-mi.patch | 4 +- ...is-defined-when-using-dynamic-OpenGL.patch | 4 +- ...tions-assemler-error-in-OpenGL-facto.patch | 4 +- ...re-.pc-files-are-installed-correctly.patch | 12 +- ...add-resource-files-to-LIBS-parameter.patch | 8 +- ...ug-library-names-in-pkg-config-files.patch | 8 +- ...linking-against-shared-static-libpng.patch | 4 +- ...008-Fix-linking-against-static-D-Bus.patch | 6 +- ...o-use-debug-version-of-D-Bus-library.patch | 6 +- ...Fix-linking-against-static-freetype2.patch | 4 +- ...-Fix-linking-against-static-harfbuzz.patch | 4 +- ...0012-Fix-linking-against-static-pcre.patch | 4 +- ...inking-against-shared-static-MariaDB.patch | 4 +- ...ing-against-shared-static-PostgreSQL.patch | 4 +- .../0015-Rename-qtmain-to-qt5main.patch | 8 +- .../0016-Enable-rpath-for-build-tools.patch | 4 +- ...0017-Use-system-zlib-for-build-tools.patch | 4 +- ...erge-shared-and-static-library-trees.patch | 35 ++--- ...9-Use-.dll.a-as-import-lib-extension.patch | 10 +- ...s-of-static-libraries-in-CMake-modul.patch | 125 +++++++++-------- ...w-usage-of-static-version-with-CMake.patch | 128 +++++++++--------- ...ags-for-static-build-with-cmake-ming.patch | 4 +- ...3-Use-correct-pkg-config-static-flag.patch | 8 +- ...4-Fix-macro-invoking-moc-rcc-and-uic.patch | 6 +- ...-errors-about-missing-feature-static.patch | 8 +- .../0026-Enable-and-fix-use-of-iconv.patch | 4 +- .../0027-Ignore-failing-pkg-config-test.patch | 8 +- ...from-messing-static-lib-dependencies.patch | 8 +- ...de-linker-flags-for-platform-plugins.patch | 4 +- ...ng-against-static-plugins-with-qmake.patch | 4 +- ...sable-hardware-randomizer-for-32-bit.patch | 6 +- ...ic-build-to-prefer-dynamic-libraries.patch | 6 +- ...nnot-find-feature-windows_vulkan_sdk.patch | 37 ++--- qt5-base/mingw-w64/PKGBUILD | 86 +++++++----- qt5-canvas3d/mingw-w64/PKGBUILD | 3 + qt5-charts/mingw-w64/PKGBUILD | 7 +- qt5-connectivity/mingw-w64/PKGBUILD | 7 +- qt5-datavis3d/mingw-w64/PKGBUILD | 7 +- ...2-Ensure-static-plugins-are-exported.patch | 22 --- ...g-QML-parser-symbols-on-static-build.patch | 37 ----- qt5-declarative/apple-darwin/PKGBUILD | 2 +- ...1-Ensure-static-plugins-are-exported.patch | 4 +- ...g-QML-parser-symbols-on-static-build.patch | 4 +- qt5-declarative/mingw-w64/PKGBUILD | 11 +- qt5-gamepad/mingw-w64/PKGBUILD | 7 +- qt5-graphicaleffects/mingw-w64/PKGBUILD | 7 +- qt5-imageformats/apple-darwin/PKGBUILD | 2 +- qt5-imageformats/mingw-w64/PKGBUILD | 7 +- ...c-3rdparty-libs-are-linked-correctly.patch | 4 +- qt5-location/mingw-w64/PKGBUILD | 9 +- ...s-to-prevent-conflict-with-vsnprintf.patch | 6 +- .../mingw-w64/0002-Fix-build-with-ANGLE.patch | 6 +- ...irectshow-plugin-against-libamstrmid.patch | 6 +- qt5-multimedia/mingw-w64/PKGBUILD | 13 +- qt5-networkauth/mingw-w64/PKGBUILD | 7 +- qt5-quickcontrols/mingw-w64/PKGBUILD | 7 +- qt5-quickcontrols2/mingw-w64/PKGBUILD | 7 +- qt5-remoteobjects/mingw-w64/PKGBUILD | 7 +- qt5-script/mingw-w64/PKGBUILD | 7 +- qt5-scxml/mingw-w64/PKGBUILD | 7 +- qt5-sensors/mingw-w64/PKGBUILD | 7 +- qt5-serialport/mingw-w64/PKGBUILD | 7 +- qt5-speech/mingw-w64/PKGBUILD | 7 +- qt5-svg/apple-darwin/PKGBUILD | 2 +- qt5-svg/mingw-w64/PKGBUILD | 7 +- .../0001-Fix-linguist-macro.patch | 16 +-- qt5-tools/apple-darwin/PKGBUILD | 4 +- .../mingw-w64/0001-Fix-linguist-macro.patch | 6 +- qt5-tools/mingw-w64/PKGBUILD | 9 +- qt5-translations/apple-darwin/PKGBUILD | 2 +- qt5-translations/mingw-w64/PKGBUILD | 4 +- qt5-virtualkeyboard/mingw-w64/PKGBUILD | 7 +- qt5-webchannel/mingw-w64/PKGBUILD | 7 +- qt5-webengine/mingw-w64-git/PKGBUILD | 5 +- qt5-webengine/mingw-w64/PKGBUILD | 5 +- ...ode-linker-flags-for-platform-plugin.patch | 4 +- qt5-webglplugin/mingw-w64/PKGBUILD | 9 +- qt5-webkit/mingw-w64/PKGBUILD | 3 + qt5-websockets/mingw-w64/PKGBUILD | 7 +- qt5-webview/mingw-w64-git/PKGBUILD | 3 + ...link-to-functions-available-from-Win.patch | 4 +- qt5-winextras/mingw-w64/PKGBUILD | 9 +- qt5-xmlpatterns/mingw-w64/PKGBUILD | 7 +- 190 files changed, 1442 insertions(+), 1259 deletions(-) delete mode 100644 qt5-declarative/apple-darwin/0002-Ensure-static-plugins-are-exported.patch delete mode 100644 qt5-declarative/apple-darwin/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch diff --git a/qt5-3d/mingw-w64/PKGBUILD b/qt5-3d/mingw-w64/PKGBUILD index faedf401..206bdf6b 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.13.0 +pkgver=5.13.1 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=('9f6b317acbcf483bf78465956669957eb19fdd8df610e9a580d42017e629ec4f') +sha256sums=('092dc9a691eb784b30b1a48799c23578f0f17d892b1cbd25f18130c67f51a452') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -89,6 +89,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ 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 178731bc..58660e16 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 7d95a5d73ed3b5f1165629f8d762e934b22851da Mon Sep 17 00:00:00 2001 +From 4607785ee76a460088292dc985a10b340a45e0df 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.22.0 +2.23.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 62f37b5c..3ea7a295 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 c21f38e09b62405086eb4099f8706a7d5debc0af Mon Sep 17 00:00:00 2001 +From 4ad7c39e29eb89539abafd7de47176530181b9be 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 eb6f70a..d9d1bdf 100644 } -- -2.22.0 +2.23.0 diff --git a/qt5-activeqt/mingw-w64/PKGBUILD b/qt5-activeqt/mingw-w64/PKGBUILD index 8e47dc84..b4f83940 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.13.0 +pkgver=5.13.1 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=('7abccc4dfc8891dc96594ace38cfe006ff7fd0eaffcb49c856f4e60119357323' - 'c08c642b497d551f67563342c9177006c80cb61530403ff809199f6f75e96053' - 'bcf5e261b5f65680d2d6cdff5b0f64d1d36852317852783572b1ce43e04e9cdd') +sha256sums=('d2ad456c4b354fa08dc6b42894453ba18db52b09ba7b7921c3f6225772099495' + 'a83a9eb308c0903de7f0f2af95c38884f89cad1e2406fac5bc19e7d83d9da651' + 'cd72e8b9680647d1ac7f5fe80b7b946c91800e528020bc5e8f5874ee9cf239a4') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -87,6 +87,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ 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 a6cee113..6b13408f 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 07a334d39698cc7d2826ed1b5b6cb9b67dd4def8 Mon Sep 17 00:00:00 2001 +From a378fa39cd0e8100c8c3ee0a5906868663158bbf Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with @@ -161,5 +161,5 @@ index 5de482f23b..3c3d22c699 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.22.0 +2.23.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 fe6205f1..353bce3a 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 2a4db9590232cb56102955d86e21e3c2482b28cf Mon Sep 17 00:00:00 2001 +From 1e4ae2deeb92c2bff530bf77e02d9409d47b95cb Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL @@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64-angle/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 5109261f..d10014a9 100644 --- a/qt5-base/mingw-w64-angle/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64-angle/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From abcf04e70f4f3e8a0a7a584afcf976e209307265 Mon Sep 17 00:00:00 2001 +From dc9fb928edeae31a253b27dc6536117b1ec3ed0d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 03/33] 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.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0004-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64-angle/0004-Make-sure-.pc-files-are-installed-correctly.patch index 7a73127b..fdb82a4e 100644 --- a/qt5-base/mingw-w64-angle/0004-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64-angle/0004-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 3887b9693805365272de6101eab5c332862960e3 Mon Sep 17 00:00:00 2001 +From 7d3c1a5d57a996c8eaef937486df04ad0c2559cd Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 04/33] Make sure *.pc files are installed correctly @@ -10,10 +10,10 @@ Subject: [PATCH 04/33] Make sure *.pc files are installed correctly 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index b634ec622b..aac53cd0ea 100644 +index a45b676d5f..6065ca4c77 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3240,7 +3240,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index b634ec622b..aac53cd0ea 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3255,7 +3255,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3265,7 +3265,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) if(fixify) { if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR").toQString()); @@ -49,7 +49,7 @@ index 350ebd377a..d0c234b864 100644 void writePkgConfigFile(); // for pkg-config diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 16f9361d13..d9887cd36d 100644 +index 266bae7e64..8222854cfc 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -753,7 +753,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) @@ -62,5 +62,5 @@ index 16f9361d13..d9887cd36d 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0005-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64-angle/0005-Don-t-add-resource-files-to-LIBS-parameter.patch index 37bf7b35..8442eeac 100644 --- a/qt5-base/mingw-w64-angle/0005-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64-angle/0005-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From 2ebc0b00f1b3297e1f88d271123df7ecb0fbd955 Mon Sep 17 00:00:00 2001 +From cd4400120aa04adcc40f36f29ae395589a511409 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 05/33] Don't add resource files to LIBS parameter @@ -11,10 +11,10 @@ like .obj/debug/Qt5Cored_resource_res.o 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp -index de7363e51b..b2b9d01799 100644 +index 2175841264..c565d44e67 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp -@@ -209,7 +209,7 @@ void MingwMakefileGenerator::init() +@@ -192,7 +192,7 @@ void MingwMakefileGenerator::init() processVars(); @@ -24,5 +24,5 @@ index de7363e51b..b2b9d01799 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0006-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64-angle/0006-Prevent-debug-library-names-in-pkg-config-files.patch index 9ff893ab..d76b7978 100644 --- a/qt5-base/mingw-w64-angle/0006-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64-angle/0006-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 00be29ae27f1954f8d9c7ca2f47c1d18f38e96b8 Mon Sep 17 00:00:00 2001 +From 46d434d6d978b96beae9493ea638d96065ee968f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 06/33] 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 aac53cd0ea..fedbaaf601 100644 +index 6065ca4c77..8a47d584c3 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3254,6 +3254,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (dot != -1) ret = ret.left(dot); } @@ -29,5 +29,5 @@ index aac53cd0ea..fedbaaf601 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0007-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64-angle/0007-Fix-linking-against-shared-static-libpng.patch index f6892d8c..1591064b 100644 --- a/qt5-base/mingw-w64-angle/0007-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64-angle/0007-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From 6b429798b0e3eddc7e5c857cc3e5b9d7f70aa998 Mon Sep 17 00:00:00 2001 +From 41f5e197d8624e713d48a5a800de3211ba7df7e5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 07/33] Fix linking against shared/static libpng @@ -26,5 +26,5 @@ index 6280b4dfa2..36325920cd 100644 ], "use": [ -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0008-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64-angle/0008-Fix-linking-against-static-D-Bus.patch index d0e9ce41..a4725b1d 100644 --- a/qt5-base/mingw-w64-angle/0008-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64-angle/0008-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From f7f14b714ac258239ba7d56aad81352ae013c299 Mon Sep 17 00:00:00 2001 +From f6e638c4058335603797e7cd451fc71e89866b7e Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 08/33] Fix linking against static D-Bus @@ -9,7 +9,7 @@ Subject: [PATCH 08/33] Fix linking against static D-Bus 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.json b/configure.json -index 7f3018ed23..9d8e93a227 100644 +index af55bb6fd2..370c27af5b 100644 --- a/configure.json +++ b/configure.json @@ -187,18 +187,23 @@ @@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644 # include #else -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64-angle/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index 36711fdf..a0dbe248 100644 --- a/qt5-base/mingw-w64-angle/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/qt5-base/mingw-w64-angle/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 663130ef2c1188a101b3ff1b88ccfe07712f628b Mon Sep 17 00:00:00 2001 +From b1d7eb0ed7121c1ec287b68c183e185836069057 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 09/33] Don't try to use debug version of D-Bus library @@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.json b/configure.json -index 9d8e93a227..80e15ce156 100644 +index 370c27af5b..36545a593b 100644 --- a/configure.json +++ b/configure.json @@ -200,7 +200,7 @@ @@ -25,5 +25,5 @@ index 9d8e93a227..80e15ce156 100644 }, "condition": "config.win32 && features.shared" -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0010-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64-angle/0010-Fix-linking-against-static-freetype2.patch index 027fec2a..a0b99788 100644 --- a/qt5-base/mingw-w64-angle/0010-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64-angle/0010-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From c75a87b8378987e9a63235984021377755418ba1 Mon Sep 17 00:00:00 2001 +From 4bc1016e6268e57a5b8c9c3ae067166e41d10420 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 10/33] Fix linking against static freetype2 @@ -26,5 +26,5 @@ index 36325920cd..972f9914ea 100644 { "libs": "-lfreetype" } ], -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-harfbuzz.patch index f07979b5..950e2992 100644 --- a/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From 4f637a1ae1182f9327cc5fd198961e906cff59eb Mon Sep 17 00:00:00 2001 +From 41de800407436106116940c9da87841f01322b14 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 11/33] Fix linking against static harfbuzz @@ -25,5 +25,5 @@ index 972f9914ea..894c10259d 100644 }, "imf": { -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-pcre.patch index 36514aa4..33b6bb9f 100644 --- a/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From 3fccf1f581659113ae325f5192c8d6870c894c84 Mon Sep 17 00:00:00 2001 +From a17a279ab36a4f71bbe63ada089d85fc6789a7b5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 12/33] Fix linking against static pcre @@ -24,5 +24,5 @@ index bdaa2d3243..90f8250c03 100644 #include -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0013-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64-angle/0013-Fix-linking-against-shared-static-MariaDB.patch index b243cd9a..e627daeb 100644 --- a/qt5-base/mingw-w64-angle/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64-angle/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From 7ea90aaf596477d79194673de9fb4b8076883186 Mon Sep 17 00:00:00 2001 +From 5bb7b2f2d9c9cc02dc064c8b64b6a10a15ab0d22 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 13/33] 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.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-PostgreSQL.patch index 41d712cb..7304961e 100644 --- a/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From e9076f7d190ce29321102ce695dbd105cccf14f7 Mon Sep 17 00:00:00 2001 +From 638327519b9b04f3c105280f49f29e509c06a9ce Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 14/33] Fix linking against shared/static PostgreSQL @@ -24,5 +24,5 @@ index babd0465ce..b4b3bdec6b 100644 ] }, -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0015-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-angle/0015-Rename-qtmain-to-qt5main.patch index 1c14b162..fad58795 100644 --- a/qt5-base/mingw-w64-angle/0015-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64-angle/0015-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 5eb2e0e33778a15ff05a2891e6752af573bca2e5 Mon Sep 17 00:00:00 2001 +From a612704b7c2144f2074f7b98ceaed47aa8470dce Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 15/33] Rename qtmain to qt5main @@ -25,10 +25,10 @@ index 5208d22bd6..1a058b787f 100644 QMAKE_IDL = $${CROSS_COMPILE}widl QMAKE_LIB = $${CROSS_COMPILE}ar -rc diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 2ab7775fea..6bc621ce27 100644 +index 376a7ded5d..4fe2ef2326 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -234,8 +234,8 @@ mac { +@@ -270,8 +270,8 @@ mac { CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll mingw { @@ -68,5 +68,5 @@ index 9cb6ab0c59..4327ba365e 100644 CONFIG += static -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0016-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64-angle/0016-Enable-rpath-for-build-tools.patch index 59595f2c..830542ac 100644 --- a/qt5-base/mingw-w64-angle/0016-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64-angle/0016-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From a2a8aa60a4385fff2770e93e0a6054935905bef7 Mon Sep 17 00:00:00 2001 +From 2ed621b725a48cf41a4fd39cbb0723de1724b519 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 16/33] Enable rpath for build tools @@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644 INSTALLS += target -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0017-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64-angle/0017-Use-system-zlib-for-build-tools.patch index c9a01d9c..6a8df34f 100644 --- a/qt5-base/mingw-w64-angle/0017-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64-angle/0017-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 04a04e8c11bf4ae71d4ed0d6b641b2b2ebacc565 Mon Sep 17 00:00:00 2001 +From 0e4aad7814d0b407d92b34e8fcc9fba70d9bd765 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 17/33] Use system zlib for build tools @@ -23,5 +23,5 @@ index 83e44ff9a4..4734623936 100644 } else { CONFIG += no_core_dep -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0018-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64-angle/0018-Merge-shared-and-static-library-trees.patch index 45ea3d0d..27015bd4 100644 --- a/qt5-base/mingw-w64-angle/0018-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64-angle/0018-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 8d8cfe560697425a01b786aee113082495d6c85f Mon Sep 17 00:00:00 2001 +From 24a7b52b579fb5f0787d9738668841392c8bd649 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 18/33] Merge shared and static library trees @@ -10,15 +10,15 @@ Allow installation of shared and static build in the same prefix mkspecs/features/device_config.prf | 9 ++++++++- mkspecs/features/qt.prf | 17 +++++++++++++++++ mkspecs/features/spec_pre.prf | 11 ++++++++--- - qmake/generators/makefile.cpp | 9 ++++++--- + qmake/generators/makefile.cpp | 11 +++++++---- qtbase.pro | 10 ++++++++-- - 7 files changed, 73 insertions(+), 10 deletions(-) + 7 files changed, 74 insertions(+), 11 deletions(-) diff --git a/configure.pri b/configure.pri -index 81133da3d7..927fcbe132 100644 +index 7b8dee0953..5477c264eb 100644 --- a/configure.pri +++ b/configure.pri -@@ -657,7 +657,12 @@ defineTest(qtConfOutput_machineTuple) { +@@ -676,7 +676,12 @@ defineTest(qtConfOutput_machineTuple) { defineTest(qtConfOutput_commitOptions) { # qdevice.pri needs to be written early, because the compile tests require it. @@ -32,7 +32,7 @@ index 81133da3d7..927fcbe132 100644 } # type (empty or 'host'), option name, default value -@@ -1350,3 +1355,12 @@ defineTest(createConfigStatus) { +@@ -1369,3 +1374,12 @@ defineTest(createConfigStatus) { QMAKE_POST_CONFIGURE += \ "createConfigStatus()" @@ -46,7 +46,7 @@ index 81133da3d7..927fcbe132 100644 + CONFIG += no_smart_library_merge +} diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf -index 9df99b8648..9c1dd6a735 100644 +index 0e41b825ec..4c4b6dd12a 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -1,5 +1,16 @@ @@ -137,10 +137,10 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index fedbaaf601..fd3b5c405a 100644 +index 8a47d584c3..b158bb9b52 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3247,6 +3247,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3257,6 +3257,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -150,19 +150,22 @@ index fedbaaf601..fd3b5c405a 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3421,9 +3424,9 @@ MakefileGenerator::writePkgConfigFile() +@@ -3433,11 +3436,11 @@ MakefileGenerator::writePkgConfigFile() t << endl; // requires -- const QString requires = project->values("QMAKE_PKGCONFIG_REQUIRES").join(' '); -- if (!requires.isEmpty()) { -- t << "Requires: " << requires << endl; +- const QString requiresString = project->values("QMAKE_PKGCONFIG_REQUIRES").join(' '); +- if (!requiresString.isEmpty()) { +- t << "Requires: " << requiresString << endl; + t << "Requires:"; -+ for (const auto &required : project->values("QMAKE_PKGCONFIG_REQUIRES")) { ++ const auto pkgconfigRequires = project->values("QMAKE_PKGCONFIG_REQUIRES"); ++ for (const auto &required : pkgconfigRequires) { + t << (project->isActiveConfig("staticlib") ? QStringLiteral(" Static") : QStringLiteral(" ")) << required.toQString(); } - +- t << endl; + } + diff --git a/qtbase.pro b/qtbase.pro index c0ce0972ef..5a2deaf31d 100644 --- a/qtbase.pro @@ -199,5 +202,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0019-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64-angle/0019-Use-.dll.a-as-import-lib-extension.patch index b560fb61..013911c8 100644 --- a/qt5-base/mingw-w64-angle/0019-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64-angle/0019-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From 0f3da1317f28a882c705fcf3f13c419601b96467 Mon Sep 17 00:00:00 2001 +From ad61d1712db4cdd3389e808d46fbfcb26a2509e3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 19/33] Use *.dll.a as import lib extension @@ -12,10 +12,10 @@ g++-win32.conf 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 6bc621ce27..226dc93c4d 100644 +index 4fe2ef2326..7cb27b716a 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -245,8 +245,9 @@ mac { +@@ -281,8 +281,9 @@ mac { CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl } else { @@ -57,7 +57,7 @@ index bbada46c29..d6299d8eed 100644 } } diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index d9887cd36d..4f1a4344df 100644 +index 8222854cfc..17592c2492 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -80,9 +80,13 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg) @@ -92,5 +92,5 @@ index d9887cd36d..4f1a4344df 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64-angle/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index 10946b0f..2255c51f 100644 --- a/qt5-base/mingw-w64-angle/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/qt5-base/mingw-w64-angle/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From 720bde854fa9d143d0ad8db4794a0dd0efb173a2 Mon Sep 17 00:00:00 2001 +From 890e47124906afd97de44bc40520338bde5dc5d3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 20/33] Pull dependencies of static libraries in CMake modules @@ -21,12 +21,12 @@ e.g. to use QMAKE_PRL_LIBS instead of QMAKE_PRL_LIBS_FOR_CMAKE. See https://github.com/Martchus/PKGBUILDs/issues/86#issuecomment-476840055 for further details on 2. --- - .../data/cmake/Qt5BasicConfig.cmake.in | 172 ++++++++++++++---- + .../data/cmake/Qt5BasicConfig.cmake.in | 192 ++++++++++++------ .../data/cmake/Qt5PluginTarget.cmake.in | 11 +- - 2 files changed, 139 insertions(+), 44 deletions(-) + 2 files changed, 136 insertions(+), 67 deletions(-) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 705e0a3c93..c0097cac74 100644 +index d4fd057682..838279515c 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -53,10 +53,18 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura @@ -40,24 +40,24 @@ index 705e0a3c93..c0097cac74 100644 get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" ABSOLUTE) if(EXISTS \"${prl_file_location}\") - file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS[ \\t]*=\") + file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE[ \\t]*=\") + if(NOT _prl_strings) -+ message(WARNING \"Prl file for Qt 5 module $${CMAKE_MODULE_NAME} does not contain QMAKE_PRL_LIBS. Was looking at \\\"${prl_file_location}\\\".\") ++ message(WARNING \"Prl file for Qt 5 module $${CMAKE_MODULE_NAME} does not contain QMAKE_PRL_LIBS_FOR_CMAKE. Was looking at \\\"${prl_file_location}\\\".\") + return() + endif() - string(REGEX REPLACE \"QMAKE_PRL_LIBS[ \\t]*=[ \\t]*([^\\n]*)\" \"\\\\1\" _static_depends ${_prl_strings}) - string(REGEX REPLACE \"[ \\t]+\" \";\" _static_depends ${_static_depends}) - string(REGEX REPLACE \"[ \\t]+\" \";\" _standard_libraries \"${CMAKE_CXX_STANDARD_LIBRARIES}\") -@@ -68,7 +76,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura + + # file(STRINGS) replaces all semicolons read from the file with backslash semicolons. + # We need to do a reverse transformation in CMake. For that we replace all backslash +@@ -75,7 +83,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura # Handle normal libraries passed as -lfoo set(_lib \"${CMAKE_MATCH_1}\") foreach(_standard_library ${_standard_libraries}) -- if(_standard_library MATCHES \"^${_lib}(\\.lib)?$\") +- if(_standard_library MATCHES \"^${_lib}(\\\\.lib)?$\") + if(_standard_library MATCHES \"^${_lib}(\\\\.lib|\\\\.a)?$\") set(_lib_is_default_linked TRUE) break() endif() -@@ -109,11 +117,42 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura +@@ -116,6 +124,37 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura set(${lib_deps} ${_lib_deps} PARENT_SCOPE) set(${link_flags} \"SHELL:${_link_flags}\" PARENT_SCOPE) endfunction() @@ -95,71 +95,78 @@ index 705e0a3c93..c0097cac74 100644 !!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}) -+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}) - - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -@@ -121,44 +160,62 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI +@@ -129,52 +168,39 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") !!ENDIF _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) + set(_deps ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} +- ) +- set(_static_deps !!IF !isEmpty(CMAKE_STATIC_TYPE) -- ${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LIB_DEPENDENCIES} -+ ${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES} + ${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LIB_DEPENDENCIES} !!ENDIF ) + ++ # FIXME: handle IsDebugAndRelease like in official version + +!!IF !isEmpty(CMAKE_STATIC_TYPE) set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -- \"INTERFACE_LINK_LIBRARIES\" \"${_deps}\" -- \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -+ \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} !!IF !isEmpty(CMAKE_LIB_SONAME) -- \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\" -+ \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" + \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\" !!ENDIF - # For backward compatibility with CMake < 2.8.12 -- \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_deps}\" +- \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_deps};${_static_deps}\" +- ) +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES +- \"${_deps}\" ) --!!IF !isEmpty(CMAKE_STATIC_TYPE) - -+ _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_deps}\") - if(NOT CMAKE_VERSION VERSION_LESS \"3.13\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES - \"INTERFACE_LINK_OPTIONS\" \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\" +-!!IF !isEmpty(CMAKE_STATIC_TYPE) +- if(NOT "${IsDebugAndRelease}") +- set(_genex_condition \"1\") +- else() +- if("${Configuration}" STREQUAL "DEBUG") +- set(_genex_condition \"$\") +- else() +- set(_genex_condition \"$>\") +- endif() +- endif() +- +- if(_static_deps) +- set(_static_deps_genex \"$<${_genex_condition}:${_static_deps}>\") +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES +- \"${_static_deps_genex}\" +- ) +- endif() +- +- set(_static_link_flags \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\") +- if(NOT CMAKE_VERSION VERSION_LESS \"3.13\" AND _static_link_flags) +- set(_static_link_flags_genex \"$<${_genex_condition}:${_static_link_flags}>\") +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_OPTIONS +- \"${_static_link_flags_genex}\" ++ _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${Configuration}\" \"${_deps}\") ++ if(NOT CMAKE_VERSION VERSION_LESS \"3.13\") ++ set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES ++ \"INTERFACE_LINK_OPTIONS\" \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\" ) endif() +!!ELSE + set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -+ \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_deps}\" -+ \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} ++ \"INTERFACE_LINK_LIBRARIES_${Configuration}\" \"${_deps}\" ++ \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} +!!IF !isEmpty(CMAKE_LIB_SONAME) -+ \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" ++ \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\" +!!ENDIF + # For backward compatibility with CMake < 2.8.12 -+ \"IMPORTED_LINK_INTERFACE_LIBRARIES_${TARGET_CONFIG}\" \"${_deps}\" ++ \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_deps}\" + ) !!ENDIF !!IF !isEmpty(CMAKE_WINDOWS_BUILD) - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ELSE -- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+ set(imported_implib \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) - if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} -+ \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib} - ) +@@ -191,6 +217,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI endif() !!ENDIF endmacro() @@ -175,7 +182,7 @@ index 705e0a3c93..c0097cac74 100644 !!ENDIF if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) -@@ -328,13 +385,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -360,13 +395,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") @@ -193,7 +200,7 @@ index 705e0a3c93..c0097cac74 100644 !!IF !equals(TEMPLATE, aux) !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1) -@@ -349,6 +408,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -381,6 +418,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, ";")) @@ -250,7 +257,7 @@ index 705e0a3c93..c0097cac74 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}) -@@ -367,9 +476,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -399,9 +486,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private) endif() endforeach() @@ -264,13 +271,13 @@ index 705e0a3c93..c0097cac74 100644 endif() !!IF !equals(TEMPLATE, aux) -@@ -439,9 +552,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -471,9 +562,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties(Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) endif() +!!ENDIF // CMAKE_STATIC_TYPE + @@ -278,10 +285,12 @@ index 705e0a3c93..c0097cac74 100644 !!ENDIF // CMAKE_RELEASE_TYPE !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD -@@ -452,29 +567,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -484,33 +577,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) !!ENDIF // TEMPLATE != aux +-!!IF isEmpty(CMAKE_INTERNAL_MODULE) +- - file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\") - - macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) @@ -304,6 +313,8 @@ index 705e0a3c93..c0097cac74 100644 - endforeach() - endif() - +-!!ENDIF // isEmpty(CMAKE_INTERNAL_MODULE) +- - !!IF !isEmpty(CMAKE_MODULE_EXTRAS) include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\") @@ -332,5 +343,5 @@ index 5baf0fdb10..ec5f3cc437 100644 + +endif() -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0021-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-angle/0021-Allow-usage-of-static-version-with-CMake.patch index 8a8dde9e..f2a8f3b6 100644 --- a/qt5-base/mingw-w64-angle/0021-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64-angle/0021-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From 7c539241c220ce50da61ef811daae18489b5df19 Mon Sep 17 00:00:00 2001 +From 6bdfbfedf65c6883b74ac47a4385148bbafb4438 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 21/33] Allow usage of static version with CMake @@ -12,20 +12,20 @@ installed in the same prefix via regular find_package(Qt5Core) --- mkspecs/features/create_cmake.prf | 103 +++--- - .../data/cmake/Qt5BasicConfig.cmake.in | 296 ++++++++++++------ + .../data/cmake/Qt5BasicConfig.cmake.in | 297 ++++++++++++------ .../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, 309 insertions(+), 153 deletions(-) + 7 files changed, 310 insertions(+), 153 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 -index 226dc93c4d..0e9afa4eaf 100644 +index 7cb27b716a..7d8ac191db 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -51,7 +51,7 @@ split_incpath { +@@ -65,7 +65,7 @@ split_incpath { $$QT_MODULE_INCLUDE_BASE/$${CMAKE_INCLUDE_NAME}/$$eval(QT.$${MODULE}.VERSION)/$${CMAKE_INCLUDE_NAME}) cmake_extra_source_includes.input = $$PWD/data/cmake/ExtraSourceIncludes.cmake.in @@ -34,16 +34,16 @@ index 226dc93c4d..0e9afa4eaf 100644 !build_pass:QMAKE_SUBSTITUTES += \ cmake_extra_source_includes -@@ -101,6 +101,8 @@ win32:!static:!staticlib { +@@ -115,6 +115,8 @@ win32:!static:!staticlib { } static|staticlib:CMAKE_STATIC_TYPE = true +static|staticlib:DEFAULT_QT_VARIANT_PREFIX = "Static" +else:DEFAULT_QT_VARIANT_PREFIX = "" - CMAKE_DEBUG_TYPE = - CMAKE_RELEASE_TYPE = -@@ -146,17 +148,19 @@ contains(CONFIG, plugin) { + internal_module { + CMAKE_INTERNAL_MODULE = true +@@ -182,17 +184,19 @@ contains(CONFIG, plugin) { CMAKE_PLUGIN_NAME = $$PLUGIN_CLASS_NAME win32 { @@ -67,7 +67,7 @@ index 226dc93c4d..0e9afa4eaf 100644 mac { isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib else: CMAKE_PlUGIN_EXT = .a -@@ -172,13 +176,13 @@ contains(CONFIG, plugin) { +@@ -208,13 +212,13 @@ contains(CONFIG, plugin) { } } cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in @@ -83,7 +83,7 @@ index 226dc93c4d..0e9afa4eaf 100644 INSTALLS += cmake_qt5_plugin_file return() -@@ -191,25 +195,34 @@ mod_deps = +@@ -227,25 +231,34 @@ mod_deps = lib_deps = aux_mod_deps = aux_lib_deps = @@ -122,7 +122,7 @@ index 226dc93c4d..0e9afa4eaf 100644 !isEmpty(CMAKE_STATIC_TYPE) { CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a -@@ -237,35 +250,33 @@ mac { +@@ -273,35 +286,33 @@ mac { CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a @@ -177,7 +177,7 @@ index 226dc93c4d..0e9afa4eaf 100644 !isEmpty(CMAKE_STATIC_TYPE) { CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a -@@ -285,12 +296,12 @@ mac { +@@ -321,12 +332,12 @@ mac { INSTALLS += cmake_qt5_module_files cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in @@ -192,7 +192,7 @@ index 226dc93c4d..0e9afa4eaf 100644 !build_pass:QMAKE_SUBSTITUTES += \ cmake_config_file \ -@@ -300,11 +311,29 @@ cmake_qt5_module_files.files = \ +@@ -336,11 +347,29 @@ cmake_qt5_module_files.files = \ $$cmake_config_file.output \ $$cmake_config_version_file.output @@ -223,7 +223,7 @@ index 226dc93c4d..0e9afa4eaf 100644 !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file -@@ -316,7 +345,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake +@@ -352,7 +381,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake exists($$cmake_macros_file.input) { CMAKE_MODULE_MACROS = "true" @@ -232,7 +232,7 @@ index 226dc93c4d..0e9afa4eaf 100644 cmake_macros_file.CONFIG = verbatim !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file -@@ -324,7 +353,7 @@ exists($$cmake_macros_file.input) { +@@ -360,7 +389,7 @@ exists($$cmake_macros_file.input) { cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -242,7 +242,7 @@ index 226dc93c4d..0e9afa4eaf 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 c0097cac74..94e3b08751 100644 +index 838279515c..811c11a666 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) @@ -305,7 +305,7 @@ index c0097cac74..94e3b08751 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. -@@ -148,18 +179,48 @@ if(NOT COMMAND _qt5_add_dependencies) +@@ -155,19 +186,50 @@ if(NOT COMMAND _qt5_add_dependencies) endif() endfunction() endif() @@ -319,14 +319,16 @@ index c0097cac74..94e3b08751 100644 !!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}) +-macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION +!!IF !isEmpty(CMAKE_STATIC_TYPE) -+macro(_populate_$${CMAKE_MODULE_NAME}_target_properties_static TARGET_NAME TARGET_CONFIG LIB_LOCATION IMPLIB_LOCATION) ++macro(_populate_$${CMAKE_MODULE_NAME}_target_properties_static TARGET_NAME Configuration LIB_LOCATION IMPLIB_LOCATION + IsDebugAndRelease) +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) +!!ELSE -+macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_NAME TARGET_CONFIG LIB_LOCATION IMPLIB_LOCATION) ++macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_NAME Configuration LIB_LOCATION IMPLIB_LOCATION ++ IsDebugAndRelease) +!!ENDIF -+ set_property(TARGET ${TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${TARGET_CONFIG}) ++ set_property(TARGET ${TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) + @@ -356,28 +358,28 @@ index c0097cac74..94e3b08751 100644 set(_deps ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} -@@ -169,15 +230,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI - ) +@@ -179,15 +241,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + # FIXME: handle IsDebugAndRelease like in official version !!IF !isEmpty(CMAKE_STATIC_TYPE) - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(\"${TARGET_NAME}\" PROPERTIES - \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} !!IF !isEmpty(CMAKE_LIB_SONAME) - \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" + \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\" !!ENDIF ) -- _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_deps}\") -+ _qt5_add_dependencies(\"${TARGET_NAME}\" \"${TARGET_CONFIG}\" \"${_deps}\") +- _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${Configuration}\" \"${_deps}\") ++ _qt5_add_dependencies(\"${TARGET_NAME}\" \"${Configuration}\" \"${_deps}\") if(NOT CMAKE_VERSION VERSION_LESS \"3.13\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(\"${TARGET_NAME}\" PROPERTIES \"INTERFACE_LINK_OPTIONS\" \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\" ) endif() -@@ -199,9 +260,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI +@@ -209,9 +271,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI !!ELSE - set(imported_implib \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF +!!IF !isEmpty(CMAKE_STATIC_TYPE) + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static(${imported_implib}) @@ -387,10 +389,10 @@ index c0097cac74..94e3b08751 100644 if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTIES - \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib} + \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} ) endif() -@@ -218,8 +283,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_target_dependencies_from_prl_file P +@@ -228,8 +294,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_target_dependencies_from_prl_file P endmacro() !!ENDIF @@ -400,7 +402,7 @@ index c0097cac74..94e3b08751 100644 !!IF !no_module_headers !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS -@@ -227,46 +291,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -237,46 +302,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" ) !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) @@ -465,7 +467,7 @@ index c0097cac74..94e3b08751 100644 endforeach() !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK) -@@ -275,16 +343,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -285,16 +354,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}) @@ -489,7 +491,7 @@ index c0097cac74..94e3b08751 100644 !!ENDIF // TEMPLATE != aux set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\") -@@ -292,10 +364,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -302,10 +375,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\") !!ENDIF @@ -502,7 +504,7 @@ index c0097cac74..94e3b08751 100644 set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED) endif() set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET) -@@ -303,17 +375,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -313,17 +386,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) @@ -524,7 +526,7 @@ index c0097cac74..94e3b08751 100644 $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT} ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET} ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED} -@@ -321,28 +393,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -331,28 +404,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) endif() @@ -569,7 +571,7 @@ index c0097cac74..94e3b08751 100644 !!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\") -@@ -353,13 +429,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -363,13 +440,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!IF !isEmpty(CMAKE_DEBUG_TYPE) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( @@ -585,7 +587,7 @@ index c0097cac74..94e3b08751 100644 _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS ) -@@ -369,13 +445,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -379,13 +456,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!IF !isEmpty(CMAKE_RELEASE_TYPE) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( @@ -601,7 +603,7 @@ index c0097cac74..94e3b08751 100644 _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS ) -@@ -383,30 +459,44 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -393,30 +470,44 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF endif() @@ -656,7 +658,7 @@ index c0097cac74..94e3b08751 100644 # Find plugin targets file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\") -@@ -420,7 +510,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -430,7 +521,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endforeach() endif() @@ -668,7 +670,7 @@ index c0097cac74..94e3b08751 100644 set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG}) !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) -@@ -428,7 +522,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -438,7 +533,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") !!ENDIF @@ -680,7 +682,7 @@ index c0097cac74..94e3b08751 100644 set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location} ) -@@ -459,16 +557,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -469,16 +568,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endif() set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE) @@ -701,7 +703,7 @@ index c0097cac74..94e3b08751 100644 ) set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS) foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}) -@@ -477,69 +575,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -487,69 +586,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endif() endforeach() !!IF !isEmpty(CMAKE_STATIC_TYPE) @@ -720,13 +722,13 @@ index c0097cac74..94e3b08751 100644 !!IF !equals(TEMPLATE, aux) !!IF !isEmpty(CMAKE_RELEASE_TYPE) -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) +!!IF !isEmpty(CMAKE_STATIC_TYPE) -+ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) !!ELSE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) +!!ENDIF // CMAKE_STATIC_TYPE + @@ -740,9 +742,9 @@ index c0097cac74..94e3b08751 100644 !!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ELSE // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC}\" \"\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) + endif() +!!ELSE // CMAKE_STATIC_TYPE if (EXISTS @@ -758,9 +760,9 @@ index c0097cac74..94e3b08751 100644 !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) !!ENDIF -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) endif() +!!ENDIF // CMAKE_STATIC_TYPE !!ENDIF // CMAKE_DEBUG_TYPE @@ -770,11 +772,11 @@ index c0097cac74..94e3b08751 100644 !!IF !isEmpty(CMAKE_DEBUG_TYPE) -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) +!!IF !isEmpty(CMAKE_STATIC_TYPE) -+ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) !!ELSE - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD +!!ENDIF // CMAKE_STATIC_TYPE @@ -790,23 +792,23 @@ index c0097cac74..94e3b08751 100644 - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" ) !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ELSE // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) +!!ELSE // CMAKE_STATIC_TYPE if (EXISTS !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" -@@ -552,7 +653,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -562,7 +664,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF -- _populate_$${CMAKE_MODULE_NAME}_target_properties(Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) -+ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) endif() !!ENDIF // CMAKE_STATIC_TYPE -@@ -562,19 +663,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -572,19 +674,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF // CMAKE_DEBUG_TYPE !!ELSE // TEMPLATE != aux @@ -1008,5 +1010,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64-angle/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index 39553428..a3ea8d8c 100644 --- a/qt5-base/mingw-w64-angle/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/qt5-base/mingw-w64-angle/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From eef6cc9b95d30179b2db3f655d542db7344bb405 Mon Sep 17 00:00:00 2001 +From e0a0aa6f1ae106e0ffda362a7a22c8dd3f41acb3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 22/33] Adjust linker flags for static build with @@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644 +unset(_isExe) +!!ENDIF -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0023-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-angle/0023-Use-correct-pkg-config-static-flag.patch index f3405397..74f2ba2c 100644 --- a/qt5-base/mingw-w64-angle/0023-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64-angle/0023-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From a36b39ed36b3c584bdd82cf31ea5d1db0228e743 Mon Sep 17 00:00:00 2001 +From ce7eb8c86dd0a1b7534067df6ec3fb6b408fdcc4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 23/33] Use correct pkg-config --static flag @@ -8,10 +8,10 @@ Subject: [PATCH 23/33] Use correct pkg-config --static flag 1 file changed, 3 insertions(+) diff --git a/configure.pri b/configure.pri -index 927fcbe132..ab5e1088b3 100644 +index 5477c264eb..6d117f4c4f 100644 --- a/configure.pri +++ b/configure.pri -@@ -350,6 +350,9 @@ defineTest(qtConfTest_detectPkgConfig) { +@@ -369,6 +369,9 @@ defineTest(qtConfTest_detectPkgConfig) { qtLog("Found pkg-config from path: $$pkgConfig") } } @@ -22,5 +22,5 @@ index 927fcbe132..ab5e1088b3 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-angle/0024-Fix-macro-invoking-moc-rcc-and-uic.patch index 2c7c89c2..a3f2eb87 100644 --- a/qt5-base/mingw-w64-angle/0024-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/qt5-base/mingw-w64-angle/0024-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From 8d11fcd322083c7ed3277df0931319a0f082fe51 Mon Sep 17 00:00:00 2001 +From ce0f25c8d3725c9c65874c46a169a9581d5c2fcc Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 24/33] Fix macro invoking moc, rcc and uic @@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake -index 78b99f5bfe..d383b4e4d8 100644 +index 0f006fe1e3..1db4bed272 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target @@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0025-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-angle/0025-Ignore-errors-about-missing-feature-static.patch index 4e56453a..d8d6d587 100644 --- a/qt5-base/mingw-w64-angle/0025-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64-angle/0025-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From d7094ac797963aabfd2f09402fbdab1730ace836 Mon Sep 17 00:00:00 2001 +From 2c8b96ba9881f3e26bfd6f191b69186c463e9991 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 25/33] Ignore errors about missing feature static @@ -10,10 +10,10 @@ Not sure why this error occurs, let's hope for the best 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf -index 0c6c10dded..54c4b568c1 100644 +index 8a7c9c28d3..003a694f44 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf -@@ -141,5 +141,5 @@ defineTest(qtConfig) { +@@ -143,5 +143,5 @@ defineTest(qtConfig) { contains(QT.$${module}.disabled_features, $$1): \ return(false) } @@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0026-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-angle/0026-Enable-and-fix-use-of-iconv.patch index 945dbc91..fae9949b 100644 --- a/qt5-base/mingw-w64-angle/0026-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64-angle/0026-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 5eb8a0d8bdeb9d9a332d730a19be663c00f4994b Mon Sep 17 00:00:00 2001 +From b2969090dbc4f3db4964541a31a8ce69c5998d2d Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 26/33] Enable and fix use of iconv @@ -74,5 +74,5 @@ index b7eefb58c8..fef7ac57de 100644 }, "icu": { -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0027-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-angle/0027-Ignore-failing-pkg-config-test.patch index 8fb9a3fb..0feaeb05 100644 --- a/qt5-base/mingw-w64-angle/0027-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64-angle/0027-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From dd798cb73309229779ff60e74a31eb8711e80833 Mon Sep 17 00:00:00 2001 +From 436242b03a054ab2699b629d819a807f37e152c3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 27/33] Ignore failing pkg-config test @@ -9,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best 1 file changed, 1 deletion(-) diff --git a/configure.json b/configure.json -index 80e15ce156..7a45887ba4 100644 +index 36545a593b..087c2f6419 100644 --- a/configure.json +++ b/configure.json -@@ -725,7 +725,6 @@ +@@ -728,7 +728,6 @@ "pkg-config": { "label": "Using pkg-config", "autoDetect": "!config.darwin && !config.win32", @@ -21,5 +21,5 @@ index 80e15ce156..7a45887ba4 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-angle/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch index 4b5cec1c..7103fb12 100644 --- a/qt5-base/mingw-w64-angle/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64-angle/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From 0c03c5c9926209c162c75e14713863be8d3da08a Mon Sep 17 00:00:00 2001 +From 22a94d0575482106bd10c562f35b04f13781cc09 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 28/33] 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 7f42fbe09e..e27428c0f2 100644 +index d7c9413290..3026318a70 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -393,6 +393,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) @@ -25,7 +25,7 @@ index 7f42fbe09e..e27428c0f2 100644 int libidx = 0, fwidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 4f1a4344df..32a1ccbbf9 100644 +index 17592c2492..26f3f5cd82 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -87,6 +87,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) @@ -39,5 +39,5 @@ index 4f1a4344df..32a1ccbbf9 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0029-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64-angle/0029-Hardcode-linker-flags-for-platform-plugins.patch index 651ea823..13670f4e 100644 --- a/qt5-base/mingw-w64-angle/0029-Hardcode-linker-flags-for-platform-plugins.patch +++ b/qt5-base/mingw-w64-angle/0029-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From cdfab1e716f840d0f1db934246219865054572b7 Mon Sep 17 00:00:00 2001 +From 96aed122b16085b36ffe3c369f858c39f7691137 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 29/33] Hardcode linker flags for platform plugins @@ -149,5 +149,5 @@ index 174bc7b609..285d90c6d3 100644 include(windows.pri) -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0030-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64-angle/0030-Fix-linking-against-static-plugins-with-qmake.patch index 32b22cc5..994f4ca9 100644 --- a/qt5-base/mingw-w64-angle/0030-Fix-linking-against-static-plugins-with-qmake.patch +++ b/qt5-base/mingw-w64-angle/0030-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From b212a375e31c52e890eb11b45603d2a3997d4731 Mon Sep 17 00:00:00 2001 +From 5af3c721d89c0008e8bbefa4dbe60ea3ddce4b3e Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 30/33] Fix linking against static plugins with qmake @@ -33,5 +33,5 @@ index d6299d8eed..5311748953 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.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0031-Disable-hardware-randomizer-for-32-bit.patch b/qt5-base/mingw-w64-angle/0031-Disable-hardware-randomizer-for-32-bit.patch index ad5f3437..f0048681 100644 --- a/qt5-base/mingw-w64-angle/0031-Disable-hardware-randomizer-for-32-bit.patch +++ b/qt5-base/mingw-w64-angle/0031-Disable-hardware-randomizer-for-32-bit.patch @@ -1,4 +1,4 @@ -From 7d7d9c565af36b4b5fbb9628edd03310a221c70a Mon Sep 17 00:00:00 2001 +From 5d5e7070268d2ce1e9df60754dbbec218a82974b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 26 May 2018 03:47:14 +0200 Subject: [PATCH 31/33] Disable hardware randomizer for 32-bit @@ -19,7 +19,7 @@ during RTL pass: ira 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp -index 90df8653a7..50725dc5cb 100644 +index bf01b7ae2a..0663949352 100644 --- a/src/corelib/global/qrandom.cpp +++ b/src/corelib/global/qrandom.cpp @@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando @@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644 #else return false; -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch b/qt5-base/mingw-w64-angle/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch index 5d50a4f0..fbdd0fb0 100644 --- a/qt5-base/mingw-w64-angle/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch +++ b/qt5-base/mingw-w64-angle/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch @@ -1,4 +1,4 @@ -From 85670b69fe04b78bb9b43b490c9a91ef6d79a226 Mon Sep 17 00:00:00 2001 +From 7b32e9b9f45a8fd6e1b2a8ac9a70ab68741f370f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 3 Feb 2019 14:34:42 +0100 Subject: [PATCH 32/33] Prevent static build to prefer dynamic libraries @@ -10,7 +10,7 @@ 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 94eb012b81..96ea2554ec 100644 +index 9be4fb6f1f..6a006b3586 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -577,12 +577,12 @@ defineTest(qtConfResolveLibs) { @@ -33,5 +33,5 @@ index 94eb012b81..96ea2554ec 100644 lcan += $${lib}.lib } -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/qt5-base/mingw-w64-angle/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch index 85c2d9bf..3e2bb010 100644 --- a/qt5-base/mingw-w64-angle/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch +++ b/qt5-base/mingw-w64-angle/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch @@ -1,12 +1,13 @@ -From a3f19f84f5f7776ec509c84fb10cb9609c0c67fe Mon Sep 17 00:00:00 2001 +From a21352b369e9218d49e0f4e29ae30a5a58566953 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 24 Jun 2019 13:51:02 +0200 Subject: [PATCH 33/33] Prevent 'Cannot find feature windows_vulkan_sdk' +See https://bugreports.qt.io/browse/QTBUG-76660 --- - mkspecs/common/windows-vulkan.conf | 2 +- - mkspecs/features/win32/windows_vulkan_sdk.prf | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + mkspecs/common/windows-vulkan.conf | 2 +- + mkspecs/features/qmake_use.prf | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mkspecs/common/windows-vulkan.conf b/mkspecs/common/windows-vulkan.conf index da061422dc..a5a8ec68d2 100644 @@ -16,19 +17,21 @@ index da061422dc..a5a8ec68d2 100644 -load(windows_vulkan_sdk) +load(win32/windows_vulkan_sdk) QMAKE_LIBS_VULKAN = -diff --git a/mkspecs/features/win32/windows_vulkan_sdk.prf b/mkspecs/features/win32/windows_vulkan_sdk.prf -index 6c08e28fe9..a80b0602a8 100644 ---- a/mkspecs/features/win32/windows_vulkan_sdk.prf -+++ b/mkspecs/features/win32/windows_vulkan_sdk.prf -@@ -1,7 +1,7 @@ - isEmpty(QMAKE_INCDIR_VULKAN) { - # Pick up the VULKAN_SDK env var set by the LunarG SDK so that the Vulkan - # headers are found out-of-the-box on typical Windows setups. -- QMAKE_INCDIR_VULKAN = $$(VULKAN_SDK)\\include -+ # QMAKE_INCDIR_VULKAN = $$(VULKAN_SDK)/include +diff --git a/mkspecs/features/qmake_use.prf b/mkspecs/features/qmake_use.prf +index 64faa4f215..f899792e4e 100644 +--- a/mkspecs/features/qmake_use.prf ++++ b/mkspecs/features/qmake_use.prf +@@ -15,7 +15,9 @@ for(ever) { + error("Library '$$lower($$replace(nu, _, -))' is not defined.") - # Do not export the include dir but resolve it on every qmake call. - QMAKE_EXPORT_INCDIR_VULKAN = - + DEFINES += $$eval(QMAKE_DEFINES_$${nu}) +- INCLUDEPATH += $$eval(QMAKE_INCDIR_$${nu}) ++ incdir = $$eval(QMAKE_INCDIR_$${nu}) ++ !contains(QMAKE_DEFAULT_INCDIRS, $$incdir): \ ++ INCLUDEPATH += $$incdir + } + LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD) + for (nu, LD_USES) { -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-angle/PKGBUILD b/qt5-base/mingw-w64-angle/PKGBUILD index e98400dc..92a0ab52 100644 --- a/qt5-base/mingw-w64-angle/PKGBUILD +++ b/qt5-base/mingw-w64-angle/PKGBUILD @@ -32,7 +32,7 @@ isNoOpenGL() { } pkgname=mingw-w64-qt5-base-angle -pkgver=5.13.0 +pkgver=5.13.1 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 @@ -88,40 +88,40 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0031-Disable-hardware-randomizer-for-32-bit.patch' '0032-Prevent-static-build-to-prefer-dynamic-libraries.patch' '0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch') -sha256sums=('ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe' - '2df58c3c5350a7b52ed9a19b23359e8a33644012bd529fd31a42afca08a7de33' - '58473061f71f210a8344581cd5654bb6e9625cad90e63cf1f9dca063d14f187b' - '161e3e3dec7904a889bfe90bd707c00f8e2f471cde0ba7803ebd7997fc84878c' - '11b0bbb41bf8f502932f0d8d79e8470654b6adeaaec63de247d044c695e455b8' - '556c1b413d079e6f86974a576f3052645fd5919003fe38056f38a66146cc8c6d' - 'f59764fa27a9d17f4651f7745416d30570d68b11813f4bc132506213a859e0c0' - 'c9e4f335c8d0cf53f4ecff9b6642d34d4794b9fbd75a2fe7f4219f908e998b43' - 'c11a3f2354a8c0b8e12890e09c321ac486c29f32a2702c3d123cd51b49f8152e' - 'cdd71e7ea046327502872da3657132f276159f7377626a41b1a592a8aa2a435f' - '002780bf246a151763fb970234bffc9bb6f82a5e6b3c99641c455a650fad9cd6' - 'e6b535f1959a1cc5b27aefd3b69f05393d0631bd384c946da278e61f1bce6da9' - '56b4695cd46189d297f8583f5d130ef2ed2a91f96ccef76d4d70b59a52da1a6e' - '1f55fbf4a5d3dfbe7a2a3f282f0e393e8c88a5b982c694cdaf557aa5508d4be8' - '39b0c2de05cf7f51a513fe555520d80cc8a22119c4e3b245459ee486f88d902b' - '9a0714b960e82e723828bd18c0bd3a722f58eacb058960aed2e9fcbe4b8d2537' - '94dc91c13b5876d05348717b94f0bee6eca3470852e4b0a99f3d5768ee09ec6c' - '6129e5bb57e18ab064fbc9c15b7708368bc93e65b0c16ec1c83708f01e2862f1' - 'ae3cc5e48f69bcb065d919ea1ff6cd4e8216cff348348675dc0932887e62d2c8' - '1bf5cbfeab7139e1af66909e9359ed051b02d335cd032e1d87539f7a46974c09' - 'e8bceae99d8b6a802592fb7476ac68f2f015cbca0dc38959076c5029f63d0f23' - 'b491f47044b2ea161ec9881d7211ededfd1b3481f54ca93381498a50aebd3795' - '3dbb78c2ec5d3b2f33d5545de15da2ee2895978e98d35a677eaa1449e592cf3c' - '99782fd0b3cb20f2ce5425607f5f6b909ecaefcd8e038738c19d76ae3dc43ab6' - '0ce174399229425fc1f9fac6e27dc9fc7b04dd4eb4770f471fb62244368e6e64' - '365459aba005e00fb19cf0fbeb42f563d36b0b7ac9737ea981f4f4034af6e229' - '486c27a6a56140f6f43665b79b960dafb93d1d48a2d4b5a0de330f3e55685cf8' - '3f4dbd1417a63d04e5e938a37b5a614940d19c318aeeb2de43c126804a509053' - 'ca721a40d0be358baa31233b0d9db8ee70483dc25dda96dbdb080158e90200fb' - '2ba848d3a4e2a3230ee70473fdd7adb6aadb021fea2f09b7871033f281425855' - '6cff295c7011ce53319f35749d807cc6b0c3596ae92d9c36e0eb2cecbafd182e' - '45aae3d21e88cc0ac9e008cd0cc98e3178c2319d0aef726677555866c3bd4b59' - '6d661273b5f6c61c02dd0a0d3b4e7c5788646b056ba7aa3cbad125c84199ffc5' - '7e42f2b917e18dfc22e9f4fb7d7d5c1717157e9746fdaf25b55217b0b78d87be') +sha256sums=('110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab' + '52f473398f93d9446a22ddd806d70ed3c530e4592013b0070f55fa6cb5dd024f' + 'a88f6a3246993a46ddda334f0b0a0f8969be3a4420fff17fe810399ab709fd4a' + 'da99200b82fd866b950de2fc5a0e633af12cce1b86168fdb5d91a269437af80c' + 'd1c962fdcf6974da877c6c94083f9a4c32b3565faa09b92fe4045df97add7fc2' + '704bf70f29fcd19863fdb0d1a5be62b4fa9de9c8e0bdc5b9cea4a7ed2def0908' + '560c2ad8dc492cd512da18ec66f5dd28892b589810f0e1de436a5e94fd28a52c' + 'b106f03cc8976ece37cbd3095707ae6d6e41b62e90d0ae6d34f96ebd8eb62a5a' + 'acaa96d5354c4c7bac6009a78e276b2f756c5557fb9016449af983f5cac896b1' + 'dc2ee63858c9b8e46a065fb430fb4563448e3d5b493c425939085c3290e1987d' + 'cddf9ff3f26661142fe9f895fde0ab587639b4bb8d6279e8de2e201e6f637cbf' + 'd9271e94b596bfdc2901af1ebd8a8284ef421e7a99d46dd3c65daed8a121d6d2' + 'f073aaf27b8b089cff3d3f54bec0e38229deaa999aff2dcc203656f8b7994cb6' + 'f6ef098372e051e234d979bd5f5467b81d89b2f803d4316f64564e16e12cbb52' + 'b001fc1b29d6b3db975d417d1ad9746fd0cabd7692b12a35d473399951f75111' + 'f9dda213747f49c13414a89a5ac3a57064a06798e92106cc3f2f227d5674450d' + 'a49459c9ed2a7fc29a82a94ab43459ff510c6763da73da46ccae5d51ff1f16bc' + 'e25f22a835b9e8ad12aa869222259024fff3d26bf9fe05ce4cc8d0f2f6f4a5e6' + '9940d363b3f8dc10b0151845711ba445c98e850c9fe413f52abb7f8c84eb9b50' + 'd068d378b108ebe4dc645a7cacb89c69acd6b06346bcb0b47563e8cdb9f60c46' + 'e1d4f534beb22b08cc9b70163a871281723aff19a14911f25f522c2a31de944e' + 'e7584630ea69fc8c4e937106268cbf38258550cb26d33a6a38feea0a71aa6edc' + '6193e9b1baa63819dca331f9a62a483c50150ee0fb64e1199b0c1fd3c6388ac3' + '473101992df6f30fb50b2a0be45e55f2391021c01bc2bdf6a97fd7d3067f8fe6' + '809214ea4afccba045c7dd41902b160cf5ec7e4a501457b79b0f51def73e6de4' + '565a7b7aa93c8fd57cc4e6da69246110cce82663718078b8d08952a2c4038aac' + 'a4347a60524b83a77c82aaa0502d8561dc9fb8012d676073a4211100404309ad' + '392608b8d6cf513f4e67ef1748e0b92e33808a16670db6346974ebc62977f762' + 'b74e5960f131866c3fb74fc756da9574e0d03227044a8b80ad7ad6716777035c' + '9dd9393ea601eee07b23222278369909291f1077ea7a14a790260f7b7a8da4c3' + '6ac3bf6b0c447804f8a3b2acebe7e432e2f2dfc6180501ff1a96d0174e4edbe8' + '5c37923453bc13b06a37f9e916883516c83fdcd3dcae893beb97d2b52e6b77df' + '536cd9405a0a7a825768388f9e761e8c257e7e6e64406c9a3cce3c9cf1f48474' + 'a0e20cc3bc60f9b7a3a7281b2f778362ce7cdb16d89478039f1c76896b3383bf') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -333,6 +333,19 @@ package() { "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5WindowsUIAutomationSupport* \ "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5VulkanSupport* \ "${pkgdir}/usr/${_arch}/lib/"libQt5Bootstrap* \ + rm -r \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5AccessibilitySupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5DeviceDiscoverySupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5EdidSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5EventDispatcherSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5FbSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5FontDatabaseSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5PlatformCompositorSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5ThemeSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5WindowsUIAutomationSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5VulkanSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5Bootstrap" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5BootstrapDBus" # ensure config files don't conflict with shared version pushd "${pkgdir}/usr/${_arch}/lib/cmake" @@ -393,6 +406,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + # replace library path in *.prl files so it points to the installed location and not the build directory find "${pkgdir}/usr/${_arch}/lib" \( -type f -name '*.prl' -o -name '*.pc' \) -exec sed -i -e "s:${PWD%/*}/build-${_arch}/lib:/usr/${_arch}/lib:g" {} \; diff --git a/qt5-base/mingw-w64-dynamic/PKGBUILD b/qt5-base/mingw-w64-dynamic/PKGBUILD index 713e66be..760bcb64 100644 --- a/qt5-base/mingw-w64-dynamic/PKGBUILD +++ b/qt5-base/mingw-w64-dynamic/PKGBUILD @@ -32,7 +32,7 @@ isNoOpenGL() { } pkgname=mingw-w64-qt5-base-dynamic -pkgver=5.13.0 +pkgver=5.13.1 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 @@ -384,6 +384,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + # replace library path in *.prl files so it points to the installed location and not the build directory find "${pkgdir}/usr/${_arch}/lib" \( -type f -name '*.prl' -o -name '*.pc' \) -exec sed -i -e "s:${PWD%/*}/build-${_arch}/lib:/usr/${_arch}/lib:g" {} \; diff --git a/qt5-base/mingw-w64-opengl/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/qt5-base/mingw-w64-opengl/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch index a6cee113..6b13408f 100644 --- a/qt5-base/mingw-w64-opengl/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch +++ b/qt5-base/mingw-w64-opengl/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch @@ -1,4 +1,4 @@ -From 07a334d39698cc7d2826ed1b5b6cb9b67dd4def8 Mon Sep 17 00:00:00 2001 +From a378fa39cd0e8100c8c3ee0a5906868663158bbf Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with @@ -161,5 +161,5 @@ index 5de482f23b..3c3d22c699 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64-opengl/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index fe6205f1..353bce3a 100644 --- a/qt5-base/mingw-w64-opengl/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch +++ b/qt5-base/mingw-w64-opengl/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch @@ -1,4 +1,4 @@ -From 2a4db9590232cb56102955d86e21e3c2482b28cf Mon Sep 17 00:00:00 2001 +From 1e4ae2deeb92c2bff530bf77e02d9409d47b95cb Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL @@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64-opengl/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 5109261f..d10014a9 100644 --- a/qt5-base/mingw-w64-opengl/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64-opengl/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From abcf04e70f4f3e8a0a7a584afcf976e209307265 Mon Sep 17 00:00:00 2001 +From dc9fb928edeae31a253b27dc6536117b1ec3ed0d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 03/33] 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.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0004-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64-opengl/0004-Make-sure-.pc-files-are-installed-correctly.patch index 7a73127b..fdb82a4e 100644 --- a/qt5-base/mingw-w64-opengl/0004-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64-opengl/0004-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 3887b9693805365272de6101eab5c332862960e3 Mon Sep 17 00:00:00 2001 +From 7d3c1a5d57a996c8eaef937486df04ad0c2559cd Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 04/33] Make sure *.pc files are installed correctly @@ -10,10 +10,10 @@ Subject: [PATCH 04/33] Make sure *.pc files are installed correctly 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index b634ec622b..aac53cd0ea 100644 +index a45b676d5f..6065ca4c77 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3240,7 +3240,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index b634ec622b..aac53cd0ea 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3255,7 +3255,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3265,7 +3265,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) if(fixify) { if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR").toQString()); @@ -49,7 +49,7 @@ index 350ebd377a..d0c234b864 100644 void writePkgConfigFile(); // for pkg-config diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 16f9361d13..d9887cd36d 100644 +index 266bae7e64..8222854cfc 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -753,7 +753,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) @@ -62,5 +62,5 @@ index 16f9361d13..d9887cd36d 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0005-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64-opengl/0005-Don-t-add-resource-files-to-LIBS-parameter.patch index 37bf7b35..8442eeac 100644 --- a/qt5-base/mingw-w64-opengl/0005-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64-opengl/0005-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From 2ebc0b00f1b3297e1f88d271123df7ecb0fbd955 Mon Sep 17 00:00:00 2001 +From cd4400120aa04adcc40f36f29ae395589a511409 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 05/33] Don't add resource files to LIBS parameter @@ -11,10 +11,10 @@ like .obj/debug/Qt5Cored_resource_res.o 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp -index de7363e51b..b2b9d01799 100644 +index 2175841264..c565d44e67 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp -@@ -209,7 +209,7 @@ void MingwMakefileGenerator::init() +@@ -192,7 +192,7 @@ void MingwMakefileGenerator::init() processVars(); @@ -24,5 +24,5 @@ index de7363e51b..b2b9d01799 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0006-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64-opengl/0006-Prevent-debug-library-names-in-pkg-config-files.patch index 9ff893ab..d76b7978 100644 --- a/qt5-base/mingw-w64-opengl/0006-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64-opengl/0006-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 00be29ae27f1954f8d9c7ca2f47c1d18f38e96b8 Mon Sep 17 00:00:00 2001 +From 46d434d6d978b96beae9493ea638d96065ee968f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 06/33] 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 aac53cd0ea..fedbaaf601 100644 +index 6065ca4c77..8a47d584c3 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3254,6 +3254,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (dot != -1) ret = ret.left(dot); } @@ -29,5 +29,5 @@ index aac53cd0ea..fedbaaf601 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0007-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64-opengl/0007-Fix-linking-against-shared-static-libpng.patch index f6892d8c..1591064b 100644 --- a/qt5-base/mingw-w64-opengl/0007-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64-opengl/0007-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From 6b429798b0e3eddc7e5c857cc3e5b9d7f70aa998 Mon Sep 17 00:00:00 2001 +From 41f5e197d8624e713d48a5a800de3211ba7df7e5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 07/33] Fix linking against shared/static libpng @@ -26,5 +26,5 @@ index 6280b4dfa2..36325920cd 100644 ], "use": [ -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0008-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64-opengl/0008-Fix-linking-against-static-D-Bus.patch index d0e9ce41..a4725b1d 100644 --- a/qt5-base/mingw-w64-opengl/0008-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64-opengl/0008-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From f7f14b714ac258239ba7d56aad81352ae013c299 Mon Sep 17 00:00:00 2001 +From f6e638c4058335603797e7cd451fc71e89866b7e Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 08/33] Fix linking against static D-Bus @@ -9,7 +9,7 @@ Subject: [PATCH 08/33] Fix linking against static D-Bus 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.json b/configure.json -index 7f3018ed23..9d8e93a227 100644 +index af55bb6fd2..370c27af5b 100644 --- a/configure.json +++ b/configure.json @@ -187,18 +187,23 @@ @@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644 # include #else -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64-opengl/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index 36711fdf..a0dbe248 100644 --- a/qt5-base/mingw-w64-opengl/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/qt5-base/mingw-w64-opengl/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 663130ef2c1188a101b3ff1b88ccfe07712f628b Mon Sep 17 00:00:00 2001 +From b1d7eb0ed7121c1ec287b68c183e185836069057 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 09/33] Don't try to use debug version of D-Bus library @@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.json b/configure.json -index 9d8e93a227..80e15ce156 100644 +index 370c27af5b..36545a593b 100644 --- a/configure.json +++ b/configure.json @@ -200,7 +200,7 @@ @@ -25,5 +25,5 @@ index 9d8e93a227..80e15ce156 100644 }, "condition": "config.win32 && features.shared" -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0010-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64-opengl/0010-Fix-linking-against-static-freetype2.patch index 027fec2a..a0b99788 100644 --- a/qt5-base/mingw-w64-opengl/0010-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64-opengl/0010-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From c75a87b8378987e9a63235984021377755418ba1 Mon Sep 17 00:00:00 2001 +From 4bc1016e6268e57a5b8c9c3ae067166e41d10420 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 10/33] Fix linking against static freetype2 @@ -26,5 +26,5 @@ index 36325920cd..972f9914ea 100644 { "libs": "-lfreetype" } ], -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0011-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64-opengl/0011-Fix-linking-against-static-harfbuzz.patch index f07979b5..950e2992 100644 --- a/qt5-base/mingw-w64-opengl/0011-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64-opengl/0011-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From 4f637a1ae1182f9327cc5fd198961e906cff59eb Mon Sep 17 00:00:00 2001 +From 41de800407436106116940c9da87841f01322b14 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 11/33] Fix linking against static harfbuzz @@ -25,5 +25,5 @@ index 972f9914ea..894c10259d 100644 }, "imf": { -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0012-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-opengl/0012-Fix-linking-against-static-pcre.patch index 36514aa4..33b6bb9f 100644 --- a/qt5-base/mingw-w64-opengl/0012-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64-opengl/0012-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From 3fccf1f581659113ae325f5192c8d6870c894c84 Mon Sep 17 00:00:00 2001 +From a17a279ab36a4f71bbe63ada089d85fc6789a7b5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 12/33] Fix linking against static pcre @@ -24,5 +24,5 @@ index bdaa2d3243..90f8250c03 100644 #include -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0013-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64-opengl/0013-Fix-linking-against-shared-static-MariaDB.patch index b243cd9a..e627daeb 100644 --- a/qt5-base/mingw-w64-opengl/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64-opengl/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From 7ea90aaf596477d79194673de9fb4b8076883186 Mon Sep 17 00:00:00 2001 +From 5bb7b2f2d9c9cc02dc064c8b64b6a10a15ab0d22 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 13/33] 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.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64-opengl/0014-Fix-linking-against-shared-static-PostgreSQL.patch index 41d712cb..7304961e 100644 --- a/qt5-base/mingw-w64-opengl/0014-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64-opengl/0014-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From e9076f7d190ce29321102ce695dbd105cccf14f7 Mon Sep 17 00:00:00 2001 +From 638327519b9b04f3c105280f49f29e509c06a9ce Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 14/33] Fix linking against shared/static PostgreSQL @@ -24,5 +24,5 @@ index babd0465ce..b4b3bdec6b 100644 ] }, -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0015-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-opengl/0015-Rename-qtmain-to-qt5main.patch index 1c14b162..fad58795 100644 --- a/qt5-base/mingw-w64-opengl/0015-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64-opengl/0015-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 5eb2e0e33778a15ff05a2891e6752af573bca2e5 Mon Sep 17 00:00:00 2001 +From a612704b7c2144f2074f7b98ceaed47aa8470dce Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 15/33] Rename qtmain to qt5main @@ -25,10 +25,10 @@ index 5208d22bd6..1a058b787f 100644 QMAKE_IDL = $${CROSS_COMPILE}widl QMAKE_LIB = $${CROSS_COMPILE}ar -rc diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 2ab7775fea..6bc621ce27 100644 +index 376a7ded5d..4fe2ef2326 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -234,8 +234,8 @@ mac { +@@ -270,8 +270,8 @@ mac { CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll mingw { @@ -68,5 +68,5 @@ index 9cb6ab0c59..4327ba365e 100644 CONFIG += static -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0016-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64-opengl/0016-Enable-rpath-for-build-tools.patch index 59595f2c..830542ac 100644 --- a/qt5-base/mingw-w64-opengl/0016-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64-opengl/0016-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From a2a8aa60a4385fff2770e93e0a6054935905bef7 Mon Sep 17 00:00:00 2001 +From 2ed621b725a48cf41a4fd39cbb0723de1724b519 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 16/33] Enable rpath for build tools @@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644 INSTALLS += target -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0017-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64-opengl/0017-Use-system-zlib-for-build-tools.patch index c9a01d9c..6a8df34f 100644 --- a/qt5-base/mingw-w64-opengl/0017-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64-opengl/0017-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 04a04e8c11bf4ae71d4ed0d6b641b2b2ebacc565 Mon Sep 17 00:00:00 2001 +From 0e4aad7814d0b407d92b34e8fcc9fba70d9bd765 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 17/33] Use system zlib for build tools @@ -23,5 +23,5 @@ index 83e44ff9a4..4734623936 100644 } else { CONFIG += no_core_dep -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0018-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64-opengl/0018-Merge-shared-and-static-library-trees.patch index 45ea3d0d..27015bd4 100644 --- a/qt5-base/mingw-w64-opengl/0018-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64-opengl/0018-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 8d8cfe560697425a01b786aee113082495d6c85f Mon Sep 17 00:00:00 2001 +From 24a7b52b579fb5f0787d9738668841392c8bd649 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 18/33] Merge shared and static library trees @@ -10,15 +10,15 @@ Allow installation of shared and static build in the same prefix mkspecs/features/device_config.prf | 9 ++++++++- mkspecs/features/qt.prf | 17 +++++++++++++++++ mkspecs/features/spec_pre.prf | 11 ++++++++--- - qmake/generators/makefile.cpp | 9 ++++++--- + qmake/generators/makefile.cpp | 11 +++++++---- qtbase.pro | 10 ++++++++-- - 7 files changed, 73 insertions(+), 10 deletions(-) + 7 files changed, 74 insertions(+), 11 deletions(-) diff --git a/configure.pri b/configure.pri -index 81133da3d7..927fcbe132 100644 +index 7b8dee0953..5477c264eb 100644 --- a/configure.pri +++ b/configure.pri -@@ -657,7 +657,12 @@ defineTest(qtConfOutput_machineTuple) { +@@ -676,7 +676,12 @@ defineTest(qtConfOutput_machineTuple) { defineTest(qtConfOutput_commitOptions) { # qdevice.pri needs to be written early, because the compile tests require it. @@ -32,7 +32,7 @@ index 81133da3d7..927fcbe132 100644 } # type (empty or 'host'), option name, default value -@@ -1350,3 +1355,12 @@ defineTest(createConfigStatus) { +@@ -1369,3 +1374,12 @@ defineTest(createConfigStatus) { QMAKE_POST_CONFIGURE += \ "createConfigStatus()" @@ -46,7 +46,7 @@ index 81133da3d7..927fcbe132 100644 + CONFIG += no_smart_library_merge +} diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf -index 9df99b8648..9c1dd6a735 100644 +index 0e41b825ec..4c4b6dd12a 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -1,5 +1,16 @@ @@ -137,10 +137,10 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index fedbaaf601..fd3b5c405a 100644 +index 8a47d584c3..b158bb9b52 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3247,6 +3247,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3257,6 +3257,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -150,19 +150,22 @@ index fedbaaf601..fd3b5c405a 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3421,9 +3424,9 @@ MakefileGenerator::writePkgConfigFile() +@@ -3433,11 +3436,11 @@ MakefileGenerator::writePkgConfigFile() t << endl; // requires -- const QString requires = project->values("QMAKE_PKGCONFIG_REQUIRES").join(' '); -- if (!requires.isEmpty()) { -- t << "Requires: " << requires << endl; +- const QString requiresString = project->values("QMAKE_PKGCONFIG_REQUIRES").join(' '); +- if (!requiresString.isEmpty()) { +- t << "Requires: " << requiresString << endl; + t << "Requires:"; -+ for (const auto &required : project->values("QMAKE_PKGCONFIG_REQUIRES")) { ++ const auto pkgconfigRequires = project->values("QMAKE_PKGCONFIG_REQUIRES"); ++ for (const auto &required : pkgconfigRequires) { + t << (project->isActiveConfig("staticlib") ? QStringLiteral(" Static") : QStringLiteral(" ")) << required.toQString(); } - +- t << endl; + } + diff --git a/qtbase.pro b/qtbase.pro index c0ce0972ef..5a2deaf31d 100644 --- a/qtbase.pro @@ -199,5 +202,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0019-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64-opengl/0019-Use-.dll.a-as-import-lib-extension.patch index b560fb61..013911c8 100644 --- a/qt5-base/mingw-w64-opengl/0019-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64-opengl/0019-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From 0f3da1317f28a882c705fcf3f13c419601b96467 Mon Sep 17 00:00:00 2001 +From ad61d1712db4cdd3389e808d46fbfcb26a2509e3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 19/33] Use *.dll.a as import lib extension @@ -12,10 +12,10 @@ g++-win32.conf 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 6bc621ce27..226dc93c4d 100644 +index 4fe2ef2326..7cb27b716a 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -245,8 +245,9 @@ mac { +@@ -281,8 +281,9 @@ mac { CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl } else { @@ -57,7 +57,7 @@ index bbada46c29..d6299d8eed 100644 } } diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index d9887cd36d..4f1a4344df 100644 +index 8222854cfc..17592c2492 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -80,9 +80,13 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg) @@ -92,5 +92,5 @@ index d9887cd36d..4f1a4344df 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64-opengl/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index 10946b0f..2255c51f 100644 --- a/qt5-base/mingw-w64-opengl/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/qt5-base/mingw-w64-opengl/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From 720bde854fa9d143d0ad8db4794a0dd0efb173a2 Mon Sep 17 00:00:00 2001 +From 890e47124906afd97de44bc40520338bde5dc5d3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 20/33] Pull dependencies of static libraries in CMake modules @@ -21,12 +21,12 @@ e.g. to use QMAKE_PRL_LIBS instead of QMAKE_PRL_LIBS_FOR_CMAKE. See https://github.com/Martchus/PKGBUILDs/issues/86#issuecomment-476840055 for further details on 2. --- - .../data/cmake/Qt5BasicConfig.cmake.in | 172 ++++++++++++++---- + .../data/cmake/Qt5BasicConfig.cmake.in | 192 ++++++++++++------ .../data/cmake/Qt5PluginTarget.cmake.in | 11 +- - 2 files changed, 139 insertions(+), 44 deletions(-) + 2 files changed, 136 insertions(+), 67 deletions(-) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 705e0a3c93..c0097cac74 100644 +index d4fd057682..838279515c 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -53,10 +53,18 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura @@ -40,24 +40,24 @@ index 705e0a3c93..c0097cac74 100644 get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" ABSOLUTE) if(EXISTS \"${prl_file_location}\") - file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS[ \\t]*=\") + file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE[ \\t]*=\") + if(NOT _prl_strings) -+ message(WARNING \"Prl file for Qt 5 module $${CMAKE_MODULE_NAME} does not contain QMAKE_PRL_LIBS. Was looking at \\\"${prl_file_location}\\\".\") ++ message(WARNING \"Prl file for Qt 5 module $${CMAKE_MODULE_NAME} does not contain QMAKE_PRL_LIBS_FOR_CMAKE. Was looking at \\\"${prl_file_location}\\\".\") + return() + endif() - string(REGEX REPLACE \"QMAKE_PRL_LIBS[ \\t]*=[ \\t]*([^\\n]*)\" \"\\\\1\" _static_depends ${_prl_strings}) - string(REGEX REPLACE \"[ \\t]+\" \";\" _static_depends ${_static_depends}) - string(REGEX REPLACE \"[ \\t]+\" \";\" _standard_libraries \"${CMAKE_CXX_STANDARD_LIBRARIES}\") -@@ -68,7 +76,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura + + # file(STRINGS) replaces all semicolons read from the file with backslash semicolons. + # We need to do a reverse transformation in CMake. For that we replace all backslash +@@ -75,7 +83,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura # Handle normal libraries passed as -lfoo set(_lib \"${CMAKE_MATCH_1}\") foreach(_standard_library ${_standard_libraries}) -- if(_standard_library MATCHES \"^${_lib}(\\.lib)?$\") +- if(_standard_library MATCHES \"^${_lib}(\\\\.lib)?$\") + if(_standard_library MATCHES \"^${_lib}(\\\\.lib|\\\\.a)?$\") set(_lib_is_default_linked TRUE) break() endif() -@@ -109,11 +117,42 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura +@@ -116,6 +124,37 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura set(${lib_deps} ${_lib_deps} PARENT_SCOPE) set(${link_flags} \"SHELL:${_link_flags}\" PARENT_SCOPE) endfunction() @@ -95,71 +95,78 @@ index 705e0a3c93..c0097cac74 100644 !!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}) -+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}) - - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -@@ -121,44 +160,62 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI +@@ -129,52 +168,39 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") !!ENDIF _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) + set(_deps ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} +- ) +- set(_static_deps !!IF !isEmpty(CMAKE_STATIC_TYPE) -- ${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LIB_DEPENDENCIES} -+ ${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES} + ${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LIB_DEPENDENCIES} !!ENDIF ) + ++ # FIXME: handle IsDebugAndRelease like in official version + +!!IF !isEmpty(CMAKE_STATIC_TYPE) set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -- \"INTERFACE_LINK_LIBRARIES\" \"${_deps}\" -- \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -+ \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} !!IF !isEmpty(CMAKE_LIB_SONAME) -- \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\" -+ \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" + \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\" !!ENDIF - # For backward compatibility with CMake < 2.8.12 -- \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_deps}\" +- \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_deps};${_static_deps}\" +- ) +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES +- \"${_deps}\" ) --!!IF !isEmpty(CMAKE_STATIC_TYPE) - -+ _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_deps}\") - if(NOT CMAKE_VERSION VERSION_LESS \"3.13\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES - \"INTERFACE_LINK_OPTIONS\" \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\" +-!!IF !isEmpty(CMAKE_STATIC_TYPE) +- if(NOT "${IsDebugAndRelease}") +- set(_genex_condition \"1\") +- else() +- if("${Configuration}" STREQUAL "DEBUG") +- set(_genex_condition \"$\") +- else() +- set(_genex_condition \"$>\") +- endif() +- endif() +- +- if(_static_deps) +- set(_static_deps_genex \"$<${_genex_condition}:${_static_deps}>\") +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES +- \"${_static_deps_genex}\" +- ) +- endif() +- +- set(_static_link_flags \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\") +- if(NOT CMAKE_VERSION VERSION_LESS \"3.13\" AND _static_link_flags) +- set(_static_link_flags_genex \"$<${_genex_condition}:${_static_link_flags}>\") +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_OPTIONS +- \"${_static_link_flags_genex}\" ++ _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${Configuration}\" \"${_deps}\") ++ if(NOT CMAKE_VERSION VERSION_LESS \"3.13\") ++ set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES ++ \"INTERFACE_LINK_OPTIONS\" \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\" ) endif() +!!ELSE + set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -+ \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_deps}\" -+ \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} ++ \"INTERFACE_LINK_LIBRARIES_${Configuration}\" \"${_deps}\" ++ \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} +!!IF !isEmpty(CMAKE_LIB_SONAME) -+ \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" ++ \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\" +!!ENDIF + # For backward compatibility with CMake < 2.8.12 -+ \"IMPORTED_LINK_INTERFACE_LIBRARIES_${TARGET_CONFIG}\" \"${_deps}\" ++ \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_deps}\" + ) !!ENDIF !!IF !isEmpty(CMAKE_WINDOWS_BUILD) - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ELSE -- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+ set(imported_implib \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) - if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} -+ \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib} - ) +@@ -191,6 +217,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI endif() !!ENDIF endmacro() @@ -175,7 +182,7 @@ index 705e0a3c93..c0097cac74 100644 !!ENDIF if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) -@@ -328,13 +385,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -360,13 +395,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") @@ -193,7 +200,7 @@ index 705e0a3c93..c0097cac74 100644 !!IF !equals(TEMPLATE, aux) !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1) -@@ -349,6 +408,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -381,6 +418,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, ";")) @@ -250,7 +257,7 @@ index 705e0a3c93..c0097cac74 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}) -@@ -367,9 +476,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -399,9 +486,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private) endif() endforeach() @@ -264,13 +271,13 @@ index 705e0a3c93..c0097cac74 100644 endif() !!IF !equals(TEMPLATE, aux) -@@ -439,9 +552,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -471,9 +562,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties(Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) endif() +!!ENDIF // CMAKE_STATIC_TYPE + @@ -278,10 +285,12 @@ index 705e0a3c93..c0097cac74 100644 !!ENDIF // CMAKE_RELEASE_TYPE !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD -@@ -452,29 +567,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -484,33 +577,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) !!ENDIF // TEMPLATE != aux +-!!IF isEmpty(CMAKE_INTERNAL_MODULE) +- - file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\") - - macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) @@ -304,6 +313,8 @@ index 705e0a3c93..c0097cac74 100644 - endforeach() - endif() - +-!!ENDIF // isEmpty(CMAKE_INTERNAL_MODULE) +- - !!IF !isEmpty(CMAKE_MODULE_EXTRAS) include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\") @@ -332,5 +343,5 @@ index 5baf0fdb10..ec5f3cc437 100644 + +endif() -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0021-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-opengl/0021-Allow-usage-of-static-version-with-CMake.patch index 8a8dde9e..f2a8f3b6 100644 --- a/qt5-base/mingw-w64-opengl/0021-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64-opengl/0021-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From 7c539241c220ce50da61ef811daae18489b5df19 Mon Sep 17 00:00:00 2001 +From 6bdfbfedf65c6883b74ac47a4385148bbafb4438 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 21/33] Allow usage of static version with CMake @@ -12,20 +12,20 @@ installed in the same prefix via regular find_package(Qt5Core) --- mkspecs/features/create_cmake.prf | 103 +++--- - .../data/cmake/Qt5BasicConfig.cmake.in | 296 ++++++++++++------ + .../data/cmake/Qt5BasicConfig.cmake.in | 297 ++++++++++++------ .../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, 309 insertions(+), 153 deletions(-) + 7 files changed, 310 insertions(+), 153 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 -index 226dc93c4d..0e9afa4eaf 100644 +index 7cb27b716a..7d8ac191db 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -51,7 +51,7 @@ split_incpath { +@@ -65,7 +65,7 @@ split_incpath { $$QT_MODULE_INCLUDE_BASE/$${CMAKE_INCLUDE_NAME}/$$eval(QT.$${MODULE}.VERSION)/$${CMAKE_INCLUDE_NAME}) cmake_extra_source_includes.input = $$PWD/data/cmake/ExtraSourceIncludes.cmake.in @@ -34,16 +34,16 @@ index 226dc93c4d..0e9afa4eaf 100644 !build_pass:QMAKE_SUBSTITUTES += \ cmake_extra_source_includes -@@ -101,6 +101,8 @@ win32:!static:!staticlib { +@@ -115,6 +115,8 @@ win32:!static:!staticlib { } static|staticlib:CMAKE_STATIC_TYPE = true +static|staticlib:DEFAULT_QT_VARIANT_PREFIX = "Static" +else:DEFAULT_QT_VARIANT_PREFIX = "" - CMAKE_DEBUG_TYPE = - CMAKE_RELEASE_TYPE = -@@ -146,17 +148,19 @@ contains(CONFIG, plugin) { + internal_module { + CMAKE_INTERNAL_MODULE = true +@@ -182,17 +184,19 @@ contains(CONFIG, plugin) { CMAKE_PLUGIN_NAME = $$PLUGIN_CLASS_NAME win32 { @@ -67,7 +67,7 @@ index 226dc93c4d..0e9afa4eaf 100644 mac { isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib else: CMAKE_PlUGIN_EXT = .a -@@ -172,13 +176,13 @@ contains(CONFIG, plugin) { +@@ -208,13 +212,13 @@ contains(CONFIG, plugin) { } } cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in @@ -83,7 +83,7 @@ index 226dc93c4d..0e9afa4eaf 100644 INSTALLS += cmake_qt5_plugin_file return() -@@ -191,25 +195,34 @@ mod_deps = +@@ -227,25 +231,34 @@ mod_deps = lib_deps = aux_mod_deps = aux_lib_deps = @@ -122,7 +122,7 @@ index 226dc93c4d..0e9afa4eaf 100644 !isEmpty(CMAKE_STATIC_TYPE) { CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a -@@ -237,35 +250,33 @@ mac { +@@ -273,35 +286,33 @@ mac { CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a @@ -177,7 +177,7 @@ index 226dc93c4d..0e9afa4eaf 100644 !isEmpty(CMAKE_STATIC_TYPE) { CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a -@@ -285,12 +296,12 @@ mac { +@@ -321,12 +332,12 @@ mac { INSTALLS += cmake_qt5_module_files cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in @@ -192,7 +192,7 @@ index 226dc93c4d..0e9afa4eaf 100644 !build_pass:QMAKE_SUBSTITUTES += \ cmake_config_file \ -@@ -300,11 +311,29 @@ cmake_qt5_module_files.files = \ +@@ -336,11 +347,29 @@ cmake_qt5_module_files.files = \ $$cmake_config_file.output \ $$cmake_config_version_file.output @@ -223,7 +223,7 @@ index 226dc93c4d..0e9afa4eaf 100644 !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file -@@ -316,7 +345,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake +@@ -352,7 +381,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake exists($$cmake_macros_file.input) { CMAKE_MODULE_MACROS = "true" @@ -232,7 +232,7 @@ index 226dc93c4d..0e9afa4eaf 100644 cmake_macros_file.CONFIG = verbatim !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file -@@ -324,7 +353,7 @@ exists($$cmake_macros_file.input) { +@@ -360,7 +389,7 @@ exists($$cmake_macros_file.input) { cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -242,7 +242,7 @@ index 226dc93c4d..0e9afa4eaf 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 c0097cac74..94e3b08751 100644 +index 838279515c..811c11a666 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) @@ -305,7 +305,7 @@ index c0097cac74..94e3b08751 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. -@@ -148,18 +179,48 @@ if(NOT COMMAND _qt5_add_dependencies) +@@ -155,19 +186,50 @@ if(NOT COMMAND _qt5_add_dependencies) endif() endfunction() endif() @@ -319,14 +319,16 @@ index c0097cac74..94e3b08751 100644 !!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}) +-macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION +!!IF !isEmpty(CMAKE_STATIC_TYPE) -+macro(_populate_$${CMAKE_MODULE_NAME}_target_properties_static TARGET_NAME TARGET_CONFIG LIB_LOCATION IMPLIB_LOCATION) ++macro(_populate_$${CMAKE_MODULE_NAME}_target_properties_static TARGET_NAME Configuration LIB_LOCATION IMPLIB_LOCATION + IsDebugAndRelease) +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) +!!ELSE -+macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_NAME TARGET_CONFIG LIB_LOCATION IMPLIB_LOCATION) ++macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_NAME Configuration LIB_LOCATION IMPLIB_LOCATION ++ IsDebugAndRelease) +!!ENDIF -+ set_property(TARGET ${TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${TARGET_CONFIG}) ++ set_property(TARGET ${TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) + @@ -356,28 +358,28 @@ index c0097cac74..94e3b08751 100644 set(_deps ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} -@@ -169,15 +230,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI - ) +@@ -179,15 +241,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + # FIXME: handle IsDebugAndRelease like in official version !!IF !isEmpty(CMAKE_STATIC_TYPE) - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(\"${TARGET_NAME}\" PROPERTIES - \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} !!IF !isEmpty(CMAKE_LIB_SONAME) - \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" + \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\" !!ENDIF ) -- _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_deps}\") -+ _qt5_add_dependencies(\"${TARGET_NAME}\" \"${TARGET_CONFIG}\" \"${_deps}\") +- _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${Configuration}\" \"${_deps}\") ++ _qt5_add_dependencies(\"${TARGET_NAME}\" \"${Configuration}\" \"${_deps}\") if(NOT CMAKE_VERSION VERSION_LESS \"3.13\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(\"${TARGET_NAME}\" PROPERTIES \"INTERFACE_LINK_OPTIONS\" \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\" ) endif() -@@ -199,9 +260,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI +@@ -209,9 +271,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI !!ELSE - set(imported_implib \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF +!!IF !isEmpty(CMAKE_STATIC_TYPE) + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static(${imported_implib}) @@ -387,10 +389,10 @@ index c0097cac74..94e3b08751 100644 if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTIES - \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib} + \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} ) endif() -@@ -218,8 +283,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_target_dependencies_from_prl_file P +@@ -228,8 +294,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_target_dependencies_from_prl_file P endmacro() !!ENDIF @@ -400,7 +402,7 @@ index c0097cac74..94e3b08751 100644 !!IF !no_module_headers !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS -@@ -227,46 +291,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -237,46 +302,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" ) !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) @@ -465,7 +467,7 @@ index c0097cac74..94e3b08751 100644 endforeach() !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK) -@@ -275,16 +343,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -285,16 +354,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}) @@ -489,7 +491,7 @@ index c0097cac74..94e3b08751 100644 !!ENDIF // TEMPLATE != aux set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\") -@@ -292,10 +364,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -302,10 +375,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\") !!ENDIF @@ -502,7 +504,7 @@ index c0097cac74..94e3b08751 100644 set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED) endif() set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET) -@@ -303,17 +375,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -313,17 +386,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) @@ -524,7 +526,7 @@ index c0097cac74..94e3b08751 100644 $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT} ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET} ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED} -@@ -321,28 +393,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -331,28 +404,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) endif() @@ -569,7 +571,7 @@ index c0097cac74..94e3b08751 100644 !!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\") -@@ -353,13 +429,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -363,13 +440,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!IF !isEmpty(CMAKE_DEBUG_TYPE) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( @@ -585,7 +587,7 @@ index c0097cac74..94e3b08751 100644 _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS ) -@@ -369,13 +445,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -379,13 +456,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!IF !isEmpty(CMAKE_RELEASE_TYPE) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( @@ -601,7 +603,7 @@ index c0097cac74..94e3b08751 100644 _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS ) -@@ -383,30 +459,44 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -393,30 +470,44 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF endif() @@ -656,7 +658,7 @@ index c0097cac74..94e3b08751 100644 # Find plugin targets file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\") -@@ -420,7 +510,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -430,7 +521,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endforeach() endif() @@ -668,7 +670,7 @@ index c0097cac74..94e3b08751 100644 set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG}) !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) -@@ -428,7 +522,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -438,7 +533,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") !!ENDIF @@ -680,7 +682,7 @@ index c0097cac74..94e3b08751 100644 set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location} ) -@@ -459,16 +557,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -469,16 +568,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endif() set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE) @@ -701,7 +703,7 @@ index c0097cac74..94e3b08751 100644 ) set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS) foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}) -@@ -477,69 +575,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -487,69 +586,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endif() endforeach() !!IF !isEmpty(CMAKE_STATIC_TYPE) @@ -720,13 +722,13 @@ index c0097cac74..94e3b08751 100644 !!IF !equals(TEMPLATE, aux) !!IF !isEmpty(CMAKE_RELEASE_TYPE) -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) +!!IF !isEmpty(CMAKE_STATIC_TYPE) -+ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) !!ELSE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) +!!ENDIF // CMAKE_STATIC_TYPE + @@ -740,9 +742,9 @@ index c0097cac74..94e3b08751 100644 !!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ELSE // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC}\" \"\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) + endif() +!!ELSE // CMAKE_STATIC_TYPE if (EXISTS @@ -758,9 +760,9 @@ index c0097cac74..94e3b08751 100644 !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) !!ENDIF -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) endif() +!!ENDIF // CMAKE_STATIC_TYPE !!ENDIF // CMAKE_DEBUG_TYPE @@ -770,11 +772,11 @@ index c0097cac74..94e3b08751 100644 !!IF !isEmpty(CMAKE_DEBUG_TYPE) -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) +!!IF !isEmpty(CMAKE_STATIC_TYPE) -+ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) !!ELSE - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD +!!ENDIF // CMAKE_STATIC_TYPE @@ -790,23 +792,23 @@ index c0097cac74..94e3b08751 100644 - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" ) !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ELSE // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) +!!ELSE // CMAKE_STATIC_TYPE if (EXISTS !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" -@@ -552,7 +653,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -562,7 +664,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF -- _populate_$${CMAKE_MODULE_NAME}_target_properties(Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) -+ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) endif() !!ENDIF // CMAKE_STATIC_TYPE -@@ -562,19 +663,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -572,19 +674,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF // CMAKE_DEBUG_TYPE !!ELSE // TEMPLATE != aux @@ -1008,5 +1010,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64-opengl/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index 39553428..a3ea8d8c 100644 --- a/qt5-base/mingw-w64-opengl/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/qt5-base/mingw-w64-opengl/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From eef6cc9b95d30179b2db3f655d542db7344bb405 Mon Sep 17 00:00:00 2001 +From e0a0aa6f1ae106e0ffda362a7a22c8dd3f41acb3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 22/33] Adjust linker flags for static build with @@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644 +unset(_isExe) +!!ENDIF -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0023-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-opengl/0023-Use-correct-pkg-config-static-flag.patch index f3405397..74f2ba2c 100644 --- a/qt5-base/mingw-w64-opengl/0023-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64-opengl/0023-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From a36b39ed36b3c584bdd82cf31ea5d1db0228e743 Mon Sep 17 00:00:00 2001 +From ce7eb8c86dd0a1b7534067df6ec3fb6b408fdcc4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 23/33] Use correct pkg-config --static flag @@ -8,10 +8,10 @@ Subject: [PATCH 23/33] Use correct pkg-config --static flag 1 file changed, 3 insertions(+) diff --git a/configure.pri b/configure.pri -index 927fcbe132..ab5e1088b3 100644 +index 5477c264eb..6d117f4c4f 100644 --- a/configure.pri +++ b/configure.pri -@@ -350,6 +350,9 @@ defineTest(qtConfTest_detectPkgConfig) { +@@ -369,6 +369,9 @@ defineTest(qtConfTest_detectPkgConfig) { qtLog("Found pkg-config from path: $$pkgConfig") } } @@ -22,5 +22,5 @@ index 927fcbe132..ab5e1088b3 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-opengl/0024-Fix-macro-invoking-moc-rcc-and-uic.patch index 2c7c89c2..a3f2eb87 100644 --- a/qt5-base/mingw-w64-opengl/0024-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/qt5-base/mingw-w64-opengl/0024-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From 8d11fcd322083c7ed3277df0931319a0f082fe51 Mon Sep 17 00:00:00 2001 +From ce0f25c8d3725c9c65874c46a169a9581d5c2fcc Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 24/33] Fix macro invoking moc, rcc and uic @@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake -index 78b99f5bfe..d383b4e4d8 100644 +index 0f006fe1e3..1db4bed272 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target @@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0025-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-opengl/0025-Ignore-errors-about-missing-feature-static.patch index 4e56453a..d8d6d587 100644 --- a/qt5-base/mingw-w64-opengl/0025-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64-opengl/0025-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From d7094ac797963aabfd2f09402fbdab1730ace836 Mon Sep 17 00:00:00 2001 +From 2c8b96ba9881f3e26bfd6f191b69186c463e9991 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 25/33] Ignore errors about missing feature static @@ -10,10 +10,10 @@ Not sure why this error occurs, let's hope for the best 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf -index 0c6c10dded..54c4b568c1 100644 +index 8a7c9c28d3..003a694f44 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf -@@ -141,5 +141,5 @@ defineTest(qtConfig) { +@@ -143,5 +143,5 @@ defineTest(qtConfig) { contains(QT.$${module}.disabled_features, $$1): \ return(false) } @@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0026-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-opengl/0026-Enable-and-fix-use-of-iconv.patch index 945dbc91..fae9949b 100644 --- a/qt5-base/mingw-w64-opengl/0026-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64-opengl/0026-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 5eb8a0d8bdeb9d9a332d730a19be663c00f4994b Mon Sep 17 00:00:00 2001 +From b2969090dbc4f3db4964541a31a8ce69c5998d2d Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 26/33] Enable and fix use of iconv @@ -74,5 +74,5 @@ index b7eefb58c8..fef7ac57de 100644 }, "icu": { -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0027-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-opengl/0027-Ignore-failing-pkg-config-test.patch index 8fb9a3fb..0feaeb05 100644 --- a/qt5-base/mingw-w64-opengl/0027-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64-opengl/0027-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From dd798cb73309229779ff60e74a31eb8711e80833 Mon Sep 17 00:00:00 2001 +From 436242b03a054ab2699b629d819a807f37e152c3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 27/33] Ignore failing pkg-config test @@ -9,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best 1 file changed, 1 deletion(-) diff --git a/configure.json b/configure.json -index 80e15ce156..7a45887ba4 100644 +index 36545a593b..087c2f6419 100644 --- a/configure.json +++ b/configure.json -@@ -725,7 +725,6 @@ +@@ -728,7 +728,6 @@ "pkg-config": { "label": "Using pkg-config", "autoDetect": "!config.darwin && !config.win32", @@ -21,5 +21,5 @@ index 80e15ce156..7a45887ba4 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-opengl/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch index 4b5cec1c..7103fb12 100644 --- a/qt5-base/mingw-w64-opengl/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64-opengl/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From 0c03c5c9926209c162c75e14713863be8d3da08a Mon Sep 17 00:00:00 2001 +From 22a94d0575482106bd10c562f35b04f13781cc09 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 28/33] 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 7f42fbe09e..e27428c0f2 100644 +index d7c9413290..3026318a70 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -393,6 +393,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) @@ -25,7 +25,7 @@ index 7f42fbe09e..e27428c0f2 100644 int libidx = 0, fwidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 4f1a4344df..32a1ccbbf9 100644 +index 17592c2492..26f3f5cd82 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -87,6 +87,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) @@ -39,5 +39,5 @@ index 4f1a4344df..32a1ccbbf9 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0029-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64-opengl/0029-Hardcode-linker-flags-for-platform-plugins.patch index 651ea823..13670f4e 100644 --- a/qt5-base/mingw-w64-opengl/0029-Hardcode-linker-flags-for-platform-plugins.patch +++ b/qt5-base/mingw-w64-opengl/0029-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From cdfab1e716f840d0f1db934246219865054572b7 Mon Sep 17 00:00:00 2001 +From 96aed122b16085b36ffe3c369f858c39f7691137 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 29/33] Hardcode linker flags for platform plugins @@ -149,5 +149,5 @@ index 174bc7b609..285d90c6d3 100644 include(windows.pri) -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0030-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64-opengl/0030-Fix-linking-against-static-plugins-with-qmake.patch index 32b22cc5..994f4ca9 100644 --- a/qt5-base/mingw-w64-opengl/0030-Fix-linking-against-static-plugins-with-qmake.patch +++ b/qt5-base/mingw-w64-opengl/0030-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From b212a375e31c52e890eb11b45603d2a3997d4731 Mon Sep 17 00:00:00 2001 +From 5af3c721d89c0008e8bbefa4dbe60ea3ddce4b3e Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 30/33] Fix linking against static plugins with qmake @@ -33,5 +33,5 @@ index d6299d8eed..5311748953 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.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0031-Disable-hardware-randomizer-for-32-bit.patch b/qt5-base/mingw-w64-opengl/0031-Disable-hardware-randomizer-for-32-bit.patch index ad5f3437..f0048681 100644 --- a/qt5-base/mingw-w64-opengl/0031-Disable-hardware-randomizer-for-32-bit.patch +++ b/qt5-base/mingw-w64-opengl/0031-Disable-hardware-randomizer-for-32-bit.patch @@ -1,4 +1,4 @@ -From 7d7d9c565af36b4b5fbb9628edd03310a221c70a Mon Sep 17 00:00:00 2001 +From 5d5e7070268d2ce1e9df60754dbbec218a82974b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 26 May 2018 03:47:14 +0200 Subject: [PATCH 31/33] Disable hardware randomizer for 32-bit @@ -19,7 +19,7 @@ during RTL pass: ira 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp -index 90df8653a7..50725dc5cb 100644 +index bf01b7ae2a..0663949352 100644 --- a/src/corelib/global/qrandom.cpp +++ b/src/corelib/global/qrandom.cpp @@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando @@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644 #else return false; -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch b/qt5-base/mingw-w64-opengl/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch index 5d50a4f0..fbdd0fb0 100644 --- a/qt5-base/mingw-w64-opengl/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch +++ b/qt5-base/mingw-w64-opengl/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch @@ -1,4 +1,4 @@ -From 85670b69fe04b78bb9b43b490c9a91ef6d79a226 Mon Sep 17 00:00:00 2001 +From 7b32e9b9f45a8fd6e1b2a8ac9a70ab68741f370f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 3 Feb 2019 14:34:42 +0100 Subject: [PATCH 32/33] Prevent static build to prefer dynamic libraries @@ -10,7 +10,7 @@ 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 94eb012b81..96ea2554ec 100644 +index 9be4fb6f1f..6a006b3586 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -577,12 +577,12 @@ defineTest(qtConfResolveLibs) { @@ -33,5 +33,5 @@ index 94eb012b81..96ea2554ec 100644 lcan += $${lib}.lib } -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/qt5-base/mingw-w64-opengl/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch index 85c2d9bf..3e2bb010 100644 --- a/qt5-base/mingw-w64-opengl/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch +++ b/qt5-base/mingw-w64-opengl/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch @@ -1,12 +1,13 @@ -From a3f19f84f5f7776ec509c84fb10cb9609c0c67fe Mon Sep 17 00:00:00 2001 +From a21352b369e9218d49e0f4e29ae30a5a58566953 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 24 Jun 2019 13:51:02 +0200 Subject: [PATCH 33/33] Prevent 'Cannot find feature windows_vulkan_sdk' +See https://bugreports.qt.io/browse/QTBUG-76660 --- - mkspecs/common/windows-vulkan.conf | 2 +- - mkspecs/features/win32/windows_vulkan_sdk.prf | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + mkspecs/common/windows-vulkan.conf | 2 +- + mkspecs/features/qmake_use.prf | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mkspecs/common/windows-vulkan.conf b/mkspecs/common/windows-vulkan.conf index da061422dc..a5a8ec68d2 100644 @@ -16,19 +17,21 @@ index da061422dc..a5a8ec68d2 100644 -load(windows_vulkan_sdk) +load(win32/windows_vulkan_sdk) QMAKE_LIBS_VULKAN = -diff --git a/mkspecs/features/win32/windows_vulkan_sdk.prf b/mkspecs/features/win32/windows_vulkan_sdk.prf -index 6c08e28fe9..a80b0602a8 100644 ---- a/mkspecs/features/win32/windows_vulkan_sdk.prf -+++ b/mkspecs/features/win32/windows_vulkan_sdk.prf -@@ -1,7 +1,7 @@ - isEmpty(QMAKE_INCDIR_VULKAN) { - # Pick up the VULKAN_SDK env var set by the LunarG SDK so that the Vulkan - # headers are found out-of-the-box on typical Windows setups. -- QMAKE_INCDIR_VULKAN = $$(VULKAN_SDK)\\include -+ # QMAKE_INCDIR_VULKAN = $$(VULKAN_SDK)/include +diff --git a/mkspecs/features/qmake_use.prf b/mkspecs/features/qmake_use.prf +index 64faa4f215..f899792e4e 100644 +--- a/mkspecs/features/qmake_use.prf ++++ b/mkspecs/features/qmake_use.prf +@@ -15,7 +15,9 @@ for(ever) { + error("Library '$$lower($$replace(nu, _, -))' is not defined.") - # Do not export the include dir but resolve it on every qmake call. - QMAKE_EXPORT_INCDIR_VULKAN = - + DEFINES += $$eval(QMAKE_DEFINES_$${nu}) +- INCLUDEPATH += $$eval(QMAKE_INCDIR_$${nu}) ++ incdir = $$eval(QMAKE_INCDIR_$${nu}) ++ !contains(QMAKE_DEFAULT_INCDIRS, $$incdir): \ ++ INCLUDEPATH += $$incdir + } + LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD) + for (nu, LD_USES) { -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-opengl/PKGBUILD b/qt5-base/mingw-w64-opengl/PKGBUILD index 7fa95d73..9fe9ea22 100644 --- a/qt5-base/mingw-w64-opengl/PKGBUILD +++ b/qt5-base/mingw-w64-opengl/PKGBUILD @@ -32,7 +32,7 @@ isNoOpenGL() { } pkgname=mingw-w64-qt5-base-opengl -pkgver=5.13.0 +pkgver=5.13.1 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 @@ -88,40 +88,40 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0031-Disable-hardware-randomizer-for-32-bit.patch' '0032-Prevent-static-build-to-prefer-dynamic-libraries.patch' '0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch') -sha256sums=('ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe' - '2df58c3c5350a7b52ed9a19b23359e8a33644012bd529fd31a42afca08a7de33' - '58473061f71f210a8344581cd5654bb6e9625cad90e63cf1f9dca063d14f187b' - '161e3e3dec7904a889bfe90bd707c00f8e2f471cde0ba7803ebd7997fc84878c' - '11b0bbb41bf8f502932f0d8d79e8470654b6adeaaec63de247d044c695e455b8' - '556c1b413d079e6f86974a576f3052645fd5919003fe38056f38a66146cc8c6d' - 'f59764fa27a9d17f4651f7745416d30570d68b11813f4bc132506213a859e0c0' - 'c9e4f335c8d0cf53f4ecff9b6642d34d4794b9fbd75a2fe7f4219f908e998b43' - 'c11a3f2354a8c0b8e12890e09c321ac486c29f32a2702c3d123cd51b49f8152e' - 'cdd71e7ea046327502872da3657132f276159f7377626a41b1a592a8aa2a435f' - '002780bf246a151763fb970234bffc9bb6f82a5e6b3c99641c455a650fad9cd6' - 'e6b535f1959a1cc5b27aefd3b69f05393d0631bd384c946da278e61f1bce6da9' - '56b4695cd46189d297f8583f5d130ef2ed2a91f96ccef76d4d70b59a52da1a6e' - '1f55fbf4a5d3dfbe7a2a3f282f0e393e8c88a5b982c694cdaf557aa5508d4be8' - '39b0c2de05cf7f51a513fe555520d80cc8a22119c4e3b245459ee486f88d902b' - '9a0714b960e82e723828bd18c0bd3a722f58eacb058960aed2e9fcbe4b8d2537' - '94dc91c13b5876d05348717b94f0bee6eca3470852e4b0a99f3d5768ee09ec6c' - '6129e5bb57e18ab064fbc9c15b7708368bc93e65b0c16ec1c83708f01e2862f1' - 'ae3cc5e48f69bcb065d919ea1ff6cd4e8216cff348348675dc0932887e62d2c8' - '1bf5cbfeab7139e1af66909e9359ed051b02d335cd032e1d87539f7a46974c09' - 'e8bceae99d8b6a802592fb7476ac68f2f015cbca0dc38959076c5029f63d0f23' - 'b491f47044b2ea161ec9881d7211ededfd1b3481f54ca93381498a50aebd3795' - '3dbb78c2ec5d3b2f33d5545de15da2ee2895978e98d35a677eaa1449e592cf3c' - '99782fd0b3cb20f2ce5425607f5f6b909ecaefcd8e038738c19d76ae3dc43ab6' - '0ce174399229425fc1f9fac6e27dc9fc7b04dd4eb4770f471fb62244368e6e64' - '365459aba005e00fb19cf0fbeb42f563d36b0b7ac9737ea981f4f4034af6e229' - '486c27a6a56140f6f43665b79b960dafb93d1d48a2d4b5a0de330f3e55685cf8' - '3f4dbd1417a63d04e5e938a37b5a614940d19c318aeeb2de43c126804a509053' - 'ca721a40d0be358baa31233b0d9db8ee70483dc25dda96dbdb080158e90200fb' - '2ba848d3a4e2a3230ee70473fdd7adb6aadb021fea2f09b7871033f281425855' - '6cff295c7011ce53319f35749d807cc6b0c3596ae92d9c36e0eb2cecbafd182e' - '45aae3d21e88cc0ac9e008cd0cc98e3178c2319d0aef726677555866c3bd4b59' - '6d661273b5f6c61c02dd0a0d3b4e7c5788646b056ba7aa3cbad125c84199ffc5' - '7e42f2b917e18dfc22e9f4fb7d7d5c1717157e9746fdaf25b55217b0b78d87be') +sha256sums=('110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab' + '52f473398f93d9446a22ddd806d70ed3c530e4592013b0070f55fa6cb5dd024f' + 'a88f6a3246993a46ddda334f0b0a0f8969be3a4420fff17fe810399ab709fd4a' + 'da99200b82fd866b950de2fc5a0e633af12cce1b86168fdb5d91a269437af80c' + 'd1c962fdcf6974da877c6c94083f9a4c32b3565faa09b92fe4045df97add7fc2' + '704bf70f29fcd19863fdb0d1a5be62b4fa9de9c8e0bdc5b9cea4a7ed2def0908' + '560c2ad8dc492cd512da18ec66f5dd28892b589810f0e1de436a5e94fd28a52c' + 'b106f03cc8976ece37cbd3095707ae6d6e41b62e90d0ae6d34f96ebd8eb62a5a' + 'acaa96d5354c4c7bac6009a78e276b2f756c5557fb9016449af983f5cac896b1' + 'dc2ee63858c9b8e46a065fb430fb4563448e3d5b493c425939085c3290e1987d' + 'cddf9ff3f26661142fe9f895fde0ab587639b4bb8d6279e8de2e201e6f637cbf' + 'd9271e94b596bfdc2901af1ebd8a8284ef421e7a99d46dd3c65daed8a121d6d2' + 'f073aaf27b8b089cff3d3f54bec0e38229deaa999aff2dcc203656f8b7994cb6' + 'f6ef098372e051e234d979bd5f5467b81d89b2f803d4316f64564e16e12cbb52' + 'b001fc1b29d6b3db975d417d1ad9746fd0cabd7692b12a35d473399951f75111' + 'f9dda213747f49c13414a89a5ac3a57064a06798e92106cc3f2f227d5674450d' + 'a49459c9ed2a7fc29a82a94ab43459ff510c6763da73da46ccae5d51ff1f16bc' + 'e25f22a835b9e8ad12aa869222259024fff3d26bf9fe05ce4cc8d0f2f6f4a5e6' + '9940d363b3f8dc10b0151845711ba445c98e850c9fe413f52abb7f8c84eb9b50' + 'd068d378b108ebe4dc645a7cacb89c69acd6b06346bcb0b47563e8cdb9f60c46' + 'e1d4f534beb22b08cc9b70163a871281723aff19a14911f25f522c2a31de944e' + 'e7584630ea69fc8c4e937106268cbf38258550cb26d33a6a38feea0a71aa6edc' + '6193e9b1baa63819dca331f9a62a483c50150ee0fb64e1199b0c1fd3c6388ac3' + '473101992df6f30fb50b2a0be45e55f2391021c01bc2bdf6a97fd7d3067f8fe6' + '809214ea4afccba045c7dd41902b160cf5ec7e4a501457b79b0f51def73e6de4' + '565a7b7aa93c8fd57cc4e6da69246110cce82663718078b8d08952a2c4038aac' + 'a4347a60524b83a77c82aaa0502d8561dc9fb8012d676073a4211100404309ad' + '392608b8d6cf513f4e67ef1748e0b92e33808a16670db6346974ebc62977f762' + 'b74e5960f131866c3fb74fc756da9574e0d03227044a8b80ad7ad6716777035c' + '9dd9393ea601eee07b23222278369909291f1077ea7a14a790260f7b7a8da4c3' + '6ac3bf6b0c447804f8a3b2acebe7e432e2f2dfc6180501ff1a96d0174e4edbe8' + '5c37923453bc13b06a37f9e916883516c83fdcd3dcae893beb97d2b52e6b77df' + '536cd9405a0a7a825768388f9e761e8c257e7e6e64406c9a3cce3c9cf1f48474' + 'a0e20cc3bc60f9b7a3a7281b2f778362ce7cdb16d89478039f1c76896b3383bf') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -333,6 +333,19 @@ package() { "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5WindowsUIAutomationSupport* \ "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5VulkanSupport* \ "${pkgdir}/usr/${_arch}/lib/"libQt5Bootstrap* \ + rm -r \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5AccessibilitySupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5DeviceDiscoverySupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5EdidSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5EventDispatcherSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5FbSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5FontDatabaseSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5PlatformCompositorSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5ThemeSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5WindowsUIAutomationSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5VulkanSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5Bootstrap" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5BootstrapDBus" # ensure config files don't conflict with shared version pushd "${pkgdir}/usr/${_arch}/lib/cmake" @@ -393,6 +406,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + # replace library path in *.prl files so it points to the installed location and not the build directory find "${pkgdir}/usr/${_arch}/lib" \( -type f -name '*.prl' -o -name '*.pc' \) -exec sed -i -e "s:${PWD%/*}/build-${_arch}/lib:/usr/${_arch}/lib:g" {} \; 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 a6cee113..6b13408f 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 07a334d39698cc7d2826ed1b5b6cb9b67dd4def8 Mon Sep 17 00:00:00 2001 +From a378fa39cd0e8100c8c3ee0a5906868663158bbf Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with @@ -161,5 +161,5 @@ index 5de482f23b..3c3d22c699 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.22.0 +2.23.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 fe6205f1..353bce3a 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 2a4db9590232cb56102955d86e21e3c2482b28cf Mon Sep 17 00:00:00 2001 +From 1e4ae2deeb92c2bff530bf77e02d9409d47b95cb Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL @@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64-static/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 5109261f..d10014a9 100644 --- a/qt5-base/mingw-w64-static/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64-static/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From abcf04e70f4f3e8a0a7a584afcf976e209307265 Mon Sep 17 00:00:00 2001 +From dc9fb928edeae31a253b27dc6536117b1ec3ed0d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 03/33] 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.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0004-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64-static/0004-Make-sure-.pc-files-are-installed-correctly.patch index 7a73127b..fdb82a4e 100644 --- a/qt5-base/mingw-w64-static/0004-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64-static/0004-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 3887b9693805365272de6101eab5c332862960e3 Mon Sep 17 00:00:00 2001 +From 7d3c1a5d57a996c8eaef937486df04ad0c2559cd Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 04/33] Make sure *.pc files are installed correctly @@ -10,10 +10,10 @@ Subject: [PATCH 04/33] Make sure *.pc files are installed correctly 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index b634ec622b..aac53cd0ea 100644 +index a45b676d5f..6065ca4c77 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3240,7 +3240,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index b634ec622b..aac53cd0ea 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3255,7 +3255,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3265,7 +3265,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) if(fixify) { if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR").toQString()); @@ -49,7 +49,7 @@ index 350ebd377a..d0c234b864 100644 void writePkgConfigFile(); // for pkg-config diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 16f9361d13..d9887cd36d 100644 +index 266bae7e64..8222854cfc 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -753,7 +753,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) @@ -62,5 +62,5 @@ index 16f9361d13..d9887cd36d 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0005-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64-static/0005-Don-t-add-resource-files-to-LIBS-parameter.patch index 37bf7b35..8442eeac 100644 --- a/qt5-base/mingw-w64-static/0005-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64-static/0005-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From 2ebc0b00f1b3297e1f88d271123df7ecb0fbd955 Mon Sep 17 00:00:00 2001 +From cd4400120aa04adcc40f36f29ae395589a511409 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 05/33] Don't add resource files to LIBS parameter @@ -11,10 +11,10 @@ like .obj/debug/Qt5Cored_resource_res.o 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp -index de7363e51b..b2b9d01799 100644 +index 2175841264..c565d44e67 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp -@@ -209,7 +209,7 @@ void MingwMakefileGenerator::init() +@@ -192,7 +192,7 @@ void MingwMakefileGenerator::init() processVars(); @@ -24,5 +24,5 @@ index de7363e51b..b2b9d01799 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0006-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64-static/0006-Prevent-debug-library-names-in-pkg-config-files.patch index 9ff893ab..d76b7978 100644 --- a/qt5-base/mingw-w64-static/0006-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64-static/0006-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 00be29ae27f1954f8d9c7ca2f47c1d18f38e96b8 Mon Sep 17 00:00:00 2001 +From 46d434d6d978b96beae9493ea638d96065ee968f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 06/33] 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 aac53cd0ea..fedbaaf601 100644 +index 6065ca4c77..8a47d584c3 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3254,6 +3254,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (dot != -1) ret = ret.left(dot); } @@ -29,5 +29,5 @@ index aac53cd0ea..fedbaaf601 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0007-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64-static/0007-Fix-linking-against-shared-static-libpng.patch index f6892d8c..1591064b 100644 --- a/qt5-base/mingw-w64-static/0007-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64-static/0007-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From 6b429798b0e3eddc7e5c857cc3e5b9d7f70aa998 Mon Sep 17 00:00:00 2001 +From 41f5e197d8624e713d48a5a800de3211ba7df7e5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 07/33] Fix linking against shared/static libpng @@ -26,5 +26,5 @@ index 6280b4dfa2..36325920cd 100644 ], "use": [ -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0008-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64-static/0008-Fix-linking-against-static-D-Bus.patch index d0e9ce41..a4725b1d 100644 --- a/qt5-base/mingw-w64-static/0008-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64-static/0008-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From f7f14b714ac258239ba7d56aad81352ae013c299 Mon Sep 17 00:00:00 2001 +From f6e638c4058335603797e7cd451fc71e89866b7e Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 08/33] Fix linking against static D-Bus @@ -9,7 +9,7 @@ Subject: [PATCH 08/33] Fix linking against static D-Bus 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.json b/configure.json -index 7f3018ed23..9d8e93a227 100644 +index af55bb6fd2..370c27af5b 100644 --- a/configure.json +++ b/configure.json @@ -187,18 +187,23 @@ @@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644 # include #else -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64-static/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index 36711fdf..a0dbe248 100644 --- a/qt5-base/mingw-w64-static/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/qt5-base/mingw-w64-static/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 663130ef2c1188a101b3ff1b88ccfe07712f628b Mon Sep 17 00:00:00 2001 +From b1d7eb0ed7121c1ec287b68c183e185836069057 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 09/33] Don't try to use debug version of D-Bus library @@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.json b/configure.json -index 9d8e93a227..80e15ce156 100644 +index 370c27af5b..36545a593b 100644 --- a/configure.json +++ b/configure.json @@ -200,7 +200,7 @@ @@ -25,5 +25,5 @@ index 9d8e93a227..80e15ce156 100644 }, "condition": "config.win32 && features.shared" -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0010-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64-static/0010-Fix-linking-against-static-freetype2.patch index 027fec2a..a0b99788 100644 --- a/qt5-base/mingw-w64-static/0010-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64-static/0010-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From c75a87b8378987e9a63235984021377755418ba1 Mon Sep 17 00:00:00 2001 +From 4bc1016e6268e57a5b8c9c3ae067166e41d10420 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 10/33] Fix linking against static freetype2 @@ -26,5 +26,5 @@ index 36325920cd..972f9914ea 100644 { "libs": "-lfreetype" } ], -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-harfbuzz.patch index f07979b5..950e2992 100644 --- a/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From 4f637a1ae1182f9327cc5fd198961e906cff59eb Mon Sep 17 00:00:00 2001 +From 41de800407436106116940c9da87841f01322b14 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 11/33] Fix linking against static harfbuzz @@ -25,5 +25,5 @@ index 972f9914ea..894c10259d 100644 }, "imf": { -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-pcre.patch index 36514aa4..33b6bb9f 100644 --- a/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From 3fccf1f581659113ae325f5192c8d6870c894c84 Mon Sep 17 00:00:00 2001 +From a17a279ab36a4f71bbe63ada089d85fc6789a7b5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 12/33] Fix linking against static pcre @@ -24,5 +24,5 @@ index bdaa2d3243..90f8250c03 100644 #include -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0013-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64-static/0013-Fix-linking-against-shared-static-MariaDB.patch index b243cd9a..e627daeb 100644 --- a/qt5-base/mingw-w64-static/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64-static/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From 7ea90aaf596477d79194673de9fb4b8076883186 Mon Sep 17 00:00:00 2001 +From 5bb7b2f2d9c9cc02dc064c8b64b6a10a15ab0d22 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 13/33] 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.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-PostgreSQL.patch index 41d712cb..7304961e 100644 --- a/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From e9076f7d190ce29321102ce695dbd105cccf14f7 Mon Sep 17 00:00:00 2001 +From 638327519b9b04f3c105280f49f29e509c06a9ce Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 14/33] Fix linking against shared/static PostgreSQL @@ -24,5 +24,5 @@ index babd0465ce..b4b3bdec6b 100644 ] }, -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0015-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-static/0015-Rename-qtmain-to-qt5main.patch index 1c14b162..fad58795 100644 --- a/qt5-base/mingw-w64-static/0015-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64-static/0015-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 5eb2e0e33778a15ff05a2891e6752af573bca2e5 Mon Sep 17 00:00:00 2001 +From a612704b7c2144f2074f7b98ceaed47aa8470dce Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 15/33] Rename qtmain to qt5main @@ -25,10 +25,10 @@ index 5208d22bd6..1a058b787f 100644 QMAKE_IDL = $${CROSS_COMPILE}widl QMAKE_LIB = $${CROSS_COMPILE}ar -rc diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 2ab7775fea..6bc621ce27 100644 +index 376a7ded5d..4fe2ef2326 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -234,8 +234,8 @@ mac { +@@ -270,8 +270,8 @@ mac { CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll mingw { @@ -68,5 +68,5 @@ index 9cb6ab0c59..4327ba365e 100644 CONFIG += static -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0016-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64-static/0016-Enable-rpath-for-build-tools.patch index 59595f2c..830542ac 100644 --- a/qt5-base/mingw-w64-static/0016-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64-static/0016-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From a2a8aa60a4385fff2770e93e0a6054935905bef7 Mon Sep 17 00:00:00 2001 +From 2ed621b725a48cf41a4fd39cbb0723de1724b519 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 16/33] Enable rpath for build tools @@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644 INSTALLS += target -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0017-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64-static/0017-Use-system-zlib-for-build-tools.patch index c9a01d9c..6a8df34f 100644 --- a/qt5-base/mingw-w64-static/0017-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64-static/0017-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 04a04e8c11bf4ae71d4ed0d6b641b2b2ebacc565 Mon Sep 17 00:00:00 2001 +From 0e4aad7814d0b407d92b34e8fcc9fba70d9bd765 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 17/33] Use system zlib for build tools @@ -23,5 +23,5 @@ index 83e44ff9a4..4734623936 100644 } else { CONFIG += no_core_dep -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0018-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64-static/0018-Merge-shared-and-static-library-trees.patch index 45ea3d0d..27015bd4 100644 --- a/qt5-base/mingw-w64-static/0018-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64-static/0018-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 8d8cfe560697425a01b786aee113082495d6c85f Mon Sep 17 00:00:00 2001 +From 24a7b52b579fb5f0787d9738668841392c8bd649 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 18/33] Merge shared and static library trees @@ -10,15 +10,15 @@ Allow installation of shared and static build in the same prefix mkspecs/features/device_config.prf | 9 ++++++++- mkspecs/features/qt.prf | 17 +++++++++++++++++ mkspecs/features/spec_pre.prf | 11 ++++++++--- - qmake/generators/makefile.cpp | 9 ++++++--- + qmake/generators/makefile.cpp | 11 +++++++---- qtbase.pro | 10 ++++++++-- - 7 files changed, 73 insertions(+), 10 deletions(-) + 7 files changed, 74 insertions(+), 11 deletions(-) diff --git a/configure.pri b/configure.pri -index 81133da3d7..927fcbe132 100644 +index 7b8dee0953..5477c264eb 100644 --- a/configure.pri +++ b/configure.pri -@@ -657,7 +657,12 @@ defineTest(qtConfOutput_machineTuple) { +@@ -676,7 +676,12 @@ defineTest(qtConfOutput_machineTuple) { defineTest(qtConfOutput_commitOptions) { # qdevice.pri needs to be written early, because the compile tests require it. @@ -32,7 +32,7 @@ index 81133da3d7..927fcbe132 100644 } # type (empty or 'host'), option name, default value -@@ -1350,3 +1355,12 @@ defineTest(createConfigStatus) { +@@ -1369,3 +1374,12 @@ defineTest(createConfigStatus) { QMAKE_POST_CONFIGURE += \ "createConfigStatus()" @@ -46,7 +46,7 @@ index 81133da3d7..927fcbe132 100644 + CONFIG += no_smart_library_merge +} diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf -index 9df99b8648..9c1dd6a735 100644 +index 0e41b825ec..4c4b6dd12a 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -1,5 +1,16 @@ @@ -137,10 +137,10 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index fedbaaf601..fd3b5c405a 100644 +index 8a47d584c3..b158bb9b52 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3247,6 +3247,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3257,6 +3257,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -150,19 +150,22 @@ index fedbaaf601..fd3b5c405a 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3421,9 +3424,9 @@ MakefileGenerator::writePkgConfigFile() +@@ -3433,11 +3436,11 @@ MakefileGenerator::writePkgConfigFile() t << endl; // requires -- const QString requires = project->values("QMAKE_PKGCONFIG_REQUIRES").join(' '); -- if (!requires.isEmpty()) { -- t << "Requires: " << requires << endl; +- const QString requiresString = project->values("QMAKE_PKGCONFIG_REQUIRES").join(' '); +- if (!requiresString.isEmpty()) { +- t << "Requires: " << requiresString << endl; + t << "Requires:"; -+ for (const auto &required : project->values("QMAKE_PKGCONFIG_REQUIRES")) { ++ const auto pkgconfigRequires = project->values("QMAKE_PKGCONFIG_REQUIRES"); ++ for (const auto &required : pkgconfigRequires) { + t << (project->isActiveConfig("staticlib") ? QStringLiteral(" Static") : QStringLiteral(" ")) << required.toQString(); } - +- t << endl; + } + diff --git a/qtbase.pro b/qtbase.pro index c0ce0972ef..5a2deaf31d 100644 --- a/qtbase.pro @@ -199,5 +202,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0019-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64-static/0019-Use-.dll.a-as-import-lib-extension.patch index b560fb61..013911c8 100644 --- a/qt5-base/mingw-w64-static/0019-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64-static/0019-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From 0f3da1317f28a882c705fcf3f13c419601b96467 Mon Sep 17 00:00:00 2001 +From ad61d1712db4cdd3389e808d46fbfcb26a2509e3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 19/33] Use *.dll.a as import lib extension @@ -12,10 +12,10 @@ g++-win32.conf 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 6bc621ce27..226dc93c4d 100644 +index 4fe2ef2326..7cb27b716a 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -245,8 +245,9 @@ mac { +@@ -281,8 +281,9 @@ mac { CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl } else { @@ -57,7 +57,7 @@ index bbada46c29..d6299d8eed 100644 } } diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index d9887cd36d..4f1a4344df 100644 +index 8222854cfc..17592c2492 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -80,9 +80,13 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg) @@ -92,5 +92,5 @@ index d9887cd36d..4f1a4344df 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64-static/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index 10946b0f..2255c51f 100644 --- a/qt5-base/mingw-w64-static/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/qt5-base/mingw-w64-static/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From 720bde854fa9d143d0ad8db4794a0dd0efb173a2 Mon Sep 17 00:00:00 2001 +From 890e47124906afd97de44bc40520338bde5dc5d3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 20/33] Pull dependencies of static libraries in CMake modules @@ -21,12 +21,12 @@ e.g. to use QMAKE_PRL_LIBS instead of QMAKE_PRL_LIBS_FOR_CMAKE. See https://github.com/Martchus/PKGBUILDs/issues/86#issuecomment-476840055 for further details on 2. --- - .../data/cmake/Qt5BasicConfig.cmake.in | 172 ++++++++++++++---- + .../data/cmake/Qt5BasicConfig.cmake.in | 192 ++++++++++++------ .../data/cmake/Qt5PluginTarget.cmake.in | 11 +- - 2 files changed, 139 insertions(+), 44 deletions(-) + 2 files changed, 136 insertions(+), 67 deletions(-) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 705e0a3c93..c0097cac74 100644 +index d4fd057682..838279515c 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -53,10 +53,18 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura @@ -40,24 +40,24 @@ index 705e0a3c93..c0097cac74 100644 get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" ABSOLUTE) if(EXISTS \"${prl_file_location}\") - file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS[ \\t]*=\") + file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE[ \\t]*=\") + if(NOT _prl_strings) -+ message(WARNING \"Prl file for Qt 5 module $${CMAKE_MODULE_NAME} does not contain QMAKE_PRL_LIBS. Was looking at \\\"${prl_file_location}\\\".\") ++ message(WARNING \"Prl file for Qt 5 module $${CMAKE_MODULE_NAME} does not contain QMAKE_PRL_LIBS_FOR_CMAKE. Was looking at \\\"${prl_file_location}\\\".\") + return() + endif() - string(REGEX REPLACE \"QMAKE_PRL_LIBS[ \\t]*=[ \\t]*([^\\n]*)\" \"\\\\1\" _static_depends ${_prl_strings}) - string(REGEX REPLACE \"[ \\t]+\" \";\" _static_depends ${_static_depends}) - string(REGEX REPLACE \"[ \\t]+\" \";\" _standard_libraries \"${CMAKE_CXX_STANDARD_LIBRARIES}\") -@@ -68,7 +76,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura + + # file(STRINGS) replaces all semicolons read from the file with backslash semicolons. + # We need to do a reverse transformation in CMake. For that we replace all backslash +@@ -75,7 +83,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura # Handle normal libraries passed as -lfoo set(_lib \"${CMAKE_MATCH_1}\") foreach(_standard_library ${_standard_libraries}) -- if(_standard_library MATCHES \"^${_lib}(\\.lib)?$\") +- if(_standard_library MATCHES \"^${_lib}(\\\\.lib)?$\") + if(_standard_library MATCHES \"^${_lib}(\\\\.lib|\\\\.a)?$\") set(_lib_is_default_linked TRUE) break() endif() -@@ -109,11 +117,42 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura +@@ -116,6 +124,37 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura set(${lib_deps} ${_lib_deps} PARENT_SCOPE) set(${link_flags} \"SHELL:${_link_flags}\" PARENT_SCOPE) endfunction() @@ -95,71 +95,78 @@ index 705e0a3c93..c0097cac74 100644 !!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}) -+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}) - - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -@@ -121,44 +160,62 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI +@@ -129,52 +168,39 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") !!ENDIF _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) + set(_deps ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} +- ) +- set(_static_deps !!IF !isEmpty(CMAKE_STATIC_TYPE) -- ${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LIB_DEPENDENCIES} -+ ${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES} + ${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LIB_DEPENDENCIES} !!ENDIF ) + ++ # FIXME: handle IsDebugAndRelease like in official version + +!!IF !isEmpty(CMAKE_STATIC_TYPE) set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -- \"INTERFACE_LINK_LIBRARIES\" \"${_deps}\" -- \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -+ \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} !!IF !isEmpty(CMAKE_LIB_SONAME) -- \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\" -+ \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" + \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\" !!ENDIF - # For backward compatibility with CMake < 2.8.12 -- \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_deps}\" +- \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_deps};${_static_deps}\" +- ) +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES +- \"${_deps}\" ) --!!IF !isEmpty(CMAKE_STATIC_TYPE) - -+ _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_deps}\") - if(NOT CMAKE_VERSION VERSION_LESS \"3.13\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES - \"INTERFACE_LINK_OPTIONS\" \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\" +-!!IF !isEmpty(CMAKE_STATIC_TYPE) +- if(NOT "${IsDebugAndRelease}") +- set(_genex_condition \"1\") +- else() +- if("${Configuration}" STREQUAL "DEBUG") +- set(_genex_condition \"$\") +- else() +- set(_genex_condition \"$>\") +- endif() +- endif() +- +- if(_static_deps) +- set(_static_deps_genex \"$<${_genex_condition}:${_static_deps}>\") +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES +- \"${_static_deps_genex}\" +- ) +- endif() +- +- set(_static_link_flags \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\") +- if(NOT CMAKE_VERSION VERSION_LESS \"3.13\" AND _static_link_flags) +- set(_static_link_flags_genex \"$<${_genex_condition}:${_static_link_flags}>\") +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_OPTIONS +- \"${_static_link_flags_genex}\" ++ _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${Configuration}\" \"${_deps}\") ++ if(NOT CMAKE_VERSION VERSION_LESS \"3.13\") ++ set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES ++ \"INTERFACE_LINK_OPTIONS\" \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\" ) endif() +!!ELSE + set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -+ \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_deps}\" -+ \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} ++ \"INTERFACE_LINK_LIBRARIES_${Configuration}\" \"${_deps}\" ++ \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} +!!IF !isEmpty(CMAKE_LIB_SONAME) -+ \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" ++ \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\" +!!ENDIF + # For backward compatibility with CMake < 2.8.12 -+ \"IMPORTED_LINK_INTERFACE_LIBRARIES_${TARGET_CONFIG}\" \"${_deps}\" ++ \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_deps}\" + ) !!ENDIF !!IF !isEmpty(CMAKE_WINDOWS_BUILD) - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ELSE -- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+ set(imported_implib \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) - if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} -+ \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib} - ) +@@ -191,6 +217,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI endif() !!ENDIF endmacro() @@ -175,7 +182,7 @@ index 705e0a3c93..c0097cac74 100644 !!ENDIF if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) -@@ -328,13 +385,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -360,13 +395,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") @@ -193,7 +200,7 @@ index 705e0a3c93..c0097cac74 100644 !!IF !equals(TEMPLATE, aux) !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1) -@@ -349,6 +408,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -381,6 +418,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, ";")) @@ -250,7 +257,7 @@ index 705e0a3c93..c0097cac74 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}) -@@ -367,9 +476,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -399,9 +486,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private) endif() endforeach() @@ -264,13 +271,13 @@ index 705e0a3c93..c0097cac74 100644 endif() !!IF !equals(TEMPLATE, aux) -@@ -439,9 +552,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -471,9 +562,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties(Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) endif() +!!ENDIF // CMAKE_STATIC_TYPE + @@ -278,10 +285,12 @@ index 705e0a3c93..c0097cac74 100644 !!ENDIF // CMAKE_RELEASE_TYPE !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD -@@ -452,29 +567,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -484,33 +577,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) !!ENDIF // TEMPLATE != aux +-!!IF isEmpty(CMAKE_INTERNAL_MODULE) +- - file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\") - - macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) @@ -304,6 +313,8 @@ index 705e0a3c93..c0097cac74 100644 - endforeach() - endif() - +-!!ENDIF // isEmpty(CMAKE_INTERNAL_MODULE) +- - !!IF !isEmpty(CMAKE_MODULE_EXTRAS) include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\") @@ -332,5 +343,5 @@ index 5baf0fdb10..ec5f3cc437 100644 + +endif() -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0021-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-static/0021-Allow-usage-of-static-version-with-CMake.patch index 8a8dde9e..f2a8f3b6 100644 --- a/qt5-base/mingw-w64-static/0021-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64-static/0021-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From 7c539241c220ce50da61ef811daae18489b5df19 Mon Sep 17 00:00:00 2001 +From 6bdfbfedf65c6883b74ac47a4385148bbafb4438 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 21/33] Allow usage of static version with CMake @@ -12,20 +12,20 @@ installed in the same prefix via regular find_package(Qt5Core) --- mkspecs/features/create_cmake.prf | 103 +++--- - .../data/cmake/Qt5BasicConfig.cmake.in | 296 ++++++++++++------ + .../data/cmake/Qt5BasicConfig.cmake.in | 297 ++++++++++++------ .../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, 309 insertions(+), 153 deletions(-) + 7 files changed, 310 insertions(+), 153 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 -index 226dc93c4d..0e9afa4eaf 100644 +index 7cb27b716a..7d8ac191db 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -51,7 +51,7 @@ split_incpath { +@@ -65,7 +65,7 @@ split_incpath { $$QT_MODULE_INCLUDE_BASE/$${CMAKE_INCLUDE_NAME}/$$eval(QT.$${MODULE}.VERSION)/$${CMAKE_INCLUDE_NAME}) cmake_extra_source_includes.input = $$PWD/data/cmake/ExtraSourceIncludes.cmake.in @@ -34,16 +34,16 @@ index 226dc93c4d..0e9afa4eaf 100644 !build_pass:QMAKE_SUBSTITUTES += \ cmake_extra_source_includes -@@ -101,6 +101,8 @@ win32:!static:!staticlib { +@@ -115,6 +115,8 @@ win32:!static:!staticlib { } static|staticlib:CMAKE_STATIC_TYPE = true +static|staticlib:DEFAULT_QT_VARIANT_PREFIX = "Static" +else:DEFAULT_QT_VARIANT_PREFIX = "" - CMAKE_DEBUG_TYPE = - CMAKE_RELEASE_TYPE = -@@ -146,17 +148,19 @@ contains(CONFIG, plugin) { + internal_module { + CMAKE_INTERNAL_MODULE = true +@@ -182,17 +184,19 @@ contains(CONFIG, plugin) { CMAKE_PLUGIN_NAME = $$PLUGIN_CLASS_NAME win32 { @@ -67,7 +67,7 @@ index 226dc93c4d..0e9afa4eaf 100644 mac { isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib else: CMAKE_PlUGIN_EXT = .a -@@ -172,13 +176,13 @@ contains(CONFIG, plugin) { +@@ -208,13 +212,13 @@ contains(CONFIG, plugin) { } } cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in @@ -83,7 +83,7 @@ index 226dc93c4d..0e9afa4eaf 100644 INSTALLS += cmake_qt5_plugin_file return() -@@ -191,25 +195,34 @@ mod_deps = +@@ -227,25 +231,34 @@ mod_deps = lib_deps = aux_mod_deps = aux_lib_deps = @@ -122,7 +122,7 @@ index 226dc93c4d..0e9afa4eaf 100644 !isEmpty(CMAKE_STATIC_TYPE) { CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a -@@ -237,35 +250,33 @@ mac { +@@ -273,35 +286,33 @@ mac { CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a @@ -177,7 +177,7 @@ index 226dc93c4d..0e9afa4eaf 100644 !isEmpty(CMAKE_STATIC_TYPE) { CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a -@@ -285,12 +296,12 @@ mac { +@@ -321,12 +332,12 @@ mac { INSTALLS += cmake_qt5_module_files cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in @@ -192,7 +192,7 @@ index 226dc93c4d..0e9afa4eaf 100644 !build_pass:QMAKE_SUBSTITUTES += \ cmake_config_file \ -@@ -300,11 +311,29 @@ cmake_qt5_module_files.files = \ +@@ -336,11 +347,29 @@ cmake_qt5_module_files.files = \ $$cmake_config_file.output \ $$cmake_config_version_file.output @@ -223,7 +223,7 @@ index 226dc93c4d..0e9afa4eaf 100644 !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file -@@ -316,7 +345,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake +@@ -352,7 +381,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake exists($$cmake_macros_file.input) { CMAKE_MODULE_MACROS = "true" @@ -232,7 +232,7 @@ index 226dc93c4d..0e9afa4eaf 100644 cmake_macros_file.CONFIG = verbatim !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file -@@ -324,7 +353,7 @@ exists($$cmake_macros_file.input) { +@@ -360,7 +389,7 @@ exists($$cmake_macros_file.input) { cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -242,7 +242,7 @@ index 226dc93c4d..0e9afa4eaf 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 c0097cac74..94e3b08751 100644 +index 838279515c..811c11a666 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) @@ -305,7 +305,7 @@ index c0097cac74..94e3b08751 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. -@@ -148,18 +179,48 @@ if(NOT COMMAND _qt5_add_dependencies) +@@ -155,19 +186,50 @@ if(NOT COMMAND _qt5_add_dependencies) endif() endfunction() endif() @@ -319,14 +319,16 @@ index c0097cac74..94e3b08751 100644 !!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}) +-macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION +!!IF !isEmpty(CMAKE_STATIC_TYPE) -+macro(_populate_$${CMAKE_MODULE_NAME}_target_properties_static TARGET_NAME TARGET_CONFIG LIB_LOCATION IMPLIB_LOCATION) ++macro(_populate_$${CMAKE_MODULE_NAME}_target_properties_static TARGET_NAME Configuration LIB_LOCATION IMPLIB_LOCATION + IsDebugAndRelease) +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) +!!ELSE -+macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_NAME TARGET_CONFIG LIB_LOCATION IMPLIB_LOCATION) ++macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_NAME Configuration LIB_LOCATION IMPLIB_LOCATION ++ IsDebugAndRelease) +!!ENDIF -+ set_property(TARGET ${TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${TARGET_CONFIG}) ++ set_property(TARGET ${TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) + @@ -356,28 +358,28 @@ index c0097cac74..94e3b08751 100644 set(_deps ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} -@@ -169,15 +230,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI - ) +@@ -179,15 +241,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + # FIXME: handle IsDebugAndRelease like in official version !!IF !isEmpty(CMAKE_STATIC_TYPE) - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(\"${TARGET_NAME}\" PROPERTIES - \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} !!IF !isEmpty(CMAKE_LIB_SONAME) - \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" + \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\" !!ENDIF ) -- _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_deps}\") -+ _qt5_add_dependencies(\"${TARGET_NAME}\" \"${TARGET_CONFIG}\" \"${_deps}\") +- _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${Configuration}\" \"${_deps}\") ++ _qt5_add_dependencies(\"${TARGET_NAME}\" \"${Configuration}\" \"${_deps}\") if(NOT CMAKE_VERSION VERSION_LESS \"3.13\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(\"${TARGET_NAME}\" PROPERTIES \"INTERFACE_LINK_OPTIONS\" \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\" ) endif() -@@ -199,9 +260,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI +@@ -209,9 +271,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI !!ELSE - set(imported_implib \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF +!!IF !isEmpty(CMAKE_STATIC_TYPE) + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static(${imported_implib}) @@ -387,10 +389,10 @@ index c0097cac74..94e3b08751 100644 if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTIES - \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib} + \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} ) endif() -@@ -218,8 +283,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_target_dependencies_from_prl_file P +@@ -228,8 +294,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_target_dependencies_from_prl_file P endmacro() !!ENDIF @@ -400,7 +402,7 @@ index c0097cac74..94e3b08751 100644 !!IF !no_module_headers !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS -@@ -227,46 +291,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -237,46 +302,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" ) !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) @@ -465,7 +467,7 @@ index c0097cac74..94e3b08751 100644 endforeach() !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK) -@@ -275,16 +343,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -285,16 +354,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}) @@ -489,7 +491,7 @@ index c0097cac74..94e3b08751 100644 !!ENDIF // TEMPLATE != aux set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\") -@@ -292,10 +364,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -302,10 +375,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\") !!ENDIF @@ -502,7 +504,7 @@ index c0097cac74..94e3b08751 100644 set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED) endif() set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET) -@@ -303,17 +375,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -313,17 +386,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) @@ -524,7 +526,7 @@ index c0097cac74..94e3b08751 100644 $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT} ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET} ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED} -@@ -321,28 +393,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -331,28 +404,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) endif() @@ -569,7 +571,7 @@ index c0097cac74..94e3b08751 100644 !!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\") -@@ -353,13 +429,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -363,13 +440,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!IF !isEmpty(CMAKE_DEBUG_TYPE) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( @@ -585,7 +587,7 @@ index c0097cac74..94e3b08751 100644 _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS ) -@@ -369,13 +445,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -379,13 +456,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!IF !isEmpty(CMAKE_RELEASE_TYPE) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( @@ -601,7 +603,7 @@ index c0097cac74..94e3b08751 100644 _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS ) -@@ -383,30 +459,44 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -393,30 +470,44 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF endif() @@ -656,7 +658,7 @@ index c0097cac74..94e3b08751 100644 # Find plugin targets file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\") -@@ -420,7 +510,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -430,7 +521,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endforeach() endif() @@ -668,7 +670,7 @@ index c0097cac74..94e3b08751 100644 set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG}) !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) -@@ -428,7 +522,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -438,7 +533,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") !!ENDIF @@ -680,7 +682,7 @@ index c0097cac74..94e3b08751 100644 set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location} ) -@@ -459,16 +557,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -469,16 +568,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endif() set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE) @@ -701,7 +703,7 @@ index c0097cac74..94e3b08751 100644 ) set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS) foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}) -@@ -477,69 +575,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -487,69 +586,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endif() endforeach() !!IF !isEmpty(CMAKE_STATIC_TYPE) @@ -720,13 +722,13 @@ index c0097cac74..94e3b08751 100644 !!IF !equals(TEMPLATE, aux) !!IF !isEmpty(CMAKE_RELEASE_TYPE) -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) +!!IF !isEmpty(CMAKE_STATIC_TYPE) -+ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) !!ELSE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) +!!ENDIF // CMAKE_STATIC_TYPE + @@ -740,9 +742,9 @@ index c0097cac74..94e3b08751 100644 !!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ELSE // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC}\" \"\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) + endif() +!!ELSE // CMAKE_STATIC_TYPE if (EXISTS @@ -758,9 +760,9 @@ index c0097cac74..94e3b08751 100644 !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) !!ENDIF -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) endif() +!!ENDIF // CMAKE_STATIC_TYPE !!ENDIF // CMAKE_DEBUG_TYPE @@ -770,11 +772,11 @@ index c0097cac74..94e3b08751 100644 !!IF !isEmpty(CMAKE_DEBUG_TYPE) -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) +!!IF !isEmpty(CMAKE_STATIC_TYPE) -+ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) !!ELSE - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD +!!ENDIF // CMAKE_STATIC_TYPE @@ -790,23 +792,23 @@ index c0097cac74..94e3b08751 100644 - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" ) !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ELSE // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) +!!ELSE // CMAKE_STATIC_TYPE if (EXISTS !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" -@@ -552,7 +653,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -562,7 +664,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF -- _populate_$${CMAKE_MODULE_NAME}_target_properties(Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) -+ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) endif() !!ENDIF // CMAKE_STATIC_TYPE -@@ -562,19 +663,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -572,19 +674,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF // CMAKE_DEBUG_TYPE !!ELSE // TEMPLATE != aux @@ -1008,5 +1010,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64-static/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index 39553428..a3ea8d8c 100644 --- a/qt5-base/mingw-w64-static/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/qt5-base/mingw-w64-static/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From eef6cc9b95d30179b2db3f655d542db7344bb405 Mon Sep 17 00:00:00 2001 +From e0a0aa6f1ae106e0ffda362a7a22c8dd3f41acb3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 22/33] Adjust linker flags for static build with @@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644 +unset(_isExe) +!!ENDIF -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0023-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-static/0023-Use-correct-pkg-config-static-flag.patch index f3405397..74f2ba2c 100644 --- a/qt5-base/mingw-w64-static/0023-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64-static/0023-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From a36b39ed36b3c584bdd82cf31ea5d1db0228e743 Mon Sep 17 00:00:00 2001 +From ce7eb8c86dd0a1b7534067df6ec3fb6b408fdcc4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 23/33] Use correct pkg-config --static flag @@ -8,10 +8,10 @@ Subject: [PATCH 23/33] Use correct pkg-config --static flag 1 file changed, 3 insertions(+) diff --git a/configure.pri b/configure.pri -index 927fcbe132..ab5e1088b3 100644 +index 5477c264eb..6d117f4c4f 100644 --- a/configure.pri +++ b/configure.pri -@@ -350,6 +350,9 @@ defineTest(qtConfTest_detectPkgConfig) { +@@ -369,6 +369,9 @@ defineTest(qtConfTest_detectPkgConfig) { qtLog("Found pkg-config from path: $$pkgConfig") } } @@ -22,5 +22,5 @@ index 927fcbe132..ab5e1088b3 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-static/0024-Fix-macro-invoking-moc-rcc-and-uic.patch index 2c7c89c2..a3f2eb87 100644 --- a/qt5-base/mingw-w64-static/0024-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/qt5-base/mingw-w64-static/0024-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From 8d11fcd322083c7ed3277df0931319a0f082fe51 Mon Sep 17 00:00:00 2001 +From ce0f25c8d3725c9c65874c46a169a9581d5c2fcc Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 24/33] Fix macro invoking moc, rcc and uic @@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake -index 78b99f5bfe..d383b4e4d8 100644 +index 0f006fe1e3..1db4bed272 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target @@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0025-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-static/0025-Ignore-errors-about-missing-feature-static.patch index 4e56453a..d8d6d587 100644 --- a/qt5-base/mingw-w64-static/0025-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64-static/0025-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From d7094ac797963aabfd2f09402fbdab1730ace836 Mon Sep 17 00:00:00 2001 +From 2c8b96ba9881f3e26bfd6f191b69186c463e9991 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 25/33] Ignore errors about missing feature static @@ -10,10 +10,10 @@ Not sure why this error occurs, let's hope for the best 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf -index 0c6c10dded..54c4b568c1 100644 +index 8a7c9c28d3..003a694f44 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf -@@ -141,5 +141,5 @@ defineTest(qtConfig) { +@@ -143,5 +143,5 @@ defineTest(qtConfig) { contains(QT.$${module}.disabled_features, $$1): \ return(false) } @@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0026-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-static/0026-Enable-and-fix-use-of-iconv.patch index 945dbc91..fae9949b 100644 --- a/qt5-base/mingw-w64-static/0026-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64-static/0026-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 5eb8a0d8bdeb9d9a332d730a19be663c00f4994b Mon Sep 17 00:00:00 2001 +From b2969090dbc4f3db4964541a31a8ce69c5998d2d Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 26/33] Enable and fix use of iconv @@ -74,5 +74,5 @@ index b7eefb58c8..fef7ac57de 100644 }, "icu": { -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0027-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-static/0027-Ignore-failing-pkg-config-test.patch index 8fb9a3fb..0feaeb05 100644 --- a/qt5-base/mingw-w64-static/0027-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64-static/0027-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From dd798cb73309229779ff60e74a31eb8711e80833 Mon Sep 17 00:00:00 2001 +From 436242b03a054ab2699b629d819a807f37e152c3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 27/33] Ignore failing pkg-config test @@ -9,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best 1 file changed, 1 deletion(-) diff --git a/configure.json b/configure.json -index 80e15ce156..7a45887ba4 100644 +index 36545a593b..087c2f6419 100644 --- a/configure.json +++ b/configure.json -@@ -725,7 +725,6 @@ +@@ -728,7 +728,6 @@ "pkg-config": { "label": "Using pkg-config", "autoDetect": "!config.darwin && !config.win32", @@ -21,5 +21,5 @@ index 80e15ce156..7a45887ba4 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-static/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch index 4b5cec1c..7103fb12 100644 --- a/qt5-base/mingw-w64-static/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64-static/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From 0c03c5c9926209c162c75e14713863be8d3da08a Mon Sep 17 00:00:00 2001 +From 22a94d0575482106bd10c562f35b04f13781cc09 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 28/33] 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 7f42fbe09e..e27428c0f2 100644 +index d7c9413290..3026318a70 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -393,6 +393,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) @@ -25,7 +25,7 @@ index 7f42fbe09e..e27428c0f2 100644 int libidx = 0, fwidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 4f1a4344df..32a1ccbbf9 100644 +index 17592c2492..26f3f5cd82 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -87,6 +87,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) @@ -39,5 +39,5 @@ index 4f1a4344df..32a1ccbbf9 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0029-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64-static/0029-Hardcode-linker-flags-for-platform-plugins.patch index 651ea823..13670f4e 100644 --- a/qt5-base/mingw-w64-static/0029-Hardcode-linker-flags-for-platform-plugins.patch +++ b/qt5-base/mingw-w64-static/0029-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From cdfab1e716f840d0f1db934246219865054572b7 Mon Sep 17 00:00:00 2001 +From 96aed122b16085b36ffe3c369f858c39f7691137 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 29/33] Hardcode linker flags for platform plugins @@ -149,5 +149,5 @@ index 174bc7b609..285d90c6d3 100644 include(windows.pri) -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0030-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64-static/0030-Fix-linking-against-static-plugins-with-qmake.patch index 32b22cc5..994f4ca9 100644 --- a/qt5-base/mingw-w64-static/0030-Fix-linking-against-static-plugins-with-qmake.patch +++ b/qt5-base/mingw-w64-static/0030-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From b212a375e31c52e890eb11b45603d2a3997d4731 Mon Sep 17 00:00:00 2001 +From 5af3c721d89c0008e8bbefa4dbe60ea3ddce4b3e Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 30/33] Fix linking against static plugins with qmake @@ -33,5 +33,5 @@ index d6299d8eed..5311748953 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.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0031-Disable-hardware-randomizer-for-32-bit.patch b/qt5-base/mingw-w64-static/0031-Disable-hardware-randomizer-for-32-bit.patch index ad5f3437..f0048681 100644 --- a/qt5-base/mingw-w64-static/0031-Disable-hardware-randomizer-for-32-bit.patch +++ b/qt5-base/mingw-w64-static/0031-Disable-hardware-randomizer-for-32-bit.patch @@ -1,4 +1,4 @@ -From 7d7d9c565af36b4b5fbb9628edd03310a221c70a Mon Sep 17 00:00:00 2001 +From 5d5e7070268d2ce1e9df60754dbbec218a82974b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 26 May 2018 03:47:14 +0200 Subject: [PATCH 31/33] Disable hardware randomizer for 32-bit @@ -19,7 +19,7 @@ during RTL pass: ira 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp -index 90df8653a7..50725dc5cb 100644 +index bf01b7ae2a..0663949352 100644 --- a/src/corelib/global/qrandom.cpp +++ b/src/corelib/global/qrandom.cpp @@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando @@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644 #else return false; -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch b/qt5-base/mingw-w64-static/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch index 5d50a4f0..fbdd0fb0 100644 --- a/qt5-base/mingw-w64-static/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch +++ b/qt5-base/mingw-w64-static/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch @@ -1,4 +1,4 @@ -From 85670b69fe04b78bb9b43b490c9a91ef6d79a226 Mon Sep 17 00:00:00 2001 +From 7b32e9b9f45a8fd6e1b2a8ac9a70ab68741f370f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 3 Feb 2019 14:34:42 +0100 Subject: [PATCH 32/33] Prevent static build to prefer dynamic libraries @@ -10,7 +10,7 @@ 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 94eb012b81..96ea2554ec 100644 +index 9be4fb6f1f..6a006b3586 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -577,12 +577,12 @@ defineTest(qtConfResolveLibs) { @@ -33,5 +33,5 @@ index 94eb012b81..96ea2554ec 100644 lcan += $${lib}.lib } -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/qt5-base/mingw-w64-static/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch index 85c2d9bf..3e2bb010 100644 --- a/qt5-base/mingw-w64-static/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch +++ b/qt5-base/mingw-w64-static/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch @@ -1,12 +1,13 @@ -From a3f19f84f5f7776ec509c84fb10cb9609c0c67fe Mon Sep 17 00:00:00 2001 +From a21352b369e9218d49e0f4e29ae30a5a58566953 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 24 Jun 2019 13:51:02 +0200 Subject: [PATCH 33/33] Prevent 'Cannot find feature windows_vulkan_sdk' +See https://bugreports.qt.io/browse/QTBUG-76660 --- - mkspecs/common/windows-vulkan.conf | 2 +- - mkspecs/features/win32/windows_vulkan_sdk.prf | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + mkspecs/common/windows-vulkan.conf | 2 +- + mkspecs/features/qmake_use.prf | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mkspecs/common/windows-vulkan.conf b/mkspecs/common/windows-vulkan.conf index da061422dc..a5a8ec68d2 100644 @@ -16,19 +17,21 @@ index da061422dc..a5a8ec68d2 100644 -load(windows_vulkan_sdk) +load(win32/windows_vulkan_sdk) QMAKE_LIBS_VULKAN = -diff --git a/mkspecs/features/win32/windows_vulkan_sdk.prf b/mkspecs/features/win32/windows_vulkan_sdk.prf -index 6c08e28fe9..a80b0602a8 100644 ---- a/mkspecs/features/win32/windows_vulkan_sdk.prf -+++ b/mkspecs/features/win32/windows_vulkan_sdk.prf -@@ -1,7 +1,7 @@ - isEmpty(QMAKE_INCDIR_VULKAN) { - # Pick up the VULKAN_SDK env var set by the LunarG SDK so that the Vulkan - # headers are found out-of-the-box on typical Windows setups. -- QMAKE_INCDIR_VULKAN = $$(VULKAN_SDK)\\include -+ # QMAKE_INCDIR_VULKAN = $$(VULKAN_SDK)/include +diff --git a/mkspecs/features/qmake_use.prf b/mkspecs/features/qmake_use.prf +index 64faa4f215..f899792e4e 100644 +--- a/mkspecs/features/qmake_use.prf ++++ b/mkspecs/features/qmake_use.prf +@@ -15,7 +15,9 @@ for(ever) { + error("Library '$$lower($$replace(nu, _, -))' is not defined.") - # Do not export the include dir but resolve it on every qmake call. - QMAKE_EXPORT_INCDIR_VULKAN = - + DEFINES += $$eval(QMAKE_DEFINES_$${nu}) +- INCLUDEPATH += $$eval(QMAKE_INCDIR_$${nu}) ++ incdir = $$eval(QMAKE_INCDIR_$${nu}) ++ !contains(QMAKE_DEFAULT_INCDIRS, $$incdir): \ ++ INCLUDEPATH += $$incdir + } + LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD) + for (nu, LD_USES) { -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD index cd6f4ae0..955d0b76 100644 --- a/qt5-base/mingw-w64-static/PKGBUILD +++ b/qt5-base/mingw-w64-static/PKGBUILD @@ -32,7 +32,7 @@ isNoOpenGL() { } pkgname=mingw-w64-qt5-base-static -pkgver=5.13.0 +pkgver=5.13.1 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 @@ -88,40 +88,40 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0031-Disable-hardware-randomizer-for-32-bit.patch' '0032-Prevent-static-build-to-prefer-dynamic-libraries.patch' '0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch') -sha256sums=('ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe' - '2df58c3c5350a7b52ed9a19b23359e8a33644012bd529fd31a42afca08a7de33' - '58473061f71f210a8344581cd5654bb6e9625cad90e63cf1f9dca063d14f187b' - '161e3e3dec7904a889bfe90bd707c00f8e2f471cde0ba7803ebd7997fc84878c' - '11b0bbb41bf8f502932f0d8d79e8470654b6adeaaec63de247d044c695e455b8' - '556c1b413d079e6f86974a576f3052645fd5919003fe38056f38a66146cc8c6d' - 'f59764fa27a9d17f4651f7745416d30570d68b11813f4bc132506213a859e0c0' - 'c9e4f335c8d0cf53f4ecff9b6642d34d4794b9fbd75a2fe7f4219f908e998b43' - 'c11a3f2354a8c0b8e12890e09c321ac486c29f32a2702c3d123cd51b49f8152e' - 'cdd71e7ea046327502872da3657132f276159f7377626a41b1a592a8aa2a435f' - '002780bf246a151763fb970234bffc9bb6f82a5e6b3c99641c455a650fad9cd6' - 'e6b535f1959a1cc5b27aefd3b69f05393d0631bd384c946da278e61f1bce6da9' - '56b4695cd46189d297f8583f5d130ef2ed2a91f96ccef76d4d70b59a52da1a6e' - '1f55fbf4a5d3dfbe7a2a3f282f0e393e8c88a5b982c694cdaf557aa5508d4be8' - '39b0c2de05cf7f51a513fe555520d80cc8a22119c4e3b245459ee486f88d902b' - '9a0714b960e82e723828bd18c0bd3a722f58eacb058960aed2e9fcbe4b8d2537' - '94dc91c13b5876d05348717b94f0bee6eca3470852e4b0a99f3d5768ee09ec6c' - '6129e5bb57e18ab064fbc9c15b7708368bc93e65b0c16ec1c83708f01e2862f1' - 'ae3cc5e48f69bcb065d919ea1ff6cd4e8216cff348348675dc0932887e62d2c8' - '1bf5cbfeab7139e1af66909e9359ed051b02d335cd032e1d87539f7a46974c09' - 'e8bceae99d8b6a802592fb7476ac68f2f015cbca0dc38959076c5029f63d0f23' - 'b491f47044b2ea161ec9881d7211ededfd1b3481f54ca93381498a50aebd3795' - '3dbb78c2ec5d3b2f33d5545de15da2ee2895978e98d35a677eaa1449e592cf3c' - '99782fd0b3cb20f2ce5425607f5f6b909ecaefcd8e038738c19d76ae3dc43ab6' - '0ce174399229425fc1f9fac6e27dc9fc7b04dd4eb4770f471fb62244368e6e64' - '365459aba005e00fb19cf0fbeb42f563d36b0b7ac9737ea981f4f4034af6e229' - '486c27a6a56140f6f43665b79b960dafb93d1d48a2d4b5a0de330f3e55685cf8' - '3f4dbd1417a63d04e5e938a37b5a614940d19c318aeeb2de43c126804a509053' - 'ca721a40d0be358baa31233b0d9db8ee70483dc25dda96dbdb080158e90200fb' - '2ba848d3a4e2a3230ee70473fdd7adb6aadb021fea2f09b7871033f281425855' - '6cff295c7011ce53319f35749d807cc6b0c3596ae92d9c36e0eb2cecbafd182e' - '45aae3d21e88cc0ac9e008cd0cc98e3178c2319d0aef726677555866c3bd4b59' - '6d661273b5f6c61c02dd0a0d3b4e7c5788646b056ba7aa3cbad125c84199ffc5' - '7e42f2b917e18dfc22e9f4fb7d7d5c1717157e9746fdaf25b55217b0b78d87be') +sha256sums=('110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab' + '52f473398f93d9446a22ddd806d70ed3c530e4592013b0070f55fa6cb5dd024f' + 'a88f6a3246993a46ddda334f0b0a0f8969be3a4420fff17fe810399ab709fd4a' + 'da99200b82fd866b950de2fc5a0e633af12cce1b86168fdb5d91a269437af80c' + 'd1c962fdcf6974da877c6c94083f9a4c32b3565faa09b92fe4045df97add7fc2' + '704bf70f29fcd19863fdb0d1a5be62b4fa9de9c8e0bdc5b9cea4a7ed2def0908' + '560c2ad8dc492cd512da18ec66f5dd28892b589810f0e1de436a5e94fd28a52c' + 'b106f03cc8976ece37cbd3095707ae6d6e41b62e90d0ae6d34f96ebd8eb62a5a' + 'acaa96d5354c4c7bac6009a78e276b2f756c5557fb9016449af983f5cac896b1' + 'dc2ee63858c9b8e46a065fb430fb4563448e3d5b493c425939085c3290e1987d' + 'cddf9ff3f26661142fe9f895fde0ab587639b4bb8d6279e8de2e201e6f637cbf' + 'd9271e94b596bfdc2901af1ebd8a8284ef421e7a99d46dd3c65daed8a121d6d2' + 'f073aaf27b8b089cff3d3f54bec0e38229deaa999aff2dcc203656f8b7994cb6' + 'f6ef098372e051e234d979bd5f5467b81d89b2f803d4316f64564e16e12cbb52' + 'b001fc1b29d6b3db975d417d1ad9746fd0cabd7692b12a35d473399951f75111' + 'f9dda213747f49c13414a89a5ac3a57064a06798e92106cc3f2f227d5674450d' + 'a49459c9ed2a7fc29a82a94ab43459ff510c6763da73da46ccae5d51ff1f16bc' + 'e25f22a835b9e8ad12aa869222259024fff3d26bf9fe05ce4cc8d0f2f6f4a5e6' + '9940d363b3f8dc10b0151845711ba445c98e850c9fe413f52abb7f8c84eb9b50' + 'd068d378b108ebe4dc645a7cacb89c69acd6b06346bcb0b47563e8cdb9f60c46' + 'e1d4f534beb22b08cc9b70163a871281723aff19a14911f25f522c2a31de944e' + 'e7584630ea69fc8c4e937106268cbf38258550cb26d33a6a38feea0a71aa6edc' + '6193e9b1baa63819dca331f9a62a483c50150ee0fb64e1199b0c1fd3c6388ac3' + '473101992df6f30fb50b2a0be45e55f2391021c01bc2bdf6a97fd7d3067f8fe6' + '809214ea4afccba045c7dd41902b160cf5ec7e4a501457b79b0f51def73e6de4' + '565a7b7aa93c8fd57cc4e6da69246110cce82663718078b8d08952a2c4038aac' + 'a4347a60524b83a77c82aaa0502d8561dc9fb8012d676073a4211100404309ad' + '392608b8d6cf513f4e67ef1748e0b92e33808a16670db6346974ebc62977f762' + 'b74e5960f131866c3fb74fc756da9574e0d03227044a8b80ad7ad6716777035c' + '9dd9393ea601eee07b23222278369909291f1077ea7a14a790260f7b7a8da4c3' + '6ac3bf6b0c447804f8a3b2acebe7e432e2f2dfc6180501ff1a96d0174e4edbe8' + '5c37923453bc13b06a37f9e916883516c83fdcd3dcae893beb97d2b52e6b77df' + '536cd9405a0a7a825768388f9e761e8c257e7e6e64406c9a3cce3c9cf1f48474' + 'a0e20cc3bc60f9b7a3a7281b2f778362ce7cdb16d89478039f1c76896b3383bf') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -333,6 +333,19 @@ package() { "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5WindowsUIAutomationSupport* \ "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5VulkanSupport* \ "${pkgdir}/usr/${_arch}/lib/"libQt5Bootstrap* \ + rm -r \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5AccessibilitySupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5DeviceDiscoverySupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5EdidSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5EventDispatcherSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5FbSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5FontDatabaseSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5PlatformCompositorSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5ThemeSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5WindowsUIAutomationSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5VulkanSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5Bootstrap" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5BootstrapDBus" # ensure config files don't conflict with shared version pushd "${pkgdir}/usr/${_arch}/lib/cmake" @@ -393,6 +406,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + # replace library path in *.prl files so it points to the installed location and not the build directory find "${pkgdir}/usr/${_arch}/lib" \( -type f -name '*.prl' -o -name '*.pc' \) -exec sed -i -e "s:${PWD%/*}/build-${_arch}/lib:/usr/${_arch}/lib:g" {} \; 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 a6cee113..6b13408f 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 07a334d39698cc7d2826ed1b5b6cb9b67dd4def8 Mon Sep 17 00:00:00 2001 +From a378fa39cd0e8100c8c3ee0a5906868663158bbf Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with @@ -161,5 +161,5 @@ index 5de482f23b..3c3d22c699 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.22.0 +2.23.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 fe6205f1..353bce3a 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 2a4db9590232cb56102955d86e21e3c2482b28cf Mon Sep 17 00:00:00 2001 +From 1e4ae2deeb92c2bff530bf77e02d9409d47b95cb Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL @@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 5109261f..d10014a9 100644 --- a/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From abcf04e70f4f3e8a0a7a584afcf976e209307265 Mon Sep 17 00:00:00 2001 +From dc9fb928edeae31a253b27dc6536117b1ec3ed0d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 03/33] 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.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch index 7a73127b..fdb82a4e 100644 --- a/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 3887b9693805365272de6101eab5c332862960e3 Mon Sep 17 00:00:00 2001 +From 7d3c1a5d57a996c8eaef937486df04ad0c2559cd Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 04/33] Make sure *.pc files are installed correctly @@ -10,10 +10,10 @@ Subject: [PATCH 04/33] Make sure *.pc files are installed correctly 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index b634ec622b..aac53cd0ea 100644 +index a45b676d5f..6065ca4c77 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3240,7 +3240,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index b634ec622b..aac53cd0ea 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3255,7 +3255,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3265,7 +3265,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) if(fixify) { if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR").toQString()); @@ -49,7 +49,7 @@ index 350ebd377a..d0c234b864 100644 void writePkgConfigFile(); // for pkg-config diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 16f9361d13..d9887cd36d 100644 +index 266bae7e64..8222854cfc 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -753,7 +753,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) @@ -62,5 +62,5 @@ index 16f9361d13..d9887cd36d 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch index 37bf7b35..8442eeac 100644 --- a/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From 2ebc0b00f1b3297e1f88d271123df7ecb0fbd955 Mon Sep 17 00:00:00 2001 +From cd4400120aa04adcc40f36f29ae395589a511409 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 05/33] Don't add resource files to LIBS parameter @@ -11,10 +11,10 @@ like .obj/debug/Qt5Cored_resource_res.o 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp -index de7363e51b..b2b9d01799 100644 +index 2175841264..c565d44e67 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp -@@ -209,7 +209,7 @@ void MingwMakefileGenerator::init() +@@ -192,7 +192,7 @@ void MingwMakefileGenerator::init() processVars(); @@ -24,5 +24,5 @@ index de7363e51b..b2b9d01799 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch index 9ff893ab..d76b7978 100644 --- a/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 00be29ae27f1954f8d9c7ca2f47c1d18f38e96b8 Mon Sep 17 00:00:00 2001 +From 46d434d6d978b96beae9493ea638d96065ee968f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 06/33] 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 aac53cd0ea..fedbaaf601 100644 +index 6065ca4c77..8a47d584c3 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3254,6 +3254,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (dot != -1) ret = ret.left(dot); } @@ -29,5 +29,5 @@ index aac53cd0ea..fedbaaf601 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch index f6892d8c..1591064b 100644 --- a/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From 6b429798b0e3eddc7e5c857cc3e5b9d7f70aa998 Mon Sep 17 00:00:00 2001 +From 41f5e197d8624e713d48a5a800de3211ba7df7e5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 07/33] Fix linking against shared/static libpng @@ -26,5 +26,5 @@ index 6280b4dfa2..36325920cd 100644 ], "use": [ -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch index d0e9ce41..a4725b1d 100644 --- a/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From f7f14b714ac258239ba7d56aad81352ae013c299 Mon Sep 17 00:00:00 2001 +From f6e638c4058335603797e7cd451fc71e89866b7e Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 08/33] Fix linking against static D-Bus @@ -9,7 +9,7 @@ Subject: [PATCH 08/33] Fix linking against static D-Bus 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.json b/configure.json -index 7f3018ed23..9d8e93a227 100644 +index af55bb6fd2..370c27af5b 100644 --- a/configure.json +++ b/configure.json @@ -187,18 +187,23 @@ @@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644 # include #else -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index 36711fdf..a0dbe248 100644 --- a/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 663130ef2c1188a101b3ff1b88ccfe07712f628b Mon Sep 17 00:00:00 2001 +From b1d7eb0ed7121c1ec287b68c183e185836069057 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 09/33] Don't try to use debug version of D-Bus library @@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.json b/configure.json -index 9d8e93a227..80e15ce156 100644 +index 370c27af5b..36545a593b 100644 --- a/configure.json +++ b/configure.json @@ -200,7 +200,7 @@ @@ -25,5 +25,5 @@ index 9d8e93a227..80e15ce156 100644 }, "condition": "config.win32 && features.shared" -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch index 027fec2a..a0b99788 100644 --- a/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From c75a87b8378987e9a63235984021377755418ba1 Mon Sep 17 00:00:00 2001 +From 4bc1016e6268e57a5b8c9c3ae067166e41d10420 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 10/33] Fix linking against static freetype2 @@ -26,5 +26,5 @@ index 36325920cd..972f9914ea 100644 { "libs": "-lfreetype" } ], -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch index f07979b5..950e2992 100644 --- a/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From 4f637a1ae1182f9327cc5fd198961e906cff59eb Mon Sep 17 00:00:00 2001 +From 41de800407436106116940c9da87841f01322b14 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 11/33] Fix linking against static harfbuzz @@ -25,5 +25,5 @@ index 972f9914ea..894c10259d 100644 }, "imf": { -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch index 36514aa4..33b6bb9f 100644 --- a/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From 3fccf1f581659113ae325f5192c8d6870c894c84 Mon Sep 17 00:00:00 2001 +From a17a279ab36a4f71bbe63ada089d85fc6789a7b5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 12/33] Fix linking against static pcre @@ -24,5 +24,5 @@ index bdaa2d3243..90f8250c03 100644 #include -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch index b243cd9a..e627daeb 100644 --- a/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From 7ea90aaf596477d79194673de9fb4b8076883186 Mon Sep 17 00:00:00 2001 +From 5bb7b2f2d9c9cc02dc064c8b64b6a10a15ab0d22 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 13/33] 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.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch index 41d712cb..7304961e 100644 --- a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From e9076f7d190ce29321102ce695dbd105cccf14f7 Mon Sep 17 00:00:00 2001 +From 638327519b9b04f3c105280f49f29e509c06a9ce Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 14/33] Fix linking against shared/static PostgreSQL @@ -24,5 +24,5 @@ index babd0465ce..b4b3bdec6b 100644 ] }, -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch index 1c14b162..fad58795 100644 --- a/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 5eb2e0e33778a15ff05a2891e6752af573bca2e5 Mon Sep 17 00:00:00 2001 +From a612704b7c2144f2074f7b98ceaed47aa8470dce Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 15/33] Rename qtmain to qt5main @@ -25,10 +25,10 @@ index 5208d22bd6..1a058b787f 100644 QMAKE_IDL = $${CROSS_COMPILE}widl QMAKE_LIB = $${CROSS_COMPILE}ar -rc diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 2ab7775fea..6bc621ce27 100644 +index 376a7ded5d..4fe2ef2326 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -234,8 +234,8 @@ mac { +@@ -270,8 +270,8 @@ mac { CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll mingw { @@ -68,5 +68,5 @@ index 9cb6ab0c59..4327ba365e 100644 CONFIG += static -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch index 59595f2c..830542ac 100644 --- a/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From a2a8aa60a4385fff2770e93e0a6054935905bef7 Mon Sep 17 00:00:00 2001 +From 2ed621b725a48cf41a4fd39cbb0723de1724b519 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 16/33] Enable rpath for build tools @@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644 INSTALLS += target -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch index c9a01d9c..6a8df34f 100644 --- a/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 04a04e8c11bf4ae71d4ed0d6b641b2b2ebacc565 Mon Sep 17 00:00:00 2001 +From 0e4aad7814d0b407d92b34e8fcc9fba70d9bd765 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 17/33] Use system zlib for build tools @@ -23,5 +23,5 @@ index 83e44ff9a4..4734623936 100644 } else { CONFIG += no_core_dep -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch index 45ea3d0d..27015bd4 100644 --- a/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 8d8cfe560697425a01b786aee113082495d6c85f Mon Sep 17 00:00:00 2001 +From 24a7b52b579fb5f0787d9738668841392c8bd649 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 18/33] Merge shared and static library trees @@ -10,15 +10,15 @@ Allow installation of shared and static build in the same prefix mkspecs/features/device_config.prf | 9 ++++++++- mkspecs/features/qt.prf | 17 +++++++++++++++++ mkspecs/features/spec_pre.prf | 11 ++++++++--- - qmake/generators/makefile.cpp | 9 ++++++--- + qmake/generators/makefile.cpp | 11 +++++++---- qtbase.pro | 10 ++++++++-- - 7 files changed, 73 insertions(+), 10 deletions(-) + 7 files changed, 74 insertions(+), 11 deletions(-) diff --git a/configure.pri b/configure.pri -index 81133da3d7..927fcbe132 100644 +index 7b8dee0953..5477c264eb 100644 --- a/configure.pri +++ b/configure.pri -@@ -657,7 +657,12 @@ defineTest(qtConfOutput_machineTuple) { +@@ -676,7 +676,12 @@ defineTest(qtConfOutput_machineTuple) { defineTest(qtConfOutput_commitOptions) { # qdevice.pri needs to be written early, because the compile tests require it. @@ -32,7 +32,7 @@ index 81133da3d7..927fcbe132 100644 } # type (empty or 'host'), option name, default value -@@ -1350,3 +1355,12 @@ defineTest(createConfigStatus) { +@@ -1369,3 +1374,12 @@ defineTest(createConfigStatus) { QMAKE_POST_CONFIGURE += \ "createConfigStatus()" @@ -46,7 +46,7 @@ index 81133da3d7..927fcbe132 100644 + CONFIG += no_smart_library_merge +} diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf -index 9df99b8648..9c1dd6a735 100644 +index 0e41b825ec..4c4b6dd12a 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -1,5 +1,16 @@ @@ -137,10 +137,10 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index fedbaaf601..fd3b5c405a 100644 +index 8a47d584c3..b158bb9b52 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3247,6 +3247,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3257,6 +3257,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -150,19 +150,22 @@ index fedbaaf601..fd3b5c405a 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3421,9 +3424,9 @@ MakefileGenerator::writePkgConfigFile() +@@ -3433,11 +3436,11 @@ MakefileGenerator::writePkgConfigFile() t << endl; // requires -- const QString requires = project->values("QMAKE_PKGCONFIG_REQUIRES").join(' '); -- if (!requires.isEmpty()) { -- t << "Requires: " << requires << endl; +- const QString requiresString = project->values("QMAKE_PKGCONFIG_REQUIRES").join(' '); +- if (!requiresString.isEmpty()) { +- t << "Requires: " << requiresString << endl; + t << "Requires:"; -+ for (const auto &required : project->values("QMAKE_PKGCONFIG_REQUIRES")) { ++ const auto pkgconfigRequires = project->values("QMAKE_PKGCONFIG_REQUIRES"); ++ for (const auto &required : pkgconfigRequires) { + t << (project->isActiveConfig("staticlib") ? QStringLiteral(" Static") : QStringLiteral(" ")) << required.toQString(); } - +- t << endl; + } + diff --git a/qtbase.pro b/qtbase.pro index c0ce0972ef..5a2deaf31d 100644 --- a/qtbase.pro @@ -199,5 +202,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch index b560fb61..013911c8 100644 --- a/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From 0f3da1317f28a882c705fcf3f13c419601b96467 Mon Sep 17 00:00:00 2001 +From ad61d1712db4cdd3389e808d46fbfcb26a2509e3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 19/33] Use *.dll.a as import lib extension @@ -12,10 +12,10 @@ g++-win32.conf 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 6bc621ce27..226dc93c4d 100644 +index 4fe2ef2326..7cb27b716a 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -245,8 +245,9 @@ mac { +@@ -281,8 +281,9 @@ mac { CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl } else { @@ -57,7 +57,7 @@ index bbada46c29..d6299d8eed 100644 } } diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index d9887cd36d..4f1a4344df 100644 +index 8222854cfc..17592c2492 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -80,9 +80,13 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg) @@ -92,5 +92,5 @@ index d9887cd36d..4f1a4344df 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index 10946b0f..2255c51f 100644 --- a/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From 720bde854fa9d143d0ad8db4794a0dd0efb173a2 Mon Sep 17 00:00:00 2001 +From 890e47124906afd97de44bc40520338bde5dc5d3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 20/33] Pull dependencies of static libraries in CMake modules @@ -21,12 +21,12 @@ e.g. to use QMAKE_PRL_LIBS instead of QMAKE_PRL_LIBS_FOR_CMAKE. See https://github.com/Martchus/PKGBUILDs/issues/86#issuecomment-476840055 for further details on 2. --- - .../data/cmake/Qt5BasicConfig.cmake.in | 172 ++++++++++++++---- + .../data/cmake/Qt5BasicConfig.cmake.in | 192 ++++++++++++------ .../data/cmake/Qt5PluginTarget.cmake.in | 11 +- - 2 files changed, 139 insertions(+), 44 deletions(-) + 2 files changed, 136 insertions(+), 67 deletions(-) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 705e0a3c93..c0097cac74 100644 +index d4fd057682..838279515c 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -53,10 +53,18 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura @@ -40,24 +40,24 @@ index 705e0a3c93..c0097cac74 100644 get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" ABSOLUTE) if(EXISTS \"${prl_file_location}\") - file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS[ \\t]*=\") + file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE[ \\t]*=\") + if(NOT _prl_strings) -+ message(WARNING \"Prl file for Qt 5 module $${CMAKE_MODULE_NAME} does not contain QMAKE_PRL_LIBS. Was looking at \\\"${prl_file_location}\\\".\") ++ message(WARNING \"Prl file for Qt 5 module $${CMAKE_MODULE_NAME} does not contain QMAKE_PRL_LIBS_FOR_CMAKE. Was looking at \\\"${prl_file_location}\\\".\") + return() + endif() - string(REGEX REPLACE \"QMAKE_PRL_LIBS[ \\t]*=[ \\t]*([^\\n]*)\" \"\\\\1\" _static_depends ${_prl_strings}) - string(REGEX REPLACE \"[ \\t]+\" \";\" _static_depends ${_static_depends}) - string(REGEX REPLACE \"[ \\t]+\" \";\" _standard_libraries \"${CMAKE_CXX_STANDARD_LIBRARIES}\") -@@ -68,7 +76,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura + + # file(STRINGS) replaces all semicolons read from the file with backslash semicolons. + # We need to do a reverse transformation in CMake. For that we replace all backslash +@@ -75,7 +83,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura # Handle normal libraries passed as -lfoo set(_lib \"${CMAKE_MATCH_1}\") foreach(_standard_library ${_standard_libraries}) -- if(_standard_library MATCHES \"^${_lib}(\\.lib)?$\") +- if(_standard_library MATCHES \"^${_lib}(\\\\.lib)?$\") + if(_standard_library MATCHES \"^${_lib}(\\\\.lib|\\\\.a)?$\") set(_lib_is_default_linked TRUE) break() endif() -@@ -109,11 +117,42 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura +@@ -116,6 +124,37 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura set(${lib_deps} ${_lib_deps} PARENT_SCOPE) set(${link_flags} \"SHELL:${_link_flags}\" PARENT_SCOPE) endfunction() @@ -95,71 +95,78 @@ index 705e0a3c93..c0097cac74 100644 !!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}) -+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}) - - !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) - set(imported_location \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}${LIB_LOCATION}\") -@@ -121,44 +160,62 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI +@@ -129,52 +168,39 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\") !!ENDIF _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location}) + set(_deps ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} +- ) +- set(_static_deps !!IF !isEmpty(CMAKE_STATIC_TYPE) -- ${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LIB_DEPENDENCIES} -+ ${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES} + ${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LIB_DEPENDENCIES} !!ENDIF ) + ++ # FIXME: handle IsDebugAndRelease like in official version + +!!IF !isEmpty(CMAKE_STATIC_TYPE) set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -- \"INTERFACE_LINK_LIBRARIES\" \"${_deps}\" -- \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} -+ \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} !!IF !isEmpty(CMAKE_LIB_SONAME) -- \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\" -+ \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" + \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\" !!ENDIF - # For backward compatibility with CMake < 2.8.12 -- \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_deps}\" +- \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_deps};${_static_deps}\" +- ) +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES +- \"${_deps}\" ) --!!IF !isEmpty(CMAKE_STATIC_TYPE) - -+ _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_deps}\") - if(NOT CMAKE_VERSION VERSION_LESS \"3.13\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES - \"INTERFACE_LINK_OPTIONS\" \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\" +-!!IF !isEmpty(CMAKE_STATIC_TYPE) +- if(NOT "${IsDebugAndRelease}") +- set(_genex_condition \"1\") +- else() +- if("${Configuration}" STREQUAL "DEBUG") +- set(_genex_condition \"$\") +- else() +- set(_genex_condition \"$>\") +- endif() +- endif() +- +- if(_static_deps) +- set(_static_deps_genex \"$<${_genex_condition}:${_static_deps}>\") +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES +- \"${_static_deps_genex}\" +- ) +- endif() +- +- set(_static_link_flags \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\") +- if(NOT CMAKE_VERSION VERSION_LESS \"3.13\" AND _static_link_flags) +- set(_static_link_flags_genex \"$<${_genex_condition}:${_static_link_flags}>\") +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_OPTIONS +- \"${_static_link_flags_genex}\" ++ _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${Configuration}\" \"${_deps}\") ++ if(NOT CMAKE_VERSION VERSION_LESS \"3.13\") ++ set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES ++ \"INTERFACE_LINK_OPTIONS\" \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\" ) endif() +!!ELSE + set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -+ \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_deps}\" -+ \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} ++ \"INTERFACE_LINK_LIBRARIES_${Configuration}\" \"${_deps}\" ++ \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} +!!IF !isEmpty(CMAKE_LIB_SONAME) -+ \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" ++ \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\" +!!ENDIF + # For backward compatibility with CMake < 2.8.12 -+ \"IMPORTED_LINK_INTERFACE_LIBRARIES_${TARGET_CONFIG}\" \"${_deps}\" ++ \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_deps}\" + ) !!ENDIF !!IF !isEmpty(CMAKE_WINDOWS_BUILD) - !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) - set(imported_implib \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ELSE -- set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") -+ set(imported_implib \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") - !!ENDIF - _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_implib}) - if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES -- \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} -+ \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib} - ) +@@ -191,6 +217,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI endif() !!ENDIF endmacro() @@ -175,7 +182,7 @@ index 705e0a3c93..c0097cac74 100644 !!ENDIF if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) -@@ -328,13 +385,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -360,13 +395,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX") @@ -193,7 +200,7 @@ index 705e0a3c93..c0097cac74 100644 !!IF !equals(TEMPLATE, aux) !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1) -@@ -349,6 +408,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -381,6 +418,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, ";")) @@ -250,7 +257,7 @@ index 705e0a3c93..c0097cac74 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}) -@@ -367,9 +476,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -399,9 +486,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private) endif() endforeach() @@ -264,13 +271,13 @@ index 705e0a3c93..c0097cac74 100644 endif() !!IF !equals(TEMPLATE, aux) -@@ -439,9 +552,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -471,9 +562,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties(Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) endif() +!!ENDIF // CMAKE_STATIC_TYPE + @@ -278,10 +285,12 @@ index 705e0a3c93..c0097cac74 100644 !!ENDIF // CMAKE_RELEASE_TYPE !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD -@@ -452,29 +567,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -484,33 +577,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) !!ENDIF // TEMPLATE != aux +-!!IF isEmpty(CMAKE_INTERNAL_MODULE) +- - file(GLOB pluginTargets \"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}_*Plugin.cmake\") - - macro(_populate_$${CMAKE_MODULE_NAME}_plugin_properties Plugin Configuration PLUGIN_LOCATION) @@ -304,6 +313,8 @@ index 705e0a3c93..c0097cac74 100644 - endforeach() - endif() - +-!!ENDIF // isEmpty(CMAKE_INTERNAL_MODULE) +- - !!IF !isEmpty(CMAKE_MODULE_EXTRAS) include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\") @@ -332,5 +343,5 @@ index 5baf0fdb10..ec5f3cc437 100644 + +endif() -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch index 8a8dde9e..f2a8f3b6 100644 --- a/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From 7c539241c220ce50da61ef811daae18489b5df19 Mon Sep 17 00:00:00 2001 +From 6bdfbfedf65c6883b74ac47a4385148bbafb4438 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 21/33] Allow usage of static version with CMake @@ -12,20 +12,20 @@ installed in the same prefix via regular find_package(Qt5Core) --- mkspecs/features/create_cmake.prf | 103 +++--- - .../data/cmake/Qt5BasicConfig.cmake.in | 296 ++++++++++++------ + .../data/cmake/Qt5BasicConfig.cmake.in | 297 ++++++++++++------ .../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, 309 insertions(+), 153 deletions(-) + 7 files changed, 310 insertions(+), 153 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 -index 226dc93c4d..0e9afa4eaf 100644 +index 7cb27b716a..7d8ac191db 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -51,7 +51,7 @@ split_incpath { +@@ -65,7 +65,7 @@ split_incpath { $$QT_MODULE_INCLUDE_BASE/$${CMAKE_INCLUDE_NAME}/$$eval(QT.$${MODULE}.VERSION)/$${CMAKE_INCLUDE_NAME}) cmake_extra_source_includes.input = $$PWD/data/cmake/ExtraSourceIncludes.cmake.in @@ -34,16 +34,16 @@ index 226dc93c4d..0e9afa4eaf 100644 !build_pass:QMAKE_SUBSTITUTES += \ cmake_extra_source_includes -@@ -101,6 +101,8 @@ win32:!static:!staticlib { +@@ -115,6 +115,8 @@ win32:!static:!staticlib { } static|staticlib:CMAKE_STATIC_TYPE = true +static|staticlib:DEFAULT_QT_VARIANT_PREFIX = "Static" +else:DEFAULT_QT_VARIANT_PREFIX = "" - CMAKE_DEBUG_TYPE = - CMAKE_RELEASE_TYPE = -@@ -146,17 +148,19 @@ contains(CONFIG, plugin) { + internal_module { + CMAKE_INTERNAL_MODULE = true +@@ -182,17 +184,19 @@ contains(CONFIG, plugin) { CMAKE_PLUGIN_NAME = $$PLUGIN_CLASS_NAME win32 { @@ -67,7 +67,7 @@ index 226dc93c4d..0e9afa4eaf 100644 mac { isEmpty(CMAKE_STATIC_TYPE): CMAKE_PlUGIN_EXT = .dylib else: CMAKE_PlUGIN_EXT = .a -@@ -172,13 +176,13 @@ contains(CONFIG, plugin) { +@@ -208,13 +212,13 @@ contains(CONFIG, plugin) { } } cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in @@ -83,7 +83,7 @@ index 226dc93c4d..0e9afa4eaf 100644 INSTALLS += cmake_qt5_plugin_file return() -@@ -191,25 +195,34 @@ mod_deps = +@@ -227,25 +231,34 @@ mod_deps = lib_deps = aux_mod_deps = aux_lib_deps = @@ -122,7 +122,7 @@ index 226dc93c4d..0e9afa4eaf 100644 !isEmpty(CMAKE_STATIC_TYPE) { CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a -@@ -237,35 +250,33 @@ mac { +@@ -273,35 +286,33 @@ mac { CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a @@ -177,7 +177,7 @@ index 226dc93c4d..0e9afa4eaf 100644 !isEmpty(CMAKE_STATIC_TYPE) { CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a -@@ -285,12 +296,12 @@ mac { +@@ -321,12 +332,12 @@ mac { INSTALLS += cmake_qt5_module_files cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in @@ -192,7 +192,7 @@ index 226dc93c4d..0e9afa4eaf 100644 !build_pass:QMAKE_SUBSTITUTES += \ cmake_config_file \ -@@ -300,11 +311,29 @@ cmake_qt5_module_files.files = \ +@@ -336,11 +347,29 @@ cmake_qt5_module_files.files = \ $$cmake_config_file.output \ $$cmake_config_version_file.output @@ -223,7 +223,7 @@ index 226dc93c4d..0e9afa4eaf 100644 !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file -@@ -316,7 +345,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake +@@ -352,7 +381,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake exists($$cmake_macros_file.input) { CMAKE_MODULE_MACROS = "true" @@ -232,7 +232,7 @@ index 226dc93c4d..0e9afa4eaf 100644 cmake_macros_file.CONFIG = verbatim !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file -@@ -324,7 +353,7 @@ exists($$cmake_macros_file.input) { +@@ -360,7 +389,7 @@ exists($$cmake_macros_file.input) { cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -242,7 +242,7 @@ index 226dc93c4d..0e9afa4eaf 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 c0097cac74..94e3b08751 100644 +index 838279515c..811c11a666 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) @@ -305,7 +305,7 @@ index c0097cac74..94e3b08751 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. -@@ -148,18 +179,48 @@ if(NOT COMMAND _qt5_add_dependencies) +@@ -155,19 +186,50 @@ if(NOT COMMAND _qt5_add_dependencies) endif() endfunction() endif() @@ -319,14 +319,16 @@ index c0097cac74..94e3b08751 100644 !!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}) +-macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION +!!IF !isEmpty(CMAKE_STATIC_TYPE) -+macro(_populate_$${CMAKE_MODULE_NAME}_target_properties_static TARGET_NAME TARGET_CONFIG LIB_LOCATION IMPLIB_LOCATION) ++macro(_populate_$${CMAKE_MODULE_NAME}_target_properties_static TARGET_NAME Configuration LIB_LOCATION IMPLIB_LOCATION + IsDebugAndRelease) +- set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) +!!ELSE -+macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_NAME TARGET_CONFIG LIB_LOCATION IMPLIB_LOCATION) ++macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_NAME Configuration LIB_LOCATION IMPLIB_LOCATION ++ IsDebugAndRelease) +!!ENDIF -+ set_property(TARGET ${TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${TARGET_CONFIG}) ++ set_property(TARGET ${TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration}) !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) + @@ -356,28 +358,28 @@ index c0097cac74..94e3b08751 100644 set(_deps ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES} -@@ -169,15 +230,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI - ) +@@ -179,15 +241,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI + # FIXME: handle IsDebugAndRelease like in official version !!IF !isEmpty(CMAKE_STATIC_TYPE) - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(\"${TARGET_NAME}\" PROPERTIES - \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location} + \"IMPORTED_LOCATION_${Configuration}\" ${imported_location} !!IF !isEmpty(CMAKE_LIB_SONAME) - \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\" + \"IMPORTED_SONAME_${Configuration}\" \"$${CMAKE_LIB_SONAME}\" !!ENDIF ) -- _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_deps}\") -+ _qt5_add_dependencies(\"${TARGET_NAME}\" \"${TARGET_CONFIG}\" \"${_deps}\") +- _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${Configuration}\" \"${_deps}\") ++ _qt5_add_dependencies(\"${TARGET_NAME}\" \"${Configuration}\" \"${_deps}\") if(NOT CMAKE_VERSION VERSION_LESS \"3.13\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(\"${TARGET_NAME}\" PROPERTIES \"INTERFACE_LINK_OPTIONS\" \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\" ) endif() -@@ -199,9 +260,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI +@@ -209,9 +271,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI !!ELSE - set(imported_implib \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") + set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\") !!ENDIF +!!IF !isEmpty(CMAKE_STATIC_TYPE) + _qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static(${imported_implib}) @@ -387,10 +389,10 @@ index c0097cac74..94e3b08751 100644 if(NOT \"${IMPLIB_LOCATION}\" STREQUAL \"\") - set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES + set_target_properties(${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} PROPERTIES - \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib} + \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib} ) endif() -@@ -218,8 +283,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_target_dependencies_from_prl_file P +@@ -228,8 +294,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_target_dependencies_from_prl_file P endmacro() !!ENDIF @@ -400,7 +402,7 @@ index c0097cac74..94e3b08751 100644 !!IF !no_module_headers !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK) set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS -@@ -227,46 +291,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -237,46 +302,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\" ) !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES) @@ -465,7 +467,7 @@ index c0097cac74..94e3b08751 100644 endforeach() !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK) -@@ -275,16 +343,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -285,16 +354,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}) @@ -489,7 +491,7 @@ index c0097cac74..94e3b08751 100644 !!ENDIF // TEMPLATE != aux set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\") -@@ -292,10 +364,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -302,10 +375,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\") !!ENDIF @@ -502,7 +504,7 @@ index c0097cac74..94e3b08751 100644 set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED) endif() set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET) -@@ -303,17 +375,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -313,17 +386,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) @@ -524,7 +526,7 @@ index c0097cac74..94e3b08751 100644 $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT} ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET} ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED} -@@ -321,28 +393,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -331,28 +404,32 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) ) endif() @@ -569,7 +571,7 @@ index c0097cac74..94e3b08751 100644 !!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS) list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\") -@@ -353,13 +429,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -363,13 +440,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!IF !isEmpty(CMAKE_DEBUG_TYPE) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( @@ -585,7 +587,7 @@ index c0097cac74..94e3b08751 100644 _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS ) -@@ -369,13 +445,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -379,13 +456,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!IF !isEmpty(CMAKE_RELEASE_TYPE) !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE) _qt5_$${CMAKE_MODULE_NAME}_process_prl_file( @@ -601,7 +603,7 @@ index c0097cac74..94e3b08751 100644 _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS ) -@@ -383,30 +459,44 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -393,30 +470,44 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF endif() @@ -656,7 +658,7 @@ index c0097cac74..94e3b08751 100644 # Find plugin targets file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\") -@@ -420,7 +510,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -430,7 +521,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endforeach() endif() @@ -668,7 +670,7 @@ index c0097cac74..94e3b08751 100644 set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG}) !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE) -@@ -428,7 +522,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -438,7 +533,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\") !!ENDIF @@ -680,7 +682,7 @@ index c0097cac74..94e3b08751 100644 set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location} ) -@@ -459,16 +557,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -469,16 +568,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endif() set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE) @@ -701,7 +703,7 @@ index c0097cac74..94e3b08751 100644 ) set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS) foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}) -@@ -477,69 +575,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -487,69 +586,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) endif() endforeach() !!IF !isEmpty(CMAKE_STATIC_TYPE) @@ -720,13 +722,13 @@ index c0097cac74..94e3b08751 100644 !!IF !equals(TEMPLATE, aux) !!IF !isEmpty(CMAKE_RELEASE_TYPE) -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) +!!IF !isEmpty(CMAKE_STATIC_TYPE) -+ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) !!ELSE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) +!!ENDIF // CMAKE_STATIC_TYPE + @@ -740,9 +742,9 @@ index c0097cac74..94e3b08751 100644 !!ELSE // CMAKE_LIB_DIR_IS_ABSOLUTE if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ELSE // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC}\" \"\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) + endif() +!!ELSE // CMAKE_STATIC_TYPE if (EXISTS @@ -758,9 +760,9 @@ index c0097cac74..94e3b08751 100644 !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) !!ENDIF -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) endif() +!!ENDIF // CMAKE_STATIC_TYPE !!ENDIF // CMAKE_DEBUG_TYPE @@ -770,11 +772,11 @@ index c0097cac74..94e3b08751 100644 !!IF !isEmpty(CMAKE_DEBUG_TYPE) -!!IF !isEmpty(CMAKE_STATIC_WINDOWS_BUILD) -- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) +!!IF !isEmpty(CMAKE_STATIC_TYPE) -+ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(DEBUG \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) !!ELSE - _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" ) + _populate_$${CMAKE_MODULE_NAME}_target_properties(DEBUG \"$${CMAKE_LIB_FILE_LOCATION_DEBUG}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_DEBUG}\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ENDIF // CMAKE_STATIC_WINDOWS_BUILD +!!ENDIF // CMAKE_STATIC_TYPE @@ -790,23 +792,23 @@ index c0097cac74..94e3b08751 100644 - if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) + if (EXISTS \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" ) !!ENDIF // CMAKE_LIB_DIR_IS_ABSOLUTE -- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) -!!ELSE // CMAKE_STATIC_WINDOWS_BUILD -+ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" ) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties_static(${TARGET_NAME} RELEASE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC}\" \"\" $${CMAKE_DEBUG_AND_RELEASE}) +!!ELSE // CMAKE_STATIC_TYPE if (EXISTS !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE) \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" -@@ -552,7 +653,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -562,7 +664,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ELSE \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) !!ENDIF -- _populate_$${CMAKE_MODULE_NAME}_target_properties(Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) -+ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" ) +- _populate_$${CMAKE_MODULE_NAME}_target_properties(Qt5::$${CMAKE_MODULE_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) ++ _populate_$${CMAKE_MODULE_NAME}_target_properties(${TARGET_NAME} RELEASE \"$${CMAKE_LIB_FILE_LOCATION_RELEASE}\" \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" $${CMAKE_DEBUG_AND_RELEASE}) endif() !!ENDIF // CMAKE_STATIC_TYPE -@@ -562,19 +663,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) +@@ -572,19 +674,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME}) !!ENDIF // CMAKE_DEBUG_TYPE !!ELSE // TEMPLATE != aux @@ -1008,5 +1010,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index 39553428..a3ea8d8c 100644 --- a/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From eef6cc9b95d30179b2db3f655d542db7344bb405 Mon Sep 17 00:00:00 2001 +From e0a0aa6f1ae106e0ffda362a7a22c8dd3f41acb3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 22/33] Adjust linker flags for static build with @@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644 +unset(_isExe) +!!ENDIF -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch index f3405397..74f2ba2c 100644 --- a/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From a36b39ed36b3c584bdd82cf31ea5d1db0228e743 Mon Sep 17 00:00:00 2001 +From ce7eb8c86dd0a1b7534067df6ec3fb6b408fdcc4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 23/33] Use correct pkg-config --static flag @@ -8,10 +8,10 @@ Subject: [PATCH 23/33] Use correct pkg-config --static flag 1 file changed, 3 insertions(+) diff --git a/configure.pri b/configure.pri -index 927fcbe132..ab5e1088b3 100644 +index 5477c264eb..6d117f4c4f 100644 --- a/configure.pri +++ b/configure.pri -@@ -350,6 +350,9 @@ defineTest(qtConfTest_detectPkgConfig) { +@@ -369,6 +369,9 @@ defineTest(qtConfTest_detectPkgConfig) { qtLog("Found pkg-config from path: $$pkgConfig") } } @@ -22,5 +22,5 @@ index 927fcbe132..ab5e1088b3 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch index 2c7c89c2..a3f2eb87 100644 --- a/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From 8d11fcd322083c7ed3277df0931319a0f082fe51 Mon Sep 17 00:00:00 2001 +From ce0f25c8d3725c9c65874c46a169a9581d5c2fcc Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 24/33] Fix macro invoking moc, rcc and uic @@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake -index 78b99f5bfe..d383b4e4d8 100644 +index 0f006fe1e3..1db4bed272 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target @@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch index 4e56453a..d8d6d587 100644 --- a/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From d7094ac797963aabfd2f09402fbdab1730ace836 Mon Sep 17 00:00:00 2001 +From 2c8b96ba9881f3e26bfd6f191b69186c463e9991 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 25/33] Ignore errors about missing feature static @@ -10,10 +10,10 @@ Not sure why this error occurs, let's hope for the best 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf -index 0c6c10dded..54c4b568c1 100644 +index 8a7c9c28d3..003a694f44 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf -@@ -141,5 +141,5 @@ defineTest(qtConfig) { +@@ -143,5 +143,5 @@ defineTest(qtConfig) { contains(QT.$${module}.disabled_features, $$1): \ return(false) } @@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch index 945dbc91..fae9949b 100644 --- a/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 5eb8a0d8bdeb9d9a332d730a19be663c00f4994b Mon Sep 17 00:00:00 2001 +From b2969090dbc4f3db4964541a31a8ce69c5998d2d Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 26/33] Enable and fix use of iconv @@ -74,5 +74,5 @@ index b7eefb58c8..fef7ac57de 100644 }, "icu": { -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch index 8fb9a3fb..0feaeb05 100644 --- a/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From dd798cb73309229779ff60e74a31eb8711e80833 Mon Sep 17 00:00:00 2001 +From 436242b03a054ab2699b629d819a807f37e152c3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 27/33] Ignore failing pkg-config test @@ -9,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best 1 file changed, 1 deletion(-) diff --git a/configure.json b/configure.json -index 80e15ce156..7a45887ba4 100644 +index 36545a593b..087c2f6419 100644 --- a/configure.json +++ b/configure.json -@@ -725,7 +725,6 @@ +@@ -728,7 +728,6 @@ "pkg-config": { "label": "Using pkg-config", "autoDetect": "!config.darwin && !config.win32", @@ -21,5 +21,5 @@ index 80e15ce156..7a45887ba4 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch index 4b5cec1c..7103fb12 100644 --- a/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From 0c03c5c9926209c162c75e14713863be8d3da08a Mon Sep 17 00:00:00 2001 +From 22a94d0575482106bd10c562f35b04f13781cc09 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 28/33] 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 7f42fbe09e..e27428c0f2 100644 +index d7c9413290..3026318a70 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -393,6 +393,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) @@ -25,7 +25,7 @@ index 7f42fbe09e..e27428c0f2 100644 int libidx = 0, fwidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 4f1a4344df..32a1ccbbf9 100644 +index 17592c2492..26f3f5cd82 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -87,6 +87,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) @@ -39,5 +39,5 @@ index 4f1a4344df..32a1ccbbf9 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch index 651ea823..13670f4e 100644 --- a/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch +++ b/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From cdfab1e716f840d0f1db934246219865054572b7 Mon Sep 17 00:00:00 2001 +From 96aed122b16085b36ffe3c369f858c39f7691137 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 29/33] Hardcode linker flags for platform plugins @@ -149,5 +149,5 @@ index 174bc7b609..285d90c6d3 100644 include(windows.pri) -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch index 32b22cc5..994f4ca9 100644 --- a/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch +++ b/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From b212a375e31c52e890eb11b45603d2a3997d4731 Mon Sep 17 00:00:00 2001 +From 5af3c721d89c0008e8bbefa4dbe60ea3ddce4b3e Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 30/33] Fix linking against static plugins with qmake @@ -33,5 +33,5 @@ index d6299d8eed..5311748953 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.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0031-Disable-hardware-randomizer-for-32-bit.patch b/qt5-base/mingw-w64/0031-Disable-hardware-randomizer-for-32-bit.patch index ad5f3437..f0048681 100644 --- a/qt5-base/mingw-w64/0031-Disable-hardware-randomizer-for-32-bit.patch +++ b/qt5-base/mingw-w64/0031-Disable-hardware-randomizer-for-32-bit.patch @@ -1,4 +1,4 @@ -From 7d7d9c565af36b4b5fbb9628edd03310a221c70a Mon Sep 17 00:00:00 2001 +From 5d5e7070268d2ce1e9df60754dbbec218a82974b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 26 May 2018 03:47:14 +0200 Subject: [PATCH 31/33] Disable hardware randomizer for 32-bit @@ -19,7 +19,7 @@ during RTL pass: ira 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp -index 90df8653a7..50725dc5cb 100644 +index bf01b7ae2a..0663949352 100644 --- a/src/corelib/global/qrandom.cpp +++ b/src/corelib/global/qrandom.cpp @@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando @@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644 #else return false; -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch b/qt5-base/mingw-w64/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch index 5d50a4f0..fbdd0fb0 100644 --- a/qt5-base/mingw-w64/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch +++ b/qt5-base/mingw-w64/0032-Prevent-static-build-to-prefer-dynamic-libraries.patch @@ -1,4 +1,4 @@ -From 85670b69fe04b78bb9b43b490c9a91ef6d79a226 Mon Sep 17 00:00:00 2001 +From 7b32e9b9f45a8fd6e1b2a8ac9a70ab68741f370f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 3 Feb 2019 14:34:42 +0100 Subject: [PATCH 32/33] Prevent static build to prefer dynamic libraries @@ -10,7 +10,7 @@ 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 94eb012b81..96ea2554ec 100644 +index 9be4fb6f1f..6a006b3586 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -577,12 +577,12 @@ defineTest(qtConfResolveLibs) { @@ -33,5 +33,5 @@ index 94eb012b81..96ea2554ec 100644 lcan += $${lib}.lib } -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/qt5-base/mingw-w64/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch index 85c2d9bf..3e2bb010 100644 --- a/qt5-base/mingw-w64/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch +++ b/qt5-base/mingw-w64/0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch @@ -1,12 +1,13 @@ -From a3f19f84f5f7776ec509c84fb10cb9609c0c67fe Mon Sep 17 00:00:00 2001 +From a21352b369e9218d49e0f4e29ae30a5a58566953 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 24 Jun 2019 13:51:02 +0200 Subject: [PATCH 33/33] Prevent 'Cannot find feature windows_vulkan_sdk' +See https://bugreports.qt.io/browse/QTBUG-76660 --- - mkspecs/common/windows-vulkan.conf | 2 +- - mkspecs/features/win32/windows_vulkan_sdk.prf | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + mkspecs/common/windows-vulkan.conf | 2 +- + mkspecs/features/qmake_use.prf | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mkspecs/common/windows-vulkan.conf b/mkspecs/common/windows-vulkan.conf index da061422dc..a5a8ec68d2 100644 @@ -16,19 +17,21 @@ index da061422dc..a5a8ec68d2 100644 -load(windows_vulkan_sdk) +load(win32/windows_vulkan_sdk) QMAKE_LIBS_VULKAN = -diff --git a/mkspecs/features/win32/windows_vulkan_sdk.prf b/mkspecs/features/win32/windows_vulkan_sdk.prf -index 6c08e28fe9..a80b0602a8 100644 ---- a/mkspecs/features/win32/windows_vulkan_sdk.prf -+++ b/mkspecs/features/win32/windows_vulkan_sdk.prf -@@ -1,7 +1,7 @@ - isEmpty(QMAKE_INCDIR_VULKAN) { - # Pick up the VULKAN_SDK env var set by the LunarG SDK so that the Vulkan - # headers are found out-of-the-box on typical Windows setups. -- QMAKE_INCDIR_VULKAN = $$(VULKAN_SDK)\\include -+ # QMAKE_INCDIR_VULKAN = $$(VULKAN_SDK)/include +diff --git a/mkspecs/features/qmake_use.prf b/mkspecs/features/qmake_use.prf +index 64faa4f215..f899792e4e 100644 +--- a/mkspecs/features/qmake_use.prf ++++ b/mkspecs/features/qmake_use.prf +@@ -15,7 +15,9 @@ for(ever) { + error("Library '$$lower($$replace(nu, _, -))' is not defined.") - # Do not export the include dir but resolve it on every qmake call. - QMAKE_EXPORT_INCDIR_VULKAN = - + DEFINES += $$eval(QMAKE_DEFINES_$${nu}) +- INCLUDEPATH += $$eval(QMAKE_INCDIR_$${nu}) ++ incdir = $$eval(QMAKE_INCDIR_$${nu}) ++ !contains(QMAKE_DEFAULT_INCDIRS, $$incdir): \ ++ INCLUDEPATH += $$incdir + } + LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD) + for (nu, LD_USES) { -- -2.22.0 +2.23.0 diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD index a0cb9805..1e6e8738 100644 --- a/qt5-base/mingw-w64/PKGBUILD +++ b/qt5-base/mingw-w64/PKGBUILD @@ -32,7 +32,7 @@ isNoOpenGL() { } pkgname=mingw-w64-qt5-base -pkgver=5.13.0 +pkgver=5.13.1 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 @@ -88,40 +88,40 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0031-Disable-hardware-randomizer-for-32-bit.patch' '0032-Prevent-static-build-to-prefer-dynamic-libraries.patch' '0033-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch') -sha256sums=('ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe' - '2df58c3c5350a7b52ed9a19b23359e8a33644012bd529fd31a42afca08a7de33' - '58473061f71f210a8344581cd5654bb6e9625cad90e63cf1f9dca063d14f187b' - '161e3e3dec7904a889bfe90bd707c00f8e2f471cde0ba7803ebd7997fc84878c' - '11b0bbb41bf8f502932f0d8d79e8470654b6adeaaec63de247d044c695e455b8' - '556c1b413d079e6f86974a576f3052645fd5919003fe38056f38a66146cc8c6d' - 'f59764fa27a9d17f4651f7745416d30570d68b11813f4bc132506213a859e0c0' - 'c9e4f335c8d0cf53f4ecff9b6642d34d4794b9fbd75a2fe7f4219f908e998b43' - 'c11a3f2354a8c0b8e12890e09c321ac486c29f32a2702c3d123cd51b49f8152e' - 'cdd71e7ea046327502872da3657132f276159f7377626a41b1a592a8aa2a435f' - '002780bf246a151763fb970234bffc9bb6f82a5e6b3c99641c455a650fad9cd6' - 'e6b535f1959a1cc5b27aefd3b69f05393d0631bd384c946da278e61f1bce6da9' - '56b4695cd46189d297f8583f5d130ef2ed2a91f96ccef76d4d70b59a52da1a6e' - '1f55fbf4a5d3dfbe7a2a3f282f0e393e8c88a5b982c694cdaf557aa5508d4be8' - '39b0c2de05cf7f51a513fe555520d80cc8a22119c4e3b245459ee486f88d902b' - '9a0714b960e82e723828bd18c0bd3a722f58eacb058960aed2e9fcbe4b8d2537' - '94dc91c13b5876d05348717b94f0bee6eca3470852e4b0a99f3d5768ee09ec6c' - '6129e5bb57e18ab064fbc9c15b7708368bc93e65b0c16ec1c83708f01e2862f1' - 'ae3cc5e48f69bcb065d919ea1ff6cd4e8216cff348348675dc0932887e62d2c8' - '1bf5cbfeab7139e1af66909e9359ed051b02d335cd032e1d87539f7a46974c09' - 'e8bceae99d8b6a802592fb7476ac68f2f015cbca0dc38959076c5029f63d0f23' - 'b491f47044b2ea161ec9881d7211ededfd1b3481f54ca93381498a50aebd3795' - '3dbb78c2ec5d3b2f33d5545de15da2ee2895978e98d35a677eaa1449e592cf3c' - '99782fd0b3cb20f2ce5425607f5f6b909ecaefcd8e038738c19d76ae3dc43ab6' - '0ce174399229425fc1f9fac6e27dc9fc7b04dd4eb4770f471fb62244368e6e64' - '365459aba005e00fb19cf0fbeb42f563d36b0b7ac9737ea981f4f4034af6e229' - '486c27a6a56140f6f43665b79b960dafb93d1d48a2d4b5a0de330f3e55685cf8' - '3f4dbd1417a63d04e5e938a37b5a614940d19c318aeeb2de43c126804a509053' - 'ca721a40d0be358baa31233b0d9db8ee70483dc25dda96dbdb080158e90200fb' - '2ba848d3a4e2a3230ee70473fdd7adb6aadb021fea2f09b7871033f281425855' - '6cff295c7011ce53319f35749d807cc6b0c3596ae92d9c36e0eb2cecbafd182e' - '45aae3d21e88cc0ac9e008cd0cc98e3178c2319d0aef726677555866c3bd4b59' - '6d661273b5f6c61c02dd0a0d3b4e7c5788646b056ba7aa3cbad125c84199ffc5' - '7e42f2b917e18dfc22e9f4fb7d7d5c1717157e9746fdaf25b55217b0b78d87be') +sha256sums=('110cd08cdacab26274bf2519d3508046616c0b638f0d2f5e00bc8bad87469eab' + '52f473398f93d9446a22ddd806d70ed3c530e4592013b0070f55fa6cb5dd024f' + 'a88f6a3246993a46ddda334f0b0a0f8969be3a4420fff17fe810399ab709fd4a' + 'da99200b82fd866b950de2fc5a0e633af12cce1b86168fdb5d91a269437af80c' + 'd1c962fdcf6974da877c6c94083f9a4c32b3565faa09b92fe4045df97add7fc2' + '704bf70f29fcd19863fdb0d1a5be62b4fa9de9c8e0bdc5b9cea4a7ed2def0908' + '560c2ad8dc492cd512da18ec66f5dd28892b589810f0e1de436a5e94fd28a52c' + 'b106f03cc8976ece37cbd3095707ae6d6e41b62e90d0ae6d34f96ebd8eb62a5a' + 'acaa96d5354c4c7bac6009a78e276b2f756c5557fb9016449af983f5cac896b1' + 'dc2ee63858c9b8e46a065fb430fb4563448e3d5b493c425939085c3290e1987d' + 'cddf9ff3f26661142fe9f895fde0ab587639b4bb8d6279e8de2e201e6f637cbf' + 'd9271e94b596bfdc2901af1ebd8a8284ef421e7a99d46dd3c65daed8a121d6d2' + 'f073aaf27b8b089cff3d3f54bec0e38229deaa999aff2dcc203656f8b7994cb6' + 'f6ef098372e051e234d979bd5f5467b81d89b2f803d4316f64564e16e12cbb52' + 'b001fc1b29d6b3db975d417d1ad9746fd0cabd7692b12a35d473399951f75111' + 'f9dda213747f49c13414a89a5ac3a57064a06798e92106cc3f2f227d5674450d' + 'a49459c9ed2a7fc29a82a94ab43459ff510c6763da73da46ccae5d51ff1f16bc' + 'e25f22a835b9e8ad12aa869222259024fff3d26bf9fe05ce4cc8d0f2f6f4a5e6' + '9940d363b3f8dc10b0151845711ba445c98e850c9fe413f52abb7f8c84eb9b50' + 'd068d378b108ebe4dc645a7cacb89c69acd6b06346bcb0b47563e8cdb9f60c46' + 'e1d4f534beb22b08cc9b70163a871281723aff19a14911f25f522c2a31de944e' + 'e7584630ea69fc8c4e937106268cbf38258550cb26d33a6a38feea0a71aa6edc' + '6193e9b1baa63819dca331f9a62a483c50150ee0fb64e1199b0c1fd3c6388ac3' + '473101992df6f30fb50b2a0be45e55f2391021c01bc2bdf6a97fd7d3067f8fe6' + '809214ea4afccba045c7dd41902b160cf5ec7e4a501457b79b0f51def73e6de4' + '565a7b7aa93c8fd57cc4e6da69246110cce82663718078b8d08952a2c4038aac' + 'a4347a60524b83a77c82aaa0502d8561dc9fb8012d676073a4211100404309ad' + '392608b8d6cf513f4e67ef1748e0b92e33808a16670db6346974ebc62977f762' + 'b74e5960f131866c3fb74fc756da9574e0d03227044a8b80ad7ad6716777035c' + '9dd9393ea601eee07b23222278369909291f1077ea7a14a790260f7b7a8da4c3' + '6ac3bf6b0c447804f8a3b2acebe7e432e2f2dfc6180501ff1a96d0174e4edbe8' + '5c37923453bc13b06a37f9e916883516c83fdcd3dcae893beb97d2b52e6b77df' + '536cd9405a0a7a825768388f9e761e8c257e7e6e64406c9a3cce3c9cf1f48474' + 'a0e20cc3bc60f9b7a3a7281b2f778362ce7cdb16d89478039f1c76896b3383bf') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -333,6 +333,19 @@ package() { "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5WindowsUIAutomationSupport* \ "${pkgdir}/usr/${_arch}/lib/"{lib,}Qt5VulkanSupport* \ "${pkgdir}/usr/${_arch}/lib/"libQt5Bootstrap* \ + rm -r \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5AccessibilitySupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5DeviceDiscoverySupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5EdidSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5EventDispatcherSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5FbSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5FontDatabaseSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5PlatformCompositorSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5ThemeSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5WindowsUIAutomationSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5VulkanSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5Bootstrap" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5BootstrapDBus" # ensure config files don't conflict with shared version pushd "${pkgdir}/usr/${_arch}/lib/cmake" @@ -393,6 +406,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + # replace library path in *.prl files so it points to the installed location and not the build directory find "${pkgdir}/usr/${_arch}/lib" \( -type f -name '*.prl' -o -name '*.pc' \) -exec sed -i -e "s:${PWD%/*}/build-${_arch}/lib:/usr/${_arch}/lib:g" {} \; diff --git a/qt5-canvas3d/mingw-w64/PKGBUILD b/qt5-canvas3d/mingw-w64/PKGBUILD index c8b0583c..922e5518 100644 --- a/qt5-canvas3d/mingw-w64/PKGBUILD +++ b/qt5-canvas3d/mingw-w64/PKGBUILD @@ -80,6 +80,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-charts/mingw-w64/PKGBUILD b/qt5-charts/mingw-w64/PKGBUILD index 611f7fde..b1772502 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.13.0 +pkgver=5.13.1 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=('04e381ec287edf230583eb32fbcde40bce62119d3eabbe2978f4ce8366e36b27') +sha256sums=('95fb573137bfd9e3655d4fb0e9fc80894e58d4f5fc02c48e46068cee27ff7aad') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -76,6 +76,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-connectivity/mingw-w64/PKGBUILD b/qt5-connectivity/mingw-w64/PKGBUILD index 20899d17..9b2f3e0c 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.13.0 +pkgver=5.13.1 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=('64fad0692c639d25295cc85f12526f3fe2eaeb51bcf47d8561ad00dd57ad5053') +sha256sums=('a1c4120ca00a8b6f275d6ad3f94565fd154b5ec2c7ca167f99cdccf6b0d5ee6f') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -75,6 +75,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-datavis3d/mingw-w64/PKGBUILD b/qt5-datavis3d/mingw-w64/PKGBUILD index 9fecb2c6..d1036b77 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.13.0 +pkgver=5.13.1 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=('6f4e5dd8e7a94d117f374a9b66013e373f5c1ccf963ad6556bf1fc8baf783821') +sha256sums=('b153f05028eabf9485c6b5c321fb3e093402be9d8717518dd9eaaad8fafaa256') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -76,6 +76,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-declarative/apple-darwin/0002-Ensure-static-plugins-are-exported.patch b/qt5-declarative/apple-darwin/0002-Ensure-static-plugins-are-exported.patch deleted file mode 100644 index 1f199c06..00000000 --- a/qt5-declarative/apple-darwin/0002-Ensure-static-plugins-are-exported.patch +++ /dev/null @@ -1,22 +0,0 @@ -From d974e620811a07888c0205d5ca7940c6d1f9be5b 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 - ---- - src/qml/Qt5QmlConfigExtras.cmake.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/qml/Qt5QmlConfigExtras.cmake.in b/src/qml/Qt5QmlConfigExtras.cmake.in -index 9ddb9885c..9775d85e0 100644 ---- a/src/qml/Qt5QmlConfigExtras.cmake.in -+++ b/src/qml/Qt5QmlConfigExtras.cmake.in -@@ -1,4 +1,4 @@ --file(GLOB _qt5qml_other_plugins "${CMAKE_CURRENT_LIST_DIR}/Qt5Qml_*Factory.cmake") -+file(GLOB _qt5qml_other_plugins "${CMAKE_CURRENT_LIST_DIR}/*Qt5Qml_*Factory.cmake") - - foreach(_other_plugin ${_qt5qml_other_plugins}) - include(${_other_plugin} OPTIONAL) --- -2.13.2 - diff --git a/qt5-declarative/apple-darwin/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch b/qt5-declarative/apple-darwin/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch deleted file mode 100644 index d1bd0b18..00000000 --- a/qt5-declarative/apple-darwin/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6a34e383816f0ef74241980e7d712fd51974b40d 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 - ---- - src/qml/parser/qqmljsglobal_p.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/qml/parser/qqmljsglobal_p.h b/src/qml/parser/qqmljsglobal_p.h -index 0e195994b..8aa451e9d 100644 ---- a/src/qml/parser/qqmljsglobal_p.h -+++ b/src/qml/parser/qqmljsglobal_p.h -@@ -56,9 +56,9 @@ - # define QT_QML_BEGIN_NAMESPACE - # define QT_QML_END_NAMESPACE - --# ifdef QDECLARATIVEJS_BUILD_DIR -+# if defined(QDECLARATIVEJS_BUILD_DIR) && !defined(QT_STATIC) - # define QML_PARSER_EXPORT Q_DECL_EXPORT --# elif QML_BUILD_STATIC_LIB -+# elif defined(QML_BUILD_STATIC_LIB) || defined(QT_STATIC) - # define QML_PARSER_EXPORT - # else - # define QML_PARSER_EXPORT Q_DECL_IMPORT -@@ -68,7 +68,7 @@ - # define QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE - # define QT_QML_END_NAMESPACE QT_END_NAMESPACE - # ifndef QT_STATIC --# if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB) -+# if defined(QT_BUILD_QMLDEVTOOLS_LIB) || defined(QT_QMLDEVTOOLS_LIB) || defined(QT_STATIC) - // QmlDevTools is a static library - # define QML_PARSER_EXPORT - # elif defined(QT_BUILD_QML_LIB) --- -2.13.2 - diff --git a/qt5-declarative/apple-darwin/PKGBUILD b/qt5-declarative/apple-darwin/PKGBUILD index 0abf7e45..3c6b40a8 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.13.0 +pkgver=5.13.1 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Classes for QML and JavaScript languages (apple-darwin)" diff --git a/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch b/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch index 634de884..9386e7b5 100644 --- a/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch +++ b/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch @@ -1,4 +1,4 @@ -From de45939789cc1540d115d8efa194a4a64045725f Mon Sep 17 00:00:00 2001 +From a4337bf1afe7ef5a230ed26f4304f975cccfda28 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 23 Oct 2016 01:18:13 +0200 Subject: [PATCH 1/2] Ensure static plugins are exported @@ -18,5 +18,5 @@ index 9ddb9885cd..9775d85e08 100644 foreach(_other_plugin ${_qt5qml_other_plugins}) include(${_other_plugin} OPTIONAL) -- -2.22.0 +2.23.0 diff --git a/qt5-declarative/mingw-w64/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch b/qt5-declarative/mingw-w64/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch index fb601e5b..65790959 100644 --- a/qt5-declarative/mingw-w64/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch +++ b/qt5-declarative/mingw-w64/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch @@ -1,4 +1,4 @@ -From af9056f5b275c099fe3a6cf49d043a61e95ac257 Mon Sep 17 00:00:00 2001 +From e660efbc2c0ae82da680d926d0e6a8325baf0aa3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 4 Feb 2017 01:59:59 +0100 Subject: [PATCH 2/2] Prevent exporting QML parser symbols on static build @@ -33,5 +33,5 @@ index bf8155c6ec..2bfa230bcc 100644 # define QML_PARSER_EXPORT # elif defined(QT_BUILD_QML_LIB) -- -2.22.0 +2.23.0 diff --git a/qt5-declarative/mingw-w64/PKGBUILD b/qt5-declarative/mingw-w64/PKGBUILD index f7a62e06..7268d110 100755 --- 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.13.0 +pkgver=5.13.1 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Classes for QML and JavaScript languages (mingw-w64)' @@ -26,9 +26,9 @@ _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" '0001-Ensure-static-plugins-are-exported.patch' '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch') -sha256sums=('b9e8780aef0af4a60e64dcc405bdf5c03a04b28e3b94d5c2e69d0006db566ba9' - 'd324b621d5947676ea8938f90c0e001b6c6b2f04bb95b4d66efd0f1529d41d3c' - 'b68381599c53a84404d75ddc3c0535fea91a01bdc57c1d1c23a64d120c3174c6') +sha256sums=('ae3477401b13d6b31e8569629d3f73b3e81e27cec27595988ffd320eaec7f0e2' + '7aed56367a2446ffc00b05a23c354f8c45424011939f632a09c31654c9d26ec7' + '637a72c7394c19b31484f5ea21e7245c3879843d4ca413e3b2ae20e945ac94b3') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -91,6 +91,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-gamepad/mingw-w64/PKGBUILD b/qt5-gamepad/mingw-w64/PKGBUILD index e2a103af..a5ff2c3e 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.13.0 +pkgver=5.13.1 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=('6bc1086d8c6a36a80dfa939b5ecb372be8c913a81e2986d84302012eafdc4b63') +sha256sums=('660e2bea430be5dc75557d038f162b77454c945ab6df1a1f4a7d69011e02c199') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -76,6 +76,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-graphicaleffects/mingw-w64/PKGBUILD b/qt5-graphicaleffects/mingw-w64/PKGBUILD index 314ad983..6380f6d1 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.13.0 +pkgver=5.13.1 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=('33bf92d6560d4d7b87f3e99dfacbc9cafc7ea5ef3d40f00cc3777a005251d0ff') +sha256sums=('f6611773c1104c26fed412dc559ae34563dbd7aea9582722fdde098cc3cbc8a7') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -77,6 +77,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-imageformats/apple-darwin/PKGBUILD b/qt5-imageformats/apple-darwin/PKGBUILD index 97da071d..3b249fe7 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.13.0 +pkgver=5.13.1 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 0857378a..df36b9ed 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.13.0 +pkgver=5.13.1 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=('91cb638e5f856acc17ab5a2e1a052dc91bb1af2bdbd7d99ba6a8a48f4a15f499') +sha256sums=('f6aa1e3fe6c3d786e211e4bd46a1349192efd82364739c0d708b7f2003a93ddf') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -81,6 +81,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ 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 11defbfd..defbfebc 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 714af476225bd05fda0693e9786774a7ca2aa733 Mon Sep 17 00:00:00 2001 +From 6ab74f5ec78011406d15c9676e48595673dedbd5 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.22.0 +2.23.0 diff --git a/qt5-location/mingw-w64/PKGBUILD b/qt5-location/mingw-w64/PKGBUILD index b351c942..4a0bc025 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.13.0 +pkgver=5.13.1 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=('205a47d259841b3879c59d3054d8b1098d3b0e7b45c64ad327daedefb4421414' - '9a6f99066138a990213565d8debfd3724c9c25110bbd65d4bb2c31db575989a7') +sha256sums=('16bd4d64b12fc3f8276fe37985f2b0f5443317c882937ab5e0b583a3a9eed298' + 'd9853eef3735366b1f11716023391dfb558705a41120c0bc1c22652e19493eaf') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -92,6 +92,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ 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 82ea9190..4a317ae0 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 c4916d43e0fbb1d08a42755c5261887e5a1ef3ca Mon Sep 17 00:00:00 2001 +From 4caa5cfbf47f51585877cd383fdc8bbaa2a3241c 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 @@ -25,7 +25,7 @@ index 1d1990c7..8ddffa03 100644 #include diff --git a/src/plugins/directshow/common/directshowglobal.h b/src/plugins/directshow/common/directshowglobal.h -index 5f391710..3ae3b8aa 100644 +index d98dd36e..1b9446f7 100644 --- a/src/plugins/directshow/common/directshowglobal.h +++ b/src/plugins/directshow/common/directshowglobal.h @@ -43,6 +43,7 @@ @@ -37,5 +37,5 @@ index 5f391710..3ae3b8aa 100644 QT_BEGIN_NAMESPACE -- -2.22.0 +2.23.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 b316dcad..13e0d0bc 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 ca522940ca219b39c0a68e165f54d388ba54d05e Mon Sep 17 00:00:00 2001 +From 2ffa3408ae3df641b5ca271a5f8705e1e16835e6 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 @@ -8,7 +8,7 @@ Subject: [PATCH 2/3] Fix build with ANGLE 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/common/evr/evrd3dpresentengine.cpp b/src/plugins/common/evr/evrd3dpresentengine.cpp -index ab694b79..79fd34be 100644 +index 4ce5a99d..c81d3bb0 100644 --- a/src/plugins/common/evr/evrd3dpresentengine.cpp +++ b/src/plugins/common/evr/evrd3dpresentengine.cpp @@ -50,9 +50,9 @@ @@ -25,5 +25,5 @@ index ab694b79..79fd34be 100644 #endif -- -2.22.0 +2.23.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 5c5b2556..920563ec 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 abe876ba634e7f817a24d2e972e5437a78ac2871 Mon Sep 17 00:00:00 2001 +From 2dc0a2906a60300e42598b57d55dda2010b3c049 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 @@ -11,7 +11,7 @@ IID_IMFTopologyServiceLookupClient when building dsengine.dll. 1 file changed, 6 insertions(+) diff --git a/src/plugins/directshow/directshow.pro b/src/plugins/directshow/directshow.pro -index e531efc5..862a6673 100644 +index 27bb3abb..5aa207dd 100644 --- a/src/plugins/directshow/directshow.pro +++ b/src/plugins/directshow/directshow.pro @@ -5,6 +5,12 @@ win32:!qtHaveModule(opengl)|qtConfig(dynamicgl) { @@ -28,5 +28,5 @@ index e531efc5..862a6673 100644 SOURCES += dsserviceplugin.cpp -- -2.22.0 +2.23.0 diff --git a/qt5-multimedia/mingw-w64/PKGBUILD b/qt5-multimedia/mingw-w64/PKGBUILD index b476c5ae..055bf111 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.13.0 +pkgver=5.13.1 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=('5076219d277083d2535e5f739d06783abe2e059e9d3fd9f924a1fa7970946d72' - '57cbc4068a36431b08c79e6e10b7f990acc27398fb95e1600dbbf5de317cc969' - 'a6f9f827ae9be35d7f83407279ce6ec1b02304c5ea92d73698bdc9629d48ccd4' - 'ea4368191fe53581f407448f7d1cf663e88b07c7a733a97f14bc91c35d7b5902') +sha256sums=('5efdb5876596c3472d24acf1ed753574dfa87b500458ea675c3112e8c2acec65' + 'cec9c82e4343520afd96776dad5901db712c4fc1c26cbfbe3468b7c8c1169e48' + '0955cd4748b534c0c804a8e42c2ce2263114118955e912c1231bfa21de108149' + '81732162031cbf5d5525aabd3dc73cb3595cf10f16ebc102edb167a53e4e6dd0') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -101,6 +101,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-networkauth/mingw-w64/PKGBUILD b/qt5-networkauth/mingw-w64/PKGBUILD index 18158b96..ca5998f4 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.13.0 +pkgver=5.13.1 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=('91ff879d0a9f7e8ff658fb569136f102ee9f25bd47852e97a1f39826c1932c0d') +sha256sums=('d5306dd7d6aa128382505046b06ad7f9c17c56a9c4277dc862c13add06b89e4a') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -76,6 +76,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-quickcontrols/mingw-w64/PKGBUILD b/qt5-quickcontrols/mingw-w64/PKGBUILD index 9a63921e..1f9145ff 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.13.0 +pkgver=5.13.1 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=('a5c6d40e0432246129d3f350a9aa419901dd73f2e4f8af6efb7a3e86e57ae167') +sha256sums=('5f3dd9a7c25aabe7a21ed7d137c23e2bfff948fefe94b183b5dee1a13667eb9b') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -77,6 +77,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-quickcontrols2/mingw-w64/PKGBUILD b/qt5-quickcontrols2/mingw-w64/PKGBUILD index 4a5b068e..12cc791b 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.13.0 +pkgver=5.13.1 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=('a5cb7e6d68285203bfb1aee87551228879fa9d93d87be5c8bab38e5a79dc916d') +sha256sums=('47df5a0d9b65bd6d06fc7edc2a93fba679249d4942163230a72ff6f3cc9f7ab8') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -77,6 +77,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-remoteobjects/mingw-w64/PKGBUILD b/qt5-remoteobjects/mingw-w64/PKGBUILD index 8779019c..2f9c7353 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.13.0 +pkgver=5.13.1 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=('24b2fc953ab4db7f46d8b7da38fef2483b2e9a51ea6836007077947e246fdadc') +sha256sums=('892a10502b2659e6a0f20167a5b6d71338fd01082e33e4b07eba43b0bbfcce69') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -85,6 +85,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-script/mingw-w64/PKGBUILD b/qt5-script/mingw-w64/PKGBUILD index f0d5796f..6413f3a1 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.13.0 +pkgver=5.13.1 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=('2323eb93a215b837d8d276f7f35e7dfb6a28b952d8b51fb92c60619813a37a80') +sha256sums=('870c65c5dff20eb797a629bd4544aa60874f44eecc0743300e83cce5708648c8') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -77,6 +77,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-scxml/mingw-w64/PKGBUILD b/qt5-scxml/mingw-w64/PKGBUILD index cf67976b..75a3ccd2 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.13.0 +pkgver=5.13.1 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=('fcd5b347a51d47b70b8192a20934951bb80cafa18fa55413ffc9e1fcb1bb2766') +sha256sums=('0669ede4e1373199893308362b9a0ba828f570a578dca52e1f17d1d622612511') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -79,6 +79,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-sensors/mingw-w64/PKGBUILD b/qt5-sensors/mingw-w64/PKGBUILD index e4fe7b14..787eeb7f 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.13.0 +pkgver=5.13.1 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=('1fae52836c786a9fd50e9e1d590384b9aea479f4569e33fc2d69536bbe2cde48') +sha256sums=('fa55e96bebb946326c46b720059536bce1e939a63b60f3c990a24ac8fec759d3') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -78,6 +78,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-serialport/mingw-w64/PKGBUILD b/qt5-serialport/mingw-w64/PKGBUILD index b8088768..1863c84d 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.13.0 +pkgver=5.13.1 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=('2f58309789e1d6b3a2653922f932703cfffddaea06bff63a552900bd63beb985') +sha256sums=('d96706f406d89b459ed0ecd129b68309a91cea0f132b839958b5311ea0d118d2') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -82,6 +82,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-speech/mingw-w64/PKGBUILD b/qt5-speech/mingw-w64/PKGBUILD index 236ba404..560f8d87 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.13.0 +pkgver=5.13.1 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=('1bfeea13cc23a9d9a02081f4e3378bc8ef51af5dfd684b261cf0a0e93be5b644') +sha256sums=('347343a96710b389e8e05506df3c971b9437f101d09677e44f4bf2a87bf25556') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -79,6 +79,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-svg/apple-darwin/PKGBUILD b/qt5-svg/apple-darwin/PKGBUILD index 941f7cfa..3592df8b 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.13.0 +pkgver=5.13.1 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 e65d0367..8bc69c98 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.13.0 +pkgver=5.13.1 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=('0f568e20d13418c6d8e395db2ce4d2d706d3fb470cd665853e3637a29fde0eaf') +sha256sums=('409e8845c28412041c36f559a7a6e2414f3d9a8dd45c5a85065e279b788e07ab') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -76,6 +76,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-tools/apple-darwin/0001-Fix-linguist-macro.patch b/qt5-tools/apple-darwin/0001-Fix-linguist-macro.patch index 5467f679..185d13fd 100644 --- a/qt5-tools/apple-darwin/0001-Fix-linguist-macro.patch +++ b/qt5-tools/apple-darwin/0001-Fix-linguist-macro.patch @@ -1,4 +1,4 @@ -From 74188cdf0f85a90bf86f251480d6a41b7ea61be2 Mon Sep 17 00:00:00 2001 +From 1a308c71f117ef4ff33a5062663a72545160c675 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 25 Sep 2016 21:44:42 +0200 Subject: [PATCH] Fix linguist macro @@ -11,7 +11,7 @@ Subject: [PATCH] Fix linguist macro 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/linguist/Qt5LinguistToolsMacros.cmake b/src/linguist/Qt5LinguistToolsMacros.cmake -index 6013cc6e..2e797326 100644 +index 23beeb39..bf1b0ad6 100644 --- a/src/linguist/Qt5LinguistToolsMacros.cmake +++ b/src/linguist/Qt5LinguistToolsMacros.cmake @@ -71,8 +71,10 @@ function(QT5_CREATE_TRANSLATION _qm_files) @@ -24,19 +24,19 @@ index 6013cc6e..2e797326 100644 - COMMAND ${Qt5_LUPDATE_EXECUTABLE} + COMMAND ${LUPDATE_LOC} ARGS ${_lupdate_options} "@${_ts_lst_file}" -ts ${_ts_file} - DEPENDS ${_my_sources} ${_ts_lst_file} VERBATIM) - endforeach() -@@ -93,8 +95,9 @@ function(QT5_ADD_TRANSLATION _qm_files) - set(qm "${CMAKE_CURRENT_BINARY_DIR}/${qm}.qm") + DEPENDS ${_my_sources} + BYPRODUCTS ${_ts_lst_file} VERBATIM) +@@ -103,8 +105,9 @@ function(QT5_ADD_TRANSLATION _qm_files) + set(qm "${CMAKE_CURRENT_BINARY_DIR}/${FILE_NAME}.qm") endif() + get_target_property(LRELEASE_LOC ${Qt5_LRELEASE_EXECUTABLE} IMPORTED_LOCATION) add_custom_command(OUTPUT ${qm} - COMMAND ${Qt5_LRELEASE_EXECUTABLE} + COMMAND ${LRELEASE_LOC} - ARGS ${_abs_FILE} -qm ${qm} + ARGS ${_LRELEASE_OPTIONS} ${_abs_FILE} -qm ${qm} DEPENDS ${_abs_FILE} VERBATIM ) -- -2.13.2 +2.23.0 diff --git a/qt5-tools/apple-darwin/PKGBUILD b/qt5-tools/apple-darwin/PKGBUILD index ced96524..d028494a 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.13.0 +pkgver=5.13.1 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; apple-darwin)" @@ -19,7 +19,7 @@ _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') sha256sums=('1ff5dc747b7935de85257673424dfdffb231f3409f09a5f833d37e2f625cfe32' - 'de1f0114b723d07f1c7a2c11c15e8c5b05852c690e3a36d3f65f3a411fd81127') + '839996d563ae8040b18094d04af81d0140673ff0b503a872ecd2a750d8a26eba') _architectures='x86_64-apple-darwin15' _configurations+=('CONFIG+=static') _osxcrossprefix='/opt/osxcross' diff --git a/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch b/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch index 6dc3b134..185d13fd 100644 --- a/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch +++ b/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch @@ -1,4 +1,4 @@ -From ffd3e182a2613dace20bcc0b4edab14d6306aa8c Mon Sep 17 00:00:00 2001 +From 1a308c71f117ef4ff33a5062663a72545160c675 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 25 Sep 2016 21:44:42 +0200 Subject: [PATCH] Fix linguist macro @@ -11,7 +11,7 @@ Subject: [PATCH] Fix linguist macro 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/linguist/Qt5LinguistToolsMacros.cmake b/src/linguist/Qt5LinguistToolsMacros.cmake -index 5c357a15..f514e3f6 100644 +index 23beeb39..bf1b0ad6 100644 --- a/src/linguist/Qt5LinguistToolsMacros.cmake +++ b/src/linguist/Qt5LinguistToolsMacros.cmake @@ -71,8 +71,10 @@ function(QT5_CREATE_TRANSLATION _qm_files) @@ -38,5 +38,5 @@ index 5c357a15..f514e3f6 100644 DEPENDS ${_abs_FILE} VERBATIM ) -- -2.22.0 +2.23.0 diff --git a/qt5-tools/mingw-w64/PKGBUILD b/qt5-tools/mingw-w64/PKGBUILD index 78e74c2d..93d77f72 100755 --- 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.13.0 +pkgver=5.13.1 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)" @@ -29,8 +29,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-Fix-linguist-macro.patch') -sha256sums=('a7887a618dc6434c2567521990c2a7ca72ca6a8379c1d93c5aa6c1798d7a0819' - '49dfa10ed824ea1885f56ff999bd5cda8e88fc32c16d5646b2bd62fd4ff9ad2f') +sha256sums=('7947bdd758514a0c2d44b0a2110adb6056b18bce75c716711e48bcc8de5c7e82' + '839996d563ae8040b18094d04af81d0140673ff0b503a872ecd2a750d8a26eba') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -100,6 +100,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-translations/apple-darwin/PKGBUILD b/qt5-translations/apple-darwin/PKGBUILD index b37b5476..68afc6d7 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.13.0 +pkgver=5.13.1 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 ad1d09c6..d57583e0 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.13.0 +pkgver=5.13.1 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=('2f8fb3b2c62fcf1aacd0b32432b960a83546384688c0ea78514e4cf4f2f94c28') +sha256sums=('01320c62ce28c5d7bc6d3c078e11d4d80415ab007ad94ffe1a635a2ce0ddccfd') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-virtualkeyboard/mingw-w64/PKGBUILD b/qt5-virtualkeyboard/mingw-w64/PKGBUILD index b20c6570..45bb7496 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.13.0 +pkgver=5.13.1 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=('91483feb79c648ec8820a238ee2a12cf1aa117e8f3a5b06d069450e0c9ad42e9') +sha256sums=('b44b2f788250a85d86f682bea4c0cdc8a70dd630d44682a545790b2618b28195') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -91,6 +91,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-webchannel/mingw-w64/PKGBUILD b/qt5-webchannel/mingw-w64/PKGBUILD index 764adcaf..d3ba4416 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.13.0 +pkgver=5.13.1 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=('7f6260c73bca968511ab2facfbb14b4d8cc7a9c5b2d0f9211e7390ed8fb52b9a') +sha256sums=('f72f875a0cafe7931341ef31084acfb489ede79c36dbce74820c2a5b5d6afb2c') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -76,6 +76,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-webengine/mingw-w64-git/PKGBUILD b/qt5-webengine/mingw-w64-git/PKGBUILD index d2d9b0cc..3e169e7e 100644 --- a/qt5-webengine/mingw-w64-git/PKGBUILD +++ b/qt5-webengine/mingw-w64-git/PKGBUILD @@ -75,7 +75,7 @@ package() { fi # replace library path in *.prl files so it points to the installed location and not the build directory - find "${pkgdir}/usr/${_arch}/lib" \( -type f -name '*.prl' -o -name '*.pc' \) -exec sed -i -e "s:$PWD/lib:/usr/$_arch/lib:g" {} \; + find "${pkgdir}/usr/${_arch}/lib" \( -type f -name '*.prl' -o -name '*.pc' \) -exec sed -i -e "s:$PWD/lib:/usr/$_arch/lib:g" {} \; # remove prl files for debug version if ! [[ $MINGW_W64_QT_DEBUG_BUILD ]]; then @@ -84,6 +84,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-webengine/mingw-w64/PKGBUILD b/qt5-webengine/mingw-w64/PKGBUILD index 5f2fc35d..0fa5d4f6 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.13.0 +pkgver=5.13.1 pkgrel=1 arch=('any') pkgdesc='Provides support for web applications using the Chromium browser project (mingw-w64)' @@ -97,6 +97,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ 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 fc1efb0e..5a48b743 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 1393558647e7c33a6c4bd4d7ba7f80379fe10a0b Mon Sep 17 00:00:00 2001 +From 1a477c9a3f7767866045ad5eda98c9f494391edf 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.22.0 +2.23.0 diff --git a/qt5-webglplugin/mingw-w64/PKGBUILD b/qt5-webglplugin/mingw-w64/PKGBUILD index f405d982..35595881 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.13.0 +pkgver=5.13.1 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=('b8f05ee429f3fb7d6cef789333ddb56aafdc30a83e05b04f5f9e05650146c06e' - '4a3e65c165fbb0dd7084899e7379344555da52959b81b4871c46f6edf2b758cf') +sha256sums=('fb40c4077f0dc3954c786c47f065e8fa1816af70bd1d42359aac70bf59652b1a' + 'ca03e23308c9887f1c406839188126dae9f134be120475fd02f475ce4006a32b') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -88,6 +88,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-webkit/mingw-w64/PKGBUILD b/qt5-webkit/mingw-w64/PKGBUILD index f2a30bc2..5f94cffa 100644 --- a/qt5-webkit/mingw-w64/PKGBUILD +++ b/qt5-webkit/mingw-w64/PKGBUILD @@ -140,6 +140,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-websockets/mingw-w64/PKGBUILD b/qt5-websockets/mingw-w64/PKGBUILD index 7cd3bb85..cb251576 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.13.0 +pkgver=5.13.1 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=('f941dd44f6e16041a25723c1b70ce9e28910c630509da0044ecb9fdda28a6e34') +sha256sums=('f6b0583cfc5bbdccb89f68297a53cfe6c858c7a7de8e64548066cafd981c0799') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -76,6 +76,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-webview/mingw-w64-git/PKGBUILD b/qt5-webview/mingw-w64-git/PKGBUILD index 12d4af2b..a412d197 100644 --- a/qt5-webview/mingw-w64-git/PKGBUILD +++ b/qt5-webview/mingw-w64-git/PKGBUILD @@ -71,6 +71,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ 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 index c54194e0..da66a3b0 100644 --- 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 @@ -1,4 +1,4 @@ -From 0f64007c5def6d518d1ff91e5d8844c32918276f Mon Sep 17 00:00:00 2001 +From ecdad153169066f5fae320e898ab420a0cddc6f1 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 @@ -294,5 +294,5 @@ index 705c48c..5d93c6b 100644 qwintaskbarprogress.cpp \ windowsguidsdefs.cpp \ -- -2.22.0 +2.23.0 diff --git a/qt5-winextras/mingw-w64/PKGBUILD b/qt5-winextras/mingw-w64/PKGBUILD index 32c3be2e..f4e4198f 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.13.0 +pkgver=5.13.1 pkgrel=1 arch=('any') pkgdesc="Classes and functions that enable you to use Windows-specific functions (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-Revert-Directly-link-to-functions-available-from-Win.patch') -sha256sums=('096387a674f7fa1faeda856b87e965bd2937e3dcce334f10df694468003887d4' - 'f35f506e30596b5add67cf52da359bbaafa4d0b99679d2fe21b41bc7f685b95f') +sha256sums=('fdcbb45f7255d771fb0e61e1e5f3dc1c29a1967a6ba80da5171fc7c2c0faf7a6' + 'b48fef502062f2f5062926f2a196441f8dad4dd689d93a4a12c859af7e6ab40f') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -78,6 +78,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \ diff --git a/qt5-xmlpatterns/mingw-w64/PKGBUILD b/qt5-xmlpatterns/mingw-w64/PKGBUILD index 186fbcf1..b6bd10c8 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.13.0 +pkgver=5.13.1 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=('75186ff075d9a3bd30cee145bad6bc69d491b5e555b048d11136727f050d7319') +sha256sums=('2867cc8c92164909d6117b392d1cd9102dd38d815dbdf108f3f10e630c5a748b') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ @@ -76,6 +76,9 @@ package() { done fi + # remove '.static.prl' files + find "${pkgdir}/usr/${_arch}" -name '.static.prl' -delete + find "${pkgdir}/usr/${_arch}/lib" -maxdepth 1 -name '*.dll' -delete [ "$NO_STATIC_EXECUTABLES" -a "${_config##*=}" = static -o "$NO_EXECUTABLES" ] && \ find "${pkgdir}/usr/${_arch}" -name '*.exe' -delete || \