diff --git a/devel/qt5/rebase-patches.sh b/devel/qt5/rebase-patches.sh index 52a67a28..b1656881 100755 --- a/devel/qt5/rebase-patches.sh +++ b/devel/qt5/rebase-patches.sh @@ -24,18 +24,23 @@ if [[ $branch_count -ge 1 ]]; then fi # determine branch from old version +oldversionbranch=$oldversion-$oldbranchsuffix-fixes +branch_count=$(git branch | grep -- "$oldversionbranch" | wc -l) +if [[ $branch_count -lt 1 ]]; then oldversionbranch=$oldversion-$oldbranchsuffix branch_count=$(git branch | grep -- "$oldversionbranch" | wc -l) if [[ $branch_count -lt 1 ]]; then msg2 "Branch for old version $oldversionbranch doesn't exist. Likely we just don't need any patches for this repo :-)" exit 0 fi +fi if [[ -z $3 ]] && [[ $branch_count -gt 1 ]]; then msg 'Which of the following branches was the latest for the old version?' git branch | grep "$oldversionbranch" msg2 'Please disambiguate by specifying the corresponding suffix as 3rd argument.' exit -1 fi +msg2 "Basing new version $newversionbranch on $oldversionbranch" # determine remote to push remote= diff --git a/devel/versions.sh b/devel/versions.sh index 79cd72a0..80afbe93 100755 --- a/devel/versions.sh +++ b/devel/versions.sh @@ -12,7 +12,7 @@ declare -A versions=( [blackwidowcontrol]=1.0.2 [dbus-soundrecorder]=1.2.3 [geocoordinatecalculator]=1.1.3 - [qt5]=5.14.1 + [qt5]=5.14.2 ) declare -A github_names=( [c++utilities]=cpp-utilities diff --git a/qt5-3d/mingw-w64/PKGBUILD b/qt5-3d/mingw-w64/PKGBUILD index 24bba2ad..acc819b3 100644 --- a/qt5-3d/mingw-w64/PKGBUILD +++ b/qt5-3d/mingw-w64/PKGBUILD @@ -13,7 +13,7 @@ _qt_module=qt3d pkgname=mingw-w64-qt5-3d -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)" @@ -25,7 +25,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=('86f425e8bdf55b7b3f6a8384c2b9cffee30407fcf87ece0db060fdfb797a0774') +sha256sums=('9da82f1cc4b7d416d31ec96224c59d221473a48f6e579eef978f7d2e3932c674') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-3d/mingw-w64/PKGBUILD.sh.ep b/qt5-3d/mingw-w64/PKGBUILD.sh.ep index 3369c4da..805a77e0 100644 --- a/qt5-3d/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-3d/mingw-w64/PKGBUILD.sh.ep @@ -4,7 +4,7 @@ # Contributor: ant32 % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)" diff --git a/qt5-3d/mingw-w64/qt3d-sha256.txt b/qt5-3d/mingw-w64/qt3d-sha256.txt index 4809049b..d7b063ab 100644 --- a/qt5-3d/mingw-w64/qt3d-sha256.txt +++ b/qt5-3d/mingw-w64/qt3d-sha256.txt @@ -1 +1 @@ -86f425e8bdf55b7b3f6a8384c2b9cffee30407fcf87ece0db060fdfb797a0774 +9da82f1cc4b7d416d31ec96224c59d221473a48f6e579eef978f7d2e3932c674 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 2362f93b..f4818547 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 @@ -17,5 +17,5 @@ index 7f9a8d4..6f3548a 100644 SOURCES = main.cpp -- -2.25.0 +2.26.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 3dcafb52..610ac085 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 @@ -52,5 +52,5 @@ index 86699eb..4e454f8 100644 } -- -2.25.0 +2.26.0 diff --git a/qt5-activeqt/mingw-w64/PKGBUILD b/qt5-activeqt/mingw-w64/PKGBUILD index fdddb05c..348e14e8 100644 --- a/qt5-activeqt/mingw-w64/PKGBUILD +++ b/qt5-activeqt/mingw-w64/PKGBUILD @@ -15,7 +15,7 @@ _qt_module=qtactiveqt pkgname=mingw-w64-qt5-activeqt -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="ActiveX integration framework (mingw-w64)" @@ -29,9 +29,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=('457dba433497d79a0ee0e44f9f8cf8afbcbb2e36861f98516413a688a5e88aa0' - 'be77080f4d55621fde0b8ff5e0f5d8f914b0753502f511dcdc03a6218d2b351f' - '07004636c487802fb26c5eb7a5b125bbf236b3ef36fa56ba4652c1b10d5b549c') +sha256sums=('b53517d5d128719773a2941ba52da10acd7aa3149948862bc08c98f5b64152a9' + '3031b49a657eed1246100d40053c2f1baa819268af849940297eef1f4489fad3' + 'b90ca9a16ff75421cca19f8f21506484998ada76f0a0921582b9c0d1e9ea23a9') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-activeqt/mingw-w64/PKGBUILD.sh.ep b/qt5-activeqt/mingw-w64/PKGBUILD.sh.ep index 505092ac..67fabb6d 100644 --- a/qt5-activeqt/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-activeqt/mingw-w64/PKGBUILD.sh.ep @@ -10,7 +10,7 @@ % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="ActiveX integration framework (mingw-w64)" diff --git a/qt5-activeqt/mingw-w64/qtactiveqt-sha256.txt b/qt5-activeqt/mingw-w64/qtactiveqt-sha256.txt index dc6ea1f2..62d42062 100644 --- a/qt5-activeqt/mingw-w64/qtactiveqt-sha256.txt +++ b/qt5-activeqt/mingw-w64/qtactiveqt-sha256.txt @@ -1 +1 @@ -457dba433497d79a0ee0e44f9f8cf8afbcbb2e36861f98516413a688a5e88aa0 +b53517d5d128719773a2941ba52da10acd7aa3149948862bc08c98f5b64152a9 diff --git a/qt5-base/apple-darwin/PKGBUILD b/qt5-base/apple-darwin/PKGBUILD index a5b03a3c..1ea39dc8 100644 --- a/qt5-base/apple-darwin/PKGBUILD +++ b/qt5-base/apple-darwin/PKGBUILD @@ -5,7 +5,7 @@ # All patches are managed at https://github.com/Martchus/qtbase pkgname=apple-darwin-qt5-base -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 pkgdesc='A cross-platform application and UI framework (apple-darwin)' arch=('i686' 'x86_64') diff --git a/qt5-base/mingw-w64-angle/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/qt5-base/mingw-w64-angle/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch index f8182ec0..7e41b92d 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 5a6b36b853699f49504173ca35a1c47c9a54d56f Mon Sep 17 00:00:00 2001 +From c416378bd70ab26f9ce9e34fe72a364dd19bae73 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/31] Adjust win32-g++ profile for cross compilation with @@ -21,7 +21,7 @@ Change-Id: I4c9b3c170ed13943abe0d8b397a8cb9e360538b6 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index 6369436863..17d2a5efec 100644 +index c3a1f3a373..5208d22bd6 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -8,18 +8,24 @@ @@ -43,10 +43,10 @@ index 6369436863..17d2a5efec 100644 MAKEFILE_GENERATOR = MINGW QMAKE_PLATFORM = win32 mingw --CONFIG += precompile_header +-CONFIG += debug_and_release debug_and_release_target precompile_header -DEFINES += UNICODE _UNICODE WIN32 MINGW_HAS_SECURE_API=1 -QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32 -+CONFIG += precompile_header $${CROSS_COMPILE_CUSTOM_CONFIG} ++CONFIG += debug_and_release debug_and_release_target precompile_header $${CROSS_COMPILE_CUSTOM_CONFIG} +DEFINES += UNICODE _UNICODE MINGW_HAS_SECURE_API=1 +QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32 WIN32 # can't add 'DEFINES += WIN64' and 'QMAKE_COMPILER_DEFINES += _WIN64' defines for @@ -163,5 +163,5 @@ index 5de482f23b..3c3d22c699 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.25.1 +2.26.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 349d12f0..d100924a 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 236c97172a05e530ab98153c0d16a4ddf59cd33c Mon Sep 17 00:00:00 2001 +From 06380a45c2cb2f6882e7102fdd46bcdd9e4aba48 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/31] Ensure GLdouble is defined when using dynamic OpenGL @@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.25.1 +2.26.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 a12c3199..eec82f7c 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 160ef19acaa0504bb04a8f5ffc22229102c3ec9b Mon Sep 17 00:00:00 2001 +From 40b1ebaa7481c339b437e976e760bf099df5c594 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 03/31] 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.25.1 +2.26.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 f974943e..9122c11e 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 d758e71cb38b4fec2f012121605185bf395206cf Mon Sep 17 00:00:00 2001 +From f1122d1929e271162eb062aad43097ad69c7159e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 04/31] Make sure *.pc files are installed correctly @@ -49,10 +49,10 @@ index ab970c966f..01f97c61d4 100644 void writePkgConfigFile(); // for pkg-config diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 86d10c213c..c1b28a52e9 100644 +index 3ec2704625..f33edb5bd9 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp -@@ -761,7 +761,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) +@@ -775,7 +775,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) } if(!ret.isEmpty()) ret += "\n\t"; @@ -62,5 +62,5 @@ index 86d10c213c..c1b28a52e9 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.25.1 +2.26.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 cfc95ac3..d303224b 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 c38954b7d8c29530a5290c52f7981d7a784e7a4f Mon Sep 17 00:00:00 2001 +From dc9860e99a09a4dc54cfe60959a34e06a288f7d6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 05/31] Don't add resource files to LIBS parameter @@ -24,5 +24,5 @@ index 096b041056..eb498b28e8 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.25.1 +2.26.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 9af15baf..36345b94 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 8b73190855f699bd7c1ff67c753fe3d17996f43b Mon Sep 17 00:00:00 2001 +From 2cfd0a32516ba85f0c608fb81341090c28209750 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 06/31] Prevent debug library names in pkg-config files @@ -29,5 +29,5 @@ index f9532e0db9..9c65f21ac0 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.25.1 +2.26.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 21243611..3425b12a 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 99c07cf7413a04cd7297a4c18e4ebf73351c8720 Mon Sep 17 00:00:00 2001 +From 3e1b4e602c5a2569d9a337990a2e38e3ef82f251 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 07/31] Fix linking against shared/static libpng @@ -26,5 +26,5 @@ index 0202f17b21..099c11da95 100644 ], "use": [ -- -2.25.1 +2.26.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 246b4196..a2de09a6 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 3a5c4c981dade3223099630a16a874ba083ecd55 Mon Sep 17 00:00:00 2001 +From d54fefe4a033a39ba628858c18ab0a95520069f2 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 08/31] Fix linking against static D-Bus @@ -9,7 +9,7 @@ Subject: [PATCH 08/31] Fix linking against static D-Bus 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.json b/configure.json -index 62d78f8dc6..f7d169f053 100644 +index 868f15db13..147cf9eb00 100644 --- a/configure.json +++ b/configure.json @@ -188,18 +188,23 @@ @@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644 # include #else -- -2.25.1 +2.26.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 8f41e997..2b435f7f 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 e1a1979b15712954adfca6d44f45dad99357286e Mon Sep 17 00:00:00 2001 +From 012e5b2dfbc5de85412bb450970d0320e369da30 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 09/31] 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 f7d169f053..846cb678c9 100644 +index 147cf9eb00..a481e54b8d 100644 --- a/configure.json +++ b/configure.json @@ -201,7 +201,7 @@ @@ -25,5 +25,5 @@ index f7d169f053..846cb678c9 100644 }, "condition": "config.win32 && features.shared" -- -2.25.1 +2.26.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 35423bfd..f5effe21 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 3c9bf1e7fcd5f965d9f3a91d05d762d6f4061a5e Mon Sep 17 00:00:00 2001 +From ca204fd0ed444fdf4e478540f8b5d88cb345be75 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 10/31] Fix linking against static freetype2 @@ -26,5 +26,5 @@ index 099c11da95..872deb3ad3 100644 { "libs": "-lfreetype" } ], -- -2.25.1 +2.26.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 68c5df49..b8515a34 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 c7515aea498a46c8d2291b8590989d6092ab3404 Mon Sep 17 00:00:00 2001 +From 483ae9b6bfc1f40e3617d8b6cd58ef93985cf397 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 11/31] Fix linking against static harfbuzz @@ -25,5 +25,5 @@ index 872deb3ad3..7daaaa5a11 100644 }, "imf": { -- -2.25.1 +2.26.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 a3b179b3..a0f3ac35 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 d3f6ecda90e28aabf58cbb4a92f22e803551ac05 Mon Sep 17 00:00:00 2001 +From 0c26bfba6773298fd314fc38ec1be7cb58a5d752 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 12/31] Fix linking against static pcre @@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1 1 file changed, 4 insertions(+) diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp -index 67be67c243..0bc4c5157c 100644 +index 59d21e0a23..518f91d753 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp @@ -53,6 +53,10 @@ @@ -24,5 +24,5 @@ index 67be67c243..0bc4c5157c 100644 #include -- -2.25.1 +2.26.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 ebcd671d..3249f32f 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 e6dde84ed7cc286a9e195b96e609f244654b4540 Mon Sep 17 00:00:00 2001 +From 2852ac7e9e087b8374daa044dba1885d5c2bbac5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 13/31] 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.25.1 +2.26.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 c1bc565b..f6ada4e2 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 d97b57e1de32789a2cdfee280c49b3b8dff31a55 Mon Sep 17 00:00:00 2001 +From 5f3fb54d36009c5eced4335e79437b5d8eecdf08 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 14/31] Fix linking against shared/static PostgreSQL @@ -24,5 +24,5 @@ index babd0465ce..37e25881f0 100644 ] }, -- -2.25.1 +2.26.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 1fb948e1..10faeb3a 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,20 +1,18 @@ -From 8fcc619606cfa41f46f9b605a4752e33c376d5a1 Mon Sep 17 00:00:00 2001 +From d61af2077d70356fc0f69aeb27e82bed66f8d52e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 15/31] Rename qtmain to qt5main Prevents conflict with mingw-w64-qt4 package - -Change-Id: I1a1533bb37d5c87b3f8e9534f67aa76026c44aed --- mkspecs/common/g++-win32.conf | 2 +- - mkspecs/features/create_cmake.prf | 4 ++-- + mkspecs/features/create_cmake.prf | 8 ++++---- mkspecs/features/win32/windows.prf | 4 ++-- src/winmain/winmain.pro | 2 +- - 4 files changed, 6 insertions(+), 6 deletions(-) + 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index 17d2a5efec..2975d371e3 100644 +index 5208d22bd6..1a058b787f 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -84,7 +84,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 @@ -27,20 +25,28 @@ index 17d2a5efec..2975d371e3 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 4aa5dad467..fa8c142ec5 100644 +index 0e71fd0015..0e8d41c685 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -321,8 +321,8 @@ mac { - CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll - CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll +@@ -325,14 +325,14 @@ mac { + } + mingw { - CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}$${debug_suffix}.a - CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a + CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a - !isEmpty(CMAKE_STATIC_TYPE) { - CMAKE_STATIC_WINDOWS_BUILD = "true" + CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a + } else { +- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib +- CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib ++ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib ++ CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib + + CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf index 272170d428..17f3ef9c2d 100644 --- a/mkspecs/features/win32/windows.prf @@ -70,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644 CONFIG += static -- -2.25.1 +2.26.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 4ddd04c2..715e6716 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 6ca73861aeb489e9e46c8ad051c7afd100d09cc9 Mon Sep 17 00:00:00 2001 +From f24d3dd8face31fb7b522ca383b8515ba2913911 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 16/31] Enable rpath for build tools @@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644 INSTALLS += target -- -2.25.1 +2.26.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 851b7e4f..2a946c4a 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 eba7f4ccfeb320a5b6a3a458c765ae2e63d38efc Mon Sep 17 00:00:00 2001 +From 3b9033c42d77fba36734f8268f042e2c0154c2b5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 17/31] Use system zlib for build tools @@ -23,5 +23,5 @@ index 9863ff5e69..02329611bc 100644 } else { CONFIG += no_core_dep -- -2.25.1 +2.26.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 8833b945..df15800f 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 6b5826e9aa80d2daa13cf1e20c01186145a73841 Mon Sep 17 00:00:00 2001 +From 5756d20ee409d114a355bd07051311757af46fa4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 18/31] Merge shared and static library trees @@ -48,7 +48,7 @@ index 81c84b28ef..910e59188f 100644 + CONFIG += no_smart_library_merge +} diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf -index 0e41b825ec..4c4b6dd12a 100644 +index 1d79f5c958..48f6e710b6 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -1,5 +1,16 @@ @@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.25.1 +2.26.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 eba90a8a..f811de33 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 c48e5bd1dca8cc003d70c9bf4f64b9954375afec Mon Sep 17 00:00:00 2001 +From e21df21893a3071ea5908c9cc19becda0287a231 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 19/31] Use *.dll.a as import lib extension @@ -6,7 +6,7 @@ Subject: [PATCH 19/31] Use *.dll.a as import lib extension The variables used here are provided by g++-win32.conf -Change-Id: I1175feedd96ef4940af87dc3662fedc8f4d1d764 +Change-Id: I40acb56685628ed52b3e6b89aab7f53f9a872b1a --- mkspecs/features/create_cmake.prf | 5 +++-- mkspecs/features/qt.prf | 15 ++++++++++++--- @@ -14,21 +14,21 @@ Change-Id: I1175feedd96ef4940af87dc3662fedc8f4d1d764 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index fa8c142ec5..e023f39a5d 100644 +index 0e8d41c685..a94f443de6 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -332,8 +332,9 @@ mac { - CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.prl - CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl - } else { -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a -+ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a -+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} -+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} - } +@@ -328,8 +328,9 @@ mac { + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a + CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a + +- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a +- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a ++ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a ++ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} ++ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} } else { - CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib + CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index bbada46c29..d6299d8eed 100644 --- a/mkspecs/features/qt.prf @@ -59,7 +59,7 @@ index bbada46c29..d6299d8eed 100644 } } diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index c1b28a52e9..3b4372ad05 100644 +index f33edb5bd9..3a75986257 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -99,9 +99,13 @@ private: @@ -94,5 +94,5 @@ index c1b28a52e9..3b4372ad05 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.25.1 +2.26.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 0444c851..36f759ea 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 fbd7da2201a41d429753dd3833e59a867d336497 Mon Sep 17 00:00:00 2001 +From 181461364ddf790c194108c4d6130cdd117c3a0a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 20/31] Pull dependencies of static libraries in CMake modules @@ -34,7 +34,7 @@ Change-Id: I6566d42d7e27d4cd23d261a0eacca9efad9ce6df 2 files changed, 135 insertions(+), 190 deletions(-) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 50364765fb..357c8b9cba 100644 +index 1099a761ce..a82e6a886f 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -53,6 +53,10 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura @@ -484,5 +484,5 @@ index 7b70cfed09..25f2162fe6 100644 -set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_TYPE \"$$CMAKE_PLUGIN_TYPE\") -set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_EXTENDS \"$$CMAKE_PLUGIN_EXTENDS\") -- -2.25.1 +2.26.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 130bbd3e..bf9ea9af 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 0bda7826502a4c823953ffbd1d9b4f851a61c651 Mon Sep 17 00:00:00 2001 +From f92560dca3a5ade9c23dc6f5cf84ec0ab6404080 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 21/31] Allow usage of static version with CMake @@ -11,20 +11,20 @@ installed in the same prefix - Set USE_STATIC_QT_BY_DEFAULT to use static version via regular find_package(Qt5Core) -Change-Id: Ib9411a9edbad2a82414b1af61075172a797f4318 +Change-Id: I339c8ef3a6ab96a3a6b85f7c8b93f1a5ee38cd71 --- - mkspecs/features/create_cmake.prf | 108 ++++--- + mkspecs/features/create_cmake.prf | 96 ++++-- .../data/cmake/Qt5BasicConfig.cmake.in | 304 ++++++++++++------ .../data/cmake/Qt5PluginTarget.cmake.in | 22 +- .../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, 319 insertions(+), 160 deletions(-) + 7 files changed, 320 insertions(+), 147 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 e023f39a5d..b2594d9921 100644 +index a94f443de6..a0166e4230 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -68,7 +68,7 @@ split_incpath { @@ -45,23 +45,24 @@ index e023f39a5d..b2594d9921 100644 internal_module { CMAKE_INTERNAL_MODULE = true -@@ -214,23 +216,25 @@ contains(CONFIG, plugin) { +@@ -214,20 +216,25 @@ contains(CONFIG, plugin) { win32 { !mingw|qtConfig(debug_and_release): debug_suffix="d" +- CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl +- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl +- - isEmpty(CMAKE_STATIC_TYPE) { + mingw { CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.dll CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.dll -+ CMAKE_PLUGIN_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a -+ CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a - CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl - CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl - } else:mingw { - CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a - CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a -- CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.prl -- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.prl ++ CMAKE_PLUGIN_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a ++ CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a ++ CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl ++ CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl + CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.static.prl + CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.static.prl } else { # MSVC static @@ -69,15 +70,15 @@ index e023f39a5d..b2594d9921 100644 CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.lib + CMAKE_PLUGIN_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.lib + CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.lib - CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl - CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl ++ CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl ++ CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl } } else { + # this branch is broken by the patch, only apply when building for Windows mac { isEmpty(CMAKE_STATIC_TYPE): CMAKE_PLUGIN_EXT = .dylib else: CMAKE_PLUGIN_EXT = .a -@@ -250,9 +254,9 @@ contains(CONFIG, plugin) { +@@ -247,9 +254,9 @@ contains(CONFIG, plugin) { } } cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in @@ -89,7 +90,7 @@ index e023f39a5d..b2594d9921 100644 !build_pass { QMAKE_SUBSTITUTES += cmake_target_file -@@ -261,7 +265,7 @@ contains(CONFIG, plugin) { +@@ -258,7 +265,7 @@ contains(CONFIG, plugin) { cmake_qt5_plugin_file.files = $$cmake_target_file.output static|staticlib: cmake_qt5_plugin_file.files += $$cmake_qt5_plugin_import_file.output @@ -98,7 +99,7 @@ index e023f39a5d..b2594d9921 100644 INSTALLS += cmake_qt5_plugin_file return() -@@ -274,26 +278,34 @@ mod_deps = +@@ -271,26 +278,34 @@ mod_deps = lib_deps = aux_mod_deps = aux_lib_deps = @@ -137,17 +138,24 @@ index e023f39a5d..b2594d9921 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 -@@ -324,18 +336,17 @@ mac { +@@ -317,13 +332,6 @@ mac { + CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll + CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll + +- !isEmpty(CMAKE_STATIC_TYPE) { +- CMAKE_STATIC_WINDOWS_BUILD = "true" +- +- CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl +- CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl +- } +- + mingw { CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a - -- !isEmpty(CMAKE_STATIC_TYPE) { -- CMAKE_STATIC_WINDOWS_BUILD = "true" -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a -+ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = dll.a -+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} -+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} +@@ -331,14 +339,30 @@ mac { + isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a + CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} + CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl + CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl + @@ -155,36 +163,16 @@ index e023f39a5d..b2594d9921 100644 + CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC = lib$${CMAKE_QT_STEM}.a + CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.static.prl + CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC = $${CMAKE_QT_STEM}.static.prl - -- CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.prl -- CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl -- } else { -- isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} -- } ++ } else { - CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll - CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll -@@ -343,19 +354,18 @@ mac { - CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib - CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib + CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib -- !isEmpty(CMAKE_STATIC_TYPE) { -- CMAKE_STATIC_WINDOWS_BUILD = "true" -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib -+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib -+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib + CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib + CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl + CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl - -- CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl -- CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl -- } else { -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib -- } ++ + CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.lib + CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC = $${CMAKE_QT_STEM}.lib + CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.static.prl @@ -195,7 +183,7 @@ index e023f39a5d..b2594d9921 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 -@@ -375,12 +385,12 @@ mac { +@@ -358,12 +382,12 @@ mac { INSTALLS += cmake_qt5_module_files cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in @@ -210,7 +198,7 @@ index e023f39a5d..b2594d9921 100644 !build_pass:QMAKE_SUBSTITUTES += \ cmake_config_file \ -@@ -390,11 +400,29 @@ cmake_qt5_module_files.files = \ +@@ -373,11 +397,29 @@ cmake_qt5_module_files.files = \ $$cmake_config_file.output \ $$cmake_config_version_file.output @@ -241,7 +229,7 @@ index e023f39a5d..b2594d9921 100644 !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file -@@ -406,7 +434,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake +@@ -389,7 +431,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake exists($$cmake_macros_file.input) { CMAKE_MODULE_MACROS = "true" @@ -250,7 +238,7 @@ index e023f39a5d..b2594d9921 100644 cmake_macros_file.CONFIG = verbatim !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file -@@ -414,7 +442,7 @@ exists($$cmake_macros_file.input) { +@@ -397,7 +439,7 @@ exists($$cmake_macros_file.input) { cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -260,7 +248,7 @@ index e023f39a5d..b2594d9921 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 357c8b9cba..38109b0182 100644 +index a82e6a886f..270d5c1c75 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) @@ -1061,5 +1049,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.25.1 +2.26.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 a98ba27d..004cb394 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 de31d365cb6423a2d49a92d4c388d6b0b59c2155 Mon Sep 17 00:00:00 2001 +From d214392ab20e45037c817c0150c5086993358e9f Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 22/31] Adjust linker flags for static build with @@ -25,5 +25,5 @@ index 58d1d5b366..967dc64a19 100644 +unset(_isExe) +!!ENDIF -- -2.25.1 +2.26.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 d4420499..01b005cc 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 543ad4d7a56be3c281cabaaa42115ce8c1ab6858 Mon Sep 17 00:00:00 2001 +From 58af82ed3fefd7b230341376c20dc8be84c913a3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 23/31] Use correct pkg-config --static flag @@ -22,5 +22,5 @@ index 910e59188f..aaa4123f4c 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.25.1 +2.26.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 17d26b5e..2aa74f4c 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 879dc7704da01c3dd0df17f7575c5d1a395c92b9 Mon Sep 17 00:00:00 2001 +From b14162daa442d61ba3747a68aff6b0a33677e606 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 24/31] Fix macro invoking moc, rcc and uic @@ -18,10 +18,10 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake -index 84c75401b1..3a35e30777 100644 +index 02f49a4b1e..581dbeac50 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 +@@ -139,8 +139,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target endif() set(_moc_extra_parameters_file @${_moc_parameters_file}) @@ -32,7 +32,7 @@ index 84c75401b1..3a35e30777 100644 DEPENDS ${infile} ${moc_depends} ${_moc_working_dir} VERBATIM) -@@ -248,8 +249,9 @@ function(QT5_ADD_BINARY_RESOURCES target ) +@@ -255,8 +256,9 @@ function(QT5_ADD_BINARY_RESOURCES target ) set(rc_depends ${rc_depends} ${_rc_depends}) endforeach() @@ -43,7 +43,7 @@ index 84c75401b1..3a35e30777 100644 ARGS ${rcc_options} --binary --name ${target} --output ${rcc_destination} ${infiles} DEPENDS ${rc_depends} ${out_depends} ${infiles} VERBATIM) add_custom_target(${target} ALL DEPENDS ${rcc_destination}) -@@ -281,8 +283,9 @@ function(QT5_ADD_RESOURCES outfiles ) +@@ -288,8 +290,9 @@ function(QT5_ADD_RESOURCES outfiles ) _QT5_PARSE_QRC_FILE(${infile} _out_depends _rc_depends) set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON) @@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.25.1 +2.26.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 1397d6a4..546d9b49 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 9552d093c269e20a62ba18609043eeb2f3a6739f Mon Sep 17 00:00:00 2001 +From b01de5ed0031d69b552b980214d4bfe6ce8ee52d Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 25/31] 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 8273ba3fe1..4cdb55d4b3 100644 +index 511b158b91..39760d5ce4 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf -@@ -150,5 +150,5 @@ defineTest(qtConfig) { +@@ -153,5 +153,5 @@ defineTest(qtConfig) { contains(QT.$${module}.disabled_features, $$1): \ return(false) } @@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.25.1 +2.26.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 9e452fb6..4ad59c2a 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 7adbe6e5728f93cbe5c57d12d626b0fd9a1a53d1 Mon Sep 17 00:00:00 2001 +From e2636a2a9b11a10ba86ce55a11d29623feca0c28 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 26/31] Enable and fix use of iconv @@ -74,5 +74,5 @@ index ae360239c6..5fd57a1a66 100644 }, "icu": { -- -2.25.1 +2.26.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 28a8c6c1..5f363544 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 5360d8b33d7de6d7176f8d58eccb24e86f1ea27c Mon Sep 17 00:00:00 2001 +From 8aad5efe320b053525a8cdcf5dd498c349cd5050 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 27/31] Ignore failing pkg-config test @@ -9,7 +9,7 @@ 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 846cb678c9..c39adc981f 100644 +index a481e54b8d..34cac288a7 100644 --- a/configure.json +++ b/configure.json @@ -755,7 +755,6 @@ @@ -21,5 +21,5 @@ index 846cb678c9..c39adc981f 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.25.1 +2.26.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 71677b29..4729b820 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 9373b1bc70fc28166449e309a5e0c66da9b8cfe9 Mon Sep 17 00:00:00 2001 +From 90787e1baa580ced40a79a20c8624ecdeee3aad4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 28/31] Prevent qmake from messing static lib dependencies @@ -27,7 +27,7 @@ index f7bd6dc663..b76c444012 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 3b4372ad05..cd10225e99 100644 +index 3a75986257..34e7776e44 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -106,6 +106,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) @@ -41,5 +41,5 @@ index 3b4372ad05..cd10225e99 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.25.1 +2.26.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 0dccfbcd..f20b64b1 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 5f73a31460be033f22aceb8d20446a7c249d4d67 Mon Sep 17 00:00:00 2001 +From 437223bd0628fc9f1081dc332412007df267e3fd Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 29/31] Hardcode linker flags for platform plugins @@ -152,5 +152,5 @@ index 50a3bb41a9..285d90c6d3 100644 include(windows.pri) -- -2.25.1 +2.26.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 2318f61f..cfeb7925 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 9edcc83a1b0e2686592a4cbdc6d550105d4fd1ff Mon Sep 17 00:00:00 2001 +From 3888a84625dae5abbf387498fe5f39166eab17e4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 30/31] 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.25.1 +2.26.0 diff --git a/qt5-base/mingw-w64-angle/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/qt5-base/mingw-w64-angle/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch index ccf282a5..c8711729 100644 --- a/qt5-base/mingw-w64-angle/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch +++ b/qt5-base/mingw-w64-angle/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch @@ -1,4 +1,4 @@ -From f8de051c13a2c97bef20a6b0282f5808498eb9c4 Mon Sep 17 00:00:00 2001 +From 68a2b716616ba060e856840cebb5601c61d60773 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 24 Jun 2019 13:51:02 +0200 Subject: [PATCH 31/31] Prevent 'Cannot find feature windows_vulkan_sdk' @@ -33,5 +33,5 @@ index 8475e4111a..c0eb8faa17 100644 LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD) for (nu, LD_USES) { -- -2.25.1 +2.26.0 diff --git a/qt5-base/mingw-w64-angle/PKGBUILD b/qt5-base/mingw-w64-angle/PKGBUILD index 8b2e842a..34dadfd6 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.14.1 +pkgver=5.14.2 pkgrel=1 pkgdesc='A cross-platform application and UI framework (mingw-w64)' # The static variant doesn't contain any executables which need to be executed on the build machine @@ -86,38 +86,38 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0029-Hardcode-linker-flags-for-platform-plugins.patch' '0030-Fix-linking-against-static-plugins-with-qmake.patch' '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch') -sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7' - '4ec86e817e97b84ca883144c1d9637fa624be0049ff44d682be0352ef7fde929' - 'a44f778df1981a70211e84e30756c01da58900a88dcc42ec8946ae19ca541520' - 'c79cac867cd73c83e6be8c02c36cb95d100199ada1602a448983a8a624bac97a' - '32c71d398d66629e2d4598135ef70262b7510107a0136d557194aae4871206a2' - 'e134748cf88137663fbf6cf00f5b1e2dcd38eeb679546a073ea509099c89b37f' - 'f80f903cac3e2544ce4c480d7dff16e7bbb26ffaaee46ce33a70dff1d11d1e71' - '582053415533f197579becf60b3001988ddf5a9fe16f6aaa31697e619c5f6490' - 'bc80a103ddec2b0f726e2118b5a96bb6d5d00fe6ab44d8cd55b4ff27f4ab2db8' - '99c1b16f3725a6b63fe714efa477bcc27227a9051d52742c682b34ff089e72e2' - '231916474e098bec7f407a443240e465ca0756ca693ef080e4132d1bafff9bae' - 'a577d6efcb138c5a06fb2cc9a2a00451eb34a585047854cef78e2133d5cfedaf' - '92ec4e8237c84a9756016efba3120ac58a75316bf10727c28f8bb53ec52fba52' - 'd6f878b78c1fd285118873c065d1bf82f36a5af532cbe2d34675c5099e8c9733' - 'a452bbd2566e805a3cb62c0f76c3e4d375c988f923750a39b2f77ef04b6f1e3f' - '55aeb64a56ce77848e708ad5330fe04c6b2fb42b1bf2b7bb3be8962500d6f692' - 'efdd65bc89dcfab056024faeb1fd20738e08a03eb4e1a742a92a22b92341d34d' - '8148358ddb7693204c0d0532be54eaca0caa8a21fc05a7b96a5b4fec236bfd6c' - '6ccf074858de2e5d8aea85df1f86b2f642d9cbe10c93b51e655c8a33469bc4e2' - '096b7547ce73d396dfc47eca36bbeab06de4447d63f110cb8b83f674f7cbd9f5' - '481c1764d80a23aea2e4d38c7b86dc5eb432e4f8900d9d8ab1d16f4708351667' - '1dbd4613645ba8814f61032df5187c6d253cbab16a62f8dc8586d5acc7c73bd2' - '90a2d46373bf6b5b601a78ac5a2abb2335b3daf98d86ca4528b4cbed50f31a99' - 'f0e52e0fc7b69420cc0f7d961eb78f1731d83e3c6908920fb2a3029d6f4037c7' - '24da08db6f9ecaa66b8c2b408d772530abd92cc89230faac445d27f044f95798' - '2f29672a98cf65c77a31dd5435e538c5cd036d07be52bbbe56f7fdab989753e2' - '8c2655008ecd00d0d37da67604de1888b414042d846aebf4569bd7004b5234fd' - '9cfdb253384e964b9be4aef16ac36f37561e94bb608bbb9bd5549afc1ea5fffa' - '76810324f7da5958e2fc34f9a4498304f81a0d3f4b0522ace2a0eb55e0f24152' - 'e131b2c62e05a182d8e34f878d619673fb2b8047aba76afa31305fbbf1b519a3' - '635e126785ff8190802cbcf4c2627078c6e556b5aa66f0bed9a6a73eaf9d4a59' - '414fe06844458684cc300f0a0c653c5b2e8727918179eff7884c9c0ba5ea473e') +sha256sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a' + 'c758e9ec290052a3ea029f40e5d5cfaadd2135ad7841366393449a4c71d84a88' + 'a0280ed9dd31b2cdffa1c7ae25f9a6cb3a4164c76b7fa07c4e2eaa8cc01e6762' + '9a3c591e2645997a94d30687adfc08f1ea7f64597fef78c777ed7137071de02f' + '1d7fe2ef6be292e9ec84f313e4ba543f1b368a1ee0915f858d54615be93cf794' + '3099b7210a873ee12374d452fb98204d046a2d5c6b1a330d32d45ae59c95cd86' + 'c2a8f4a7536ad0293bdab882d01e0055bc7d4a3e97794f7c304d01d1daa24bf7' + '3b7e90637b3a0671fac0f8607d613bf0f3f9a73cc62e43848049125c7a925a52' + '2e08efe5160c91899ac549303f888c5872e1d198068c5a00c3a34d7040f5410f' + '82764b7047b65a262f7c49305dee6579171a5e179fa85f8801d121e03937576e' + '27dd7df0721e8d4d3f4f4c30c8e9ca8793f50a04f983b3489ff1227aae996f43' + '4f0754277a14bdd8682b5d3701871f8901d2dd9f00ef8318bf6d62e9d4a26171' + 'd4b3fb742c973119d1c98a34063fcc29861fa6325481a8baf5dfac13c32db597' + 'd70ce95ddaa3dac7bdf273c3a8926df6b41771d75f17c68e205a1b9bb80a77e1' + '0366353ce1e4da4e800be55b457d649b0c3e6ba83a2d53dc8c6e3e08dd82637f' + '4632228567fd25ffb75de6750120c0ceea1d2c4ce2e91ef214a39b54ee7b56fc' + 'ab79617e34dbc8bcefb63f0ff59a3efc5da2d313284aa3e690f8c6025a9cb090' + 'b4f68710feda5c11dc2c3b4fdc755bb2186599046a8443c6f61ff9d369357193' + 'a4656c1d3ec12ad50b2c92382775619d435e49a392bb08be5cbc8a654248f3dd' + '36e3520481ef8d58e7595195c0eb230df80034590c27622836a38199abf7721c' + '640ac515c0453def45cdaf2d5813d1ae95ce953014aeacb78cb1747fa2c0da3e' + '612b95a477b9956e61ac1557c0e885a7dd2ae0aa56ef69e29116cafcbc7b0d50' + '2bfb7e8400b0e14b5e8c14413d67b9fa437fe920fa9ffc458f769ea22b2bed29' + '26473b4a55ce4b764354ff54b40a6dcc6d93aea41b7175afeb1a030cb118f3a8' + '98058d1696ff05af14d10017062d697839736cf8cfef94ac77d6cefb6c46f311' + '30d2cf6c309c4922ebc4a5822aab76161950f7036666dc18489da22315ef214d' + '692c3e1679aa82c6aa395d75a06f02f0d1a0b05230197ef19fe4ef7c7b3b888e' + 'c285e9900a63d67a01accd6d7a798c5f2476e90f3d8ea8ffb0f272d90d942141' + 'fbd28eeed43e451240c52582f675e5f5ba069450ee20488bf993b33e76e8275c' + '1709f452c4986f6b7366412bc906b52e4a01d412e20d3fda561b7fa090ed8890' + '245af9755b5637200ea1d678e0ac1a493ed0fbcb9c25dc2a79c0a5e3c007a19a' + '810255e443f940b57e90f4934e4317c050d3edf3593cd0a30c1e2b5a35cf7f68') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -327,6 +327,7 @@ package() { "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5FontDatabaseSupport" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5PlatformCompositorSupport" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5ThemeSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5OpenGLExtensions*" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5WindowsUIAutomationSupport" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5VulkanSupport" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5Bootstrap" \ diff --git a/qt5-base/mingw-w64-angle/qtbase-sha256.txt b/qt5-base/mingw-w64-angle/qtbase-sha256.txt index 8105d678..4b5ee578 100644 --- a/qt5-base/mingw-w64-angle/qtbase-sha256.txt +++ b/qt5-base/mingw-w64-angle/qtbase-sha256.txt @@ -1 +1 @@ -d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7 +48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a diff --git a/qt5-base/mingw-w64-dynamic/PKGBUILD b/qt5-base/mingw-w64-dynamic/PKGBUILD index c75b0be8..7608db20 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.14.1 +pkgver=5.14.2 pkgrel=1 pkgdesc='A cross-platform application and UI framework (mingw-w64)' # The static variant doesn't contain any executables which need to be executed on the build machine 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 f8182ec0..7e41b92d 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 5a6b36b853699f49504173ca35a1c47c9a54d56f Mon Sep 17 00:00:00 2001 +From c416378bd70ab26f9ce9e34fe72a364dd19bae73 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/31] Adjust win32-g++ profile for cross compilation with @@ -21,7 +21,7 @@ Change-Id: I4c9b3c170ed13943abe0d8b397a8cb9e360538b6 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index 6369436863..17d2a5efec 100644 +index c3a1f3a373..5208d22bd6 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -8,18 +8,24 @@ @@ -43,10 +43,10 @@ index 6369436863..17d2a5efec 100644 MAKEFILE_GENERATOR = MINGW QMAKE_PLATFORM = win32 mingw --CONFIG += precompile_header +-CONFIG += debug_and_release debug_and_release_target precompile_header -DEFINES += UNICODE _UNICODE WIN32 MINGW_HAS_SECURE_API=1 -QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32 -+CONFIG += precompile_header $${CROSS_COMPILE_CUSTOM_CONFIG} ++CONFIG += debug_and_release debug_and_release_target precompile_header $${CROSS_COMPILE_CUSTOM_CONFIG} +DEFINES += UNICODE _UNICODE MINGW_HAS_SECURE_API=1 +QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32 WIN32 # can't add 'DEFINES += WIN64' and 'QMAKE_COMPILER_DEFINES += _WIN64' defines for @@ -163,5 +163,5 @@ index 5de482f23b..3c3d22c699 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.25.1 +2.26.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 349d12f0..d100924a 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 236c97172a05e530ab98153c0d16a4ddf59cd33c Mon Sep 17 00:00:00 2001 +From 06380a45c2cb2f6882e7102fdd46bcdd9e4aba48 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/31] Ensure GLdouble is defined when using dynamic OpenGL @@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.25.1 +2.26.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 a12c3199..eec82f7c 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 160ef19acaa0504bb04a8f5ffc22229102c3ec9b Mon Sep 17 00:00:00 2001 +From 40b1ebaa7481c339b437e976e760bf099df5c594 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 03/31] 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.25.1 +2.26.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 f974943e..9122c11e 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 d758e71cb38b4fec2f012121605185bf395206cf Mon Sep 17 00:00:00 2001 +From f1122d1929e271162eb062aad43097ad69c7159e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 04/31] Make sure *.pc files are installed correctly @@ -49,10 +49,10 @@ index ab970c966f..01f97c61d4 100644 void writePkgConfigFile(); // for pkg-config diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 86d10c213c..c1b28a52e9 100644 +index 3ec2704625..f33edb5bd9 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp -@@ -761,7 +761,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) +@@ -775,7 +775,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) } if(!ret.isEmpty()) ret += "\n\t"; @@ -62,5 +62,5 @@ index 86d10c213c..c1b28a52e9 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.25.1 +2.26.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 cfc95ac3..d303224b 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 c38954b7d8c29530a5290c52f7981d7a784e7a4f Mon Sep 17 00:00:00 2001 +From dc9860e99a09a4dc54cfe60959a34e06a288f7d6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 05/31] Don't add resource files to LIBS parameter @@ -24,5 +24,5 @@ index 096b041056..eb498b28e8 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.25.1 +2.26.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 9af15baf..36345b94 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 8b73190855f699bd7c1ff67c753fe3d17996f43b Mon Sep 17 00:00:00 2001 +From 2cfd0a32516ba85f0c608fb81341090c28209750 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 06/31] Prevent debug library names in pkg-config files @@ -29,5 +29,5 @@ index f9532e0db9..9c65f21ac0 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.25.1 +2.26.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 21243611..3425b12a 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 99c07cf7413a04cd7297a4c18e4ebf73351c8720 Mon Sep 17 00:00:00 2001 +From 3e1b4e602c5a2569d9a337990a2e38e3ef82f251 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 07/31] Fix linking against shared/static libpng @@ -26,5 +26,5 @@ index 0202f17b21..099c11da95 100644 ], "use": [ -- -2.25.1 +2.26.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 246b4196..a2de09a6 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 3a5c4c981dade3223099630a16a874ba083ecd55 Mon Sep 17 00:00:00 2001 +From d54fefe4a033a39ba628858c18ab0a95520069f2 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 08/31] Fix linking against static D-Bus @@ -9,7 +9,7 @@ Subject: [PATCH 08/31] Fix linking against static D-Bus 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.json b/configure.json -index 62d78f8dc6..f7d169f053 100644 +index 868f15db13..147cf9eb00 100644 --- a/configure.json +++ b/configure.json @@ -188,18 +188,23 @@ @@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644 # include #else -- -2.25.1 +2.26.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 8f41e997..2b435f7f 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 e1a1979b15712954adfca6d44f45dad99357286e Mon Sep 17 00:00:00 2001 +From 012e5b2dfbc5de85412bb450970d0320e369da30 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 09/31] 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 f7d169f053..846cb678c9 100644 +index 147cf9eb00..a481e54b8d 100644 --- a/configure.json +++ b/configure.json @@ -201,7 +201,7 @@ @@ -25,5 +25,5 @@ index f7d169f053..846cb678c9 100644 }, "condition": "config.win32 && features.shared" -- -2.25.1 +2.26.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 35423bfd..f5effe21 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 3c9bf1e7fcd5f965d9f3a91d05d762d6f4061a5e Mon Sep 17 00:00:00 2001 +From ca204fd0ed444fdf4e478540f8b5d88cb345be75 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 10/31] Fix linking against static freetype2 @@ -26,5 +26,5 @@ index 099c11da95..872deb3ad3 100644 { "libs": "-lfreetype" } ], -- -2.25.1 +2.26.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 68c5df49..b8515a34 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 c7515aea498a46c8d2291b8590989d6092ab3404 Mon Sep 17 00:00:00 2001 +From 483ae9b6bfc1f40e3617d8b6cd58ef93985cf397 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 11/31] Fix linking against static harfbuzz @@ -25,5 +25,5 @@ index 872deb3ad3..7daaaa5a11 100644 }, "imf": { -- -2.25.1 +2.26.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 a3b179b3..a0f3ac35 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 d3f6ecda90e28aabf58cbb4a92f22e803551ac05 Mon Sep 17 00:00:00 2001 +From 0c26bfba6773298fd314fc38ec1be7cb58a5d752 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 12/31] Fix linking against static pcre @@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1 1 file changed, 4 insertions(+) diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp -index 67be67c243..0bc4c5157c 100644 +index 59d21e0a23..518f91d753 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp @@ -53,6 +53,10 @@ @@ -24,5 +24,5 @@ index 67be67c243..0bc4c5157c 100644 #include -- -2.25.1 +2.26.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 ebcd671d..3249f32f 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 e6dde84ed7cc286a9e195b96e609f244654b4540 Mon Sep 17 00:00:00 2001 +From 2852ac7e9e087b8374daa044dba1885d5c2bbac5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 13/31] 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.25.1 +2.26.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 c1bc565b..f6ada4e2 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 d97b57e1de32789a2cdfee280c49b3b8dff31a55 Mon Sep 17 00:00:00 2001 +From 5f3fb54d36009c5eced4335e79437b5d8eecdf08 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 14/31] Fix linking against shared/static PostgreSQL @@ -24,5 +24,5 @@ index babd0465ce..37e25881f0 100644 ] }, -- -2.25.1 +2.26.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 1fb948e1..10faeb3a 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,20 +1,18 @@ -From 8fcc619606cfa41f46f9b605a4752e33c376d5a1 Mon Sep 17 00:00:00 2001 +From d61af2077d70356fc0f69aeb27e82bed66f8d52e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 15/31] Rename qtmain to qt5main Prevents conflict with mingw-w64-qt4 package - -Change-Id: I1a1533bb37d5c87b3f8e9534f67aa76026c44aed --- mkspecs/common/g++-win32.conf | 2 +- - mkspecs/features/create_cmake.prf | 4 ++-- + mkspecs/features/create_cmake.prf | 8 ++++---- mkspecs/features/win32/windows.prf | 4 ++-- src/winmain/winmain.pro | 2 +- - 4 files changed, 6 insertions(+), 6 deletions(-) + 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index 17d2a5efec..2975d371e3 100644 +index 5208d22bd6..1a058b787f 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -84,7 +84,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 @@ -27,20 +25,28 @@ index 17d2a5efec..2975d371e3 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 4aa5dad467..fa8c142ec5 100644 +index 0e71fd0015..0e8d41c685 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -321,8 +321,8 @@ mac { - CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll - CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll +@@ -325,14 +325,14 @@ mac { + } + mingw { - CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}$${debug_suffix}.a - CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a + CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a - !isEmpty(CMAKE_STATIC_TYPE) { - CMAKE_STATIC_WINDOWS_BUILD = "true" + CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a + } else { +- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib +- CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib ++ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib ++ CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib + + CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf index 272170d428..17f3ef9c2d 100644 --- a/mkspecs/features/win32/windows.prf @@ -70,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644 CONFIG += static -- -2.25.1 +2.26.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 4ddd04c2..715e6716 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 6ca73861aeb489e9e46c8ad051c7afd100d09cc9 Mon Sep 17 00:00:00 2001 +From f24d3dd8face31fb7b522ca383b8515ba2913911 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 16/31] Enable rpath for build tools @@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644 INSTALLS += target -- -2.25.1 +2.26.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 851b7e4f..2a946c4a 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 eba7f4ccfeb320a5b6a3a458c765ae2e63d38efc Mon Sep 17 00:00:00 2001 +From 3b9033c42d77fba36734f8268f042e2c0154c2b5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 17/31] Use system zlib for build tools @@ -23,5 +23,5 @@ index 9863ff5e69..02329611bc 100644 } else { CONFIG += no_core_dep -- -2.25.1 +2.26.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 8833b945..df15800f 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 6b5826e9aa80d2daa13cf1e20c01186145a73841 Mon Sep 17 00:00:00 2001 +From 5756d20ee409d114a355bd07051311757af46fa4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 18/31] Merge shared and static library trees @@ -48,7 +48,7 @@ index 81c84b28ef..910e59188f 100644 + CONFIG += no_smart_library_merge +} diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf -index 0e41b825ec..4c4b6dd12a 100644 +index 1d79f5c958..48f6e710b6 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -1,5 +1,16 @@ @@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.25.1 +2.26.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 eba90a8a..f811de33 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 c48e5bd1dca8cc003d70c9bf4f64b9954375afec Mon Sep 17 00:00:00 2001 +From e21df21893a3071ea5908c9cc19becda0287a231 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 19/31] Use *.dll.a as import lib extension @@ -6,7 +6,7 @@ Subject: [PATCH 19/31] Use *.dll.a as import lib extension The variables used here are provided by g++-win32.conf -Change-Id: I1175feedd96ef4940af87dc3662fedc8f4d1d764 +Change-Id: I40acb56685628ed52b3e6b89aab7f53f9a872b1a --- mkspecs/features/create_cmake.prf | 5 +++-- mkspecs/features/qt.prf | 15 ++++++++++++--- @@ -14,21 +14,21 @@ Change-Id: I1175feedd96ef4940af87dc3662fedc8f4d1d764 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index fa8c142ec5..e023f39a5d 100644 +index 0e8d41c685..a94f443de6 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -332,8 +332,9 @@ mac { - CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.prl - CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl - } else { -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a -+ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a -+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} -+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} - } +@@ -328,8 +328,9 @@ mac { + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a + CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a + +- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a +- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a ++ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a ++ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} ++ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} } else { - CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib + CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index bbada46c29..d6299d8eed 100644 --- a/mkspecs/features/qt.prf @@ -59,7 +59,7 @@ index bbada46c29..d6299d8eed 100644 } } diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index c1b28a52e9..3b4372ad05 100644 +index f33edb5bd9..3a75986257 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -99,9 +99,13 @@ private: @@ -94,5 +94,5 @@ index c1b28a52e9..3b4372ad05 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.25.1 +2.26.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 0444c851..36f759ea 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 fbd7da2201a41d429753dd3833e59a867d336497 Mon Sep 17 00:00:00 2001 +From 181461364ddf790c194108c4d6130cdd117c3a0a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 20/31] Pull dependencies of static libraries in CMake modules @@ -34,7 +34,7 @@ Change-Id: I6566d42d7e27d4cd23d261a0eacca9efad9ce6df 2 files changed, 135 insertions(+), 190 deletions(-) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 50364765fb..357c8b9cba 100644 +index 1099a761ce..a82e6a886f 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -53,6 +53,10 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura @@ -484,5 +484,5 @@ index 7b70cfed09..25f2162fe6 100644 -set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_TYPE \"$$CMAKE_PLUGIN_TYPE\") -set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_EXTENDS \"$$CMAKE_PLUGIN_EXTENDS\") -- -2.25.1 +2.26.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 130bbd3e..bf9ea9af 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 0bda7826502a4c823953ffbd1d9b4f851a61c651 Mon Sep 17 00:00:00 2001 +From f92560dca3a5ade9c23dc6f5cf84ec0ab6404080 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 21/31] Allow usage of static version with CMake @@ -11,20 +11,20 @@ installed in the same prefix - Set USE_STATIC_QT_BY_DEFAULT to use static version via regular find_package(Qt5Core) -Change-Id: Ib9411a9edbad2a82414b1af61075172a797f4318 +Change-Id: I339c8ef3a6ab96a3a6b85f7c8b93f1a5ee38cd71 --- - mkspecs/features/create_cmake.prf | 108 ++++--- + mkspecs/features/create_cmake.prf | 96 ++++-- .../data/cmake/Qt5BasicConfig.cmake.in | 304 ++++++++++++------ .../data/cmake/Qt5PluginTarget.cmake.in | 22 +- .../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, 319 insertions(+), 160 deletions(-) + 7 files changed, 320 insertions(+), 147 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 e023f39a5d..b2594d9921 100644 +index a94f443de6..a0166e4230 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -68,7 +68,7 @@ split_incpath { @@ -45,23 +45,24 @@ index e023f39a5d..b2594d9921 100644 internal_module { CMAKE_INTERNAL_MODULE = true -@@ -214,23 +216,25 @@ contains(CONFIG, plugin) { +@@ -214,20 +216,25 @@ contains(CONFIG, plugin) { win32 { !mingw|qtConfig(debug_and_release): debug_suffix="d" +- CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl +- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl +- - isEmpty(CMAKE_STATIC_TYPE) { + mingw { CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.dll CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.dll -+ CMAKE_PLUGIN_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a -+ CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a - CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl - CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl - } else:mingw { - CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a - CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a -- CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.prl -- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.prl ++ CMAKE_PLUGIN_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a ++ CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a ++ CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl ++ CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl + CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.static.prl + CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.static.prl } else { # MSVC static @@ -69,15 +70,15 @@ index e023f39a5d..b2594d9921 100644 CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.lib + CMAKE_PLUGIN_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.lib + CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.lib - CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl - CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl ++ CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl ++ CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl } } else { + # this branch is broken by the patch, only apply when building for Windows mac { isEmpty(CMAKE_STATIC_TYPE): CMAKE_PLUGIN_EXT = .dylib else: CMAKE_PLUGIN_EXT = .a -@@ -250,9 +254,9 @@ contains(CONFIG, plugin) { +@@ -247,9 +254,9 @@ contains(CONFIG, plugin) { } } cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in @@ -89,7 +90,7 @@ index e023f39a5d..b2594d9921 100644 !build_pass { QMAKE_SUBSTITUTES += cmake_target_file -@@ -261,7 +265,7 @@ contains(CONFIG, plugin) { +@@ -258,7 +265,7 @@ contains(CONFIG, plugin) { cmake_qt5_plugin_file.files = $$cmake_target_file.output static|staticlib: cmake_qt5_plugin_file.files += $$cmake_qt5_plugin_import_file.output @@ -98,7 +99,7 @@ index e023f39a5d..b2594d9921 100644 INSTALLS += cmake_qt5_plugin_file return() -@@ -274,26 +278,34 @@ mod_deps = +@@ -271,26 +278,34 @@ mod_deps = lib_deps = aux_mod_deps = aux_lib_deps = @@ -137,17 +138,24 @@ index e023f39a5d..b2594d9921 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 -@@ -324,18 +336,17 @@ mac { +@@ -317,13 +332,6 @@ mac { + CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll + CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll + +- !isEmpty(CMAKE_STATIC_TYPE) { +- CMAKE_STATIC_WINDOWS_BUILD = "true" +- +- CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl +- CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl +- } +- + mingw { CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a - -- !isEmpty(CMAKE_STATIC_TYPE) { -- CMAKE_STATIC_WINDOWS_BUILD = "true" -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a -+ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = dll.a -+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} -+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} +@@ -331,14 +339,30 @@ mac { + isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a + CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} + CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl + CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl + @@ -155,36 +163,16 @@ index e023f39a5d..b2594d9921 100644 + CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC = lib$${CMAKE_QT_STEM}.a + CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.static.prl + CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC = $${CMAKE_QT_STEM}.static.prl - -- CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.prl -- CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl -- } else { -- isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} -- } ++ } else { - CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll - CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll -@@ -343,19 +354,18 @@ mac { - CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib - CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib + CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib -- !isEmpty(CMAKE_STATIC_TYPE) { -- CMAKE_STATIC_WINDOWS_BUILD = "true" -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib -+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib -+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib + CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib + CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl + CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl - -- CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl -- CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl -- } else { -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib -- } ++ + CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.lib + CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC = $${CMAKE_QT_STEM}.lib + CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.static.prl @@ -195,7 +183,7 @@ index e023f39a5d..b2594d9921 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 -@@ -375,12 +385,12 @@ mac { +@@ -358,12 +382,12 @@ mac { INSTALLS += cmake_qt5_module_files cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in @@ -210,7 +198,7 @@ index e023f39a5d..b2594d9921 100644 !build_pass:QMAKE_SUBSTITUTES += \ cmake_config_file \ -@@ -390,11 +400,29 @@ cmake_qt5_module_files.files = \ +@@ -373,11 +397,29 @@ cmake_qt5_module_files.files = \ $$cmake_config_file.output \ $$cmake_config_version_file.output @@ -241,7 +229,7 @@ index e023f39a5d..b2594d9921 100644 !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file -@@ -406,7 +434,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake +@@ -389,7 +431,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake exists($$cmake_macros_file.input) { CMAKE_MODULE_MACROS = "true" @@ -250,7 +238,7 @@ index e023f39a5d..b2594d9921 100644 cmake_macros_file.CONFIG = verbatim !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file -@@ -414,7 +442,7 @@ exists($$cmake_macros_file.input) { +@@ -397,7 +439,7 @@ exists($$cmake_macros_file.input) { cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -260,7 +248,7 @@ index e023f39a5d..b2594d9921 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 357c8b9cba..38109b0182 100644 +index a82e6a886f..270d5c1c75 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) @@ -1061,5 +1049,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.25.1 +2.26.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 a98ba27d..004cb394 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 de31d365cb6423a2d49a92d4c388d6b0b59c2155 Mon Sep 17 00:00:00 2001 +From d214392ab20e45037c817c0150c5086993358e9f Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 22/31] Adjust linker flags for static build with @@ -25,5 +25,5 @@ index 58d1d5b366..967dc64a19 100644 +unset(_isExe) +!!ENDIF -- -2.25.1 +2.26.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 d4420499..01b005cc 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 543ad4d7a56be3c281cabaaa42115ce8c1ab6858 Mon Sep 17 00:00:00 2001 +From 58af82ed3fefd7b230341376c20dc8be84c913a3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 23/31] Use correct pkg-config --static flag @@ -22,5 +22,5 @@ index 910e59188f..aaa4123f4c 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.25.1 +2.26.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 17d26b5e..2aa74f4c 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 879dc7704da01c3dd0df17f7575c5d1a395c92b9 Mon Sep 17 00:00:00 2001 +From b14162daa442d61ba3747a68aff6b0a33677e606 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 24/31] Fix macro invoking moc, rcc and uic @@ -18,10 +18,10 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake -index 84c75401b1..3a35e30777 100644 +index 02f49a4b1e..581dbeac50 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 +@@ -139,8 +139,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target endif() set(_moc_extra_parameters_file @${_moc_parameters_file}) @@ -32,7 +32,7 @@ index 84c75401b1..3a35e30777 100644 DEPENDS ${infile} ${moc_depends} ${_moc_working_dir} VERBATIM) -@@ -248,8 +249,9 @@ function(QT5_ADD_BINARY_RESOURCES target ) +@@ -255,8 +256,9 @@ function(QT5_ADD_BINARY_RESOURCES target ) set(rc_depends ${rc_depends} ${_rc_depends}) endforeach() @@ -43,7 +43,7 @@ index 84c75401b1..3a35e30777 100644 ARGS ${rcc_options} --binary --name ${target} --output ${rcc_destination} ${infiles} DEPENDS ${rc_depends} ${out_depends} ${infiles} VERBATIM) add_custom_target(${target} ALL DEPENDS ${rcc_destination}) -@@ -281,8 +283,9 @@ function(QT5_ADD_RESOURCES outfiles ) +@@ -288,8 +290,9 @@ function(QT5_ADD_RESOURCES outfiles ) _QT5_PARSE_QRC_FILE(${infile} _out_depends _rc_depends) set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON) @@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.25.1 +2.26.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 1397d6a4..546d9b49 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 9552d093c269e20a62ba18609043eeb2f3a6739f Mon Sep 17 00:00:00 2001 +From b01de5ed0031d69b552b980214d4bfe6ce8ee52d Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 25/31] 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 8273ba3fe1..4cdb55d4b3 100644 +index 511b158b91..39760d5ce4 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf -@@ -150,5 +150,5 @@ defineTest(qtConfig) { +@@ -153,5 +153,5 @@ defineTest(qtConfig) { contains(QT.$${module}.disabled_features, $$1): \ return(false) } @@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.25.1 +2.26.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 9e452fb6..4ad59c2a 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 7adbe6e5728f93cbe5c57d12d626b0fd9a1a53d1 Mon Sep 17 00:00:00 2001 +From e2636a2a9b11a10ba86ce55a11d29623feca0c28 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 26/31] Enable and fix use of iconv @@ -74,5 +74,5 @@ index ae360239c6..5fd57a1a66 100644 }, "icu": { -- -2.25.1 +2.26.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 28a8c6c1..5f363544 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 5360d8b33d7de6d7176f8d58eccb24e86f1ea27c Mon Sep 17 00:00:00 2001 +From 8aad5efe320b053525a8cdcf5dd498c349cd5050 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 27/31] Ignore failing pkg-config test @@ -9,7 +9,7 @@ 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 846cb678c9..c39adc981f 100644 +index a481e54b8d..34cac288a7 100644 --- a/configure.json +++ b/configure.json @@ -755,7 +755,6 @@ @@ -21,5 +21,5 @@ index 846cb678c9..c39adc981f 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.25.1 +2.26.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 71677b29..4729b820 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 9373b1bc70fc28166449e309a5e0c66da9b8cfe9 Mon Sep 17 00:00:00 2001 +From 90787e1baa580ced40a79a20c8624ecdeee3aad4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 28/31] Prevent qmake from messing static lib dependencies @@ -27,7 +27,7 @@ index f7bd6dc663..b76c444012 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 3b4372ad05..cd10225e99 100644 +index 3a75986257..34e7776e44 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -106,6 +106,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) @@ -41,5 +41,5 @@ index 3b4372ad05..cd10225e99 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.25.1 +2.26.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 0dccfbcd..f20b64b1 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 5f73a31460be033f22aceb8d20446a7c249d4d67 Mon Sep 17 00:00:00 2001 +From 437223bd0628fc9f1081dc332412007df267e3fd Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 29/31] Hardcode linker flags for platform plugins @@ -152,5 +152,5 @@ index 50a3bb41a9..285d90c6d3 100644 include(windows.pri) -- -2.25.1 +2.26.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 2318f61f..cfeb7925 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 9edcc83a1b0e2686592a4cbdc6d550105d4fd1ff Mon Sep 17 00:00:00 2001 +From 3888a84625dae5abbf387498fe5f39166eab17e4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 30/31] 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.25.1 +2.26.0 diff --git a/qt5-base/mingw-w64-opengl/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/qt5-base/mingw-w64-opengl/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch index ccf282a5..c8711729 100644 --- a/qt5-base/mingw-w64-opengl/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch +++ b/qt5-base/mingw-w64-opengl/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch @@ -1,4 +1,4 @@ -From f8de051c13a2c97bef20a6b0282f5808498eb9c4 Mon Sep 17 00:00:00 2001 +From 68a2b716616ba060e856840cebb5601c61d60773 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 24 Jun 2019 13:51:02 +0200 Subject: [PATCH 31/31] Prevent 'Cannot find feature windows_vulkan_sdk' @@ -33,5 +33,5 @@ index 8475e4111a..c0eb8faa17 100644 LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD) for (nu, LD_USES) { -- -2.25.1 +2.26.0 diff --git a/qt5-base/mingw-w64-opengl/PKGBUILD b/qt5-base/mingw-w64-opengl/PKGBUILD index 0d1ab271..d033b3c3 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.14.1 +pkgver=5.14.2 pkgrel=1 pkgdesc='A cross-platform application and UI framework (mingw-w64)' # The static variant doesn't contain any executables which need to be executed on the build machine @@ -86,38 +86,38 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0029-Hardcode-linker-flags-for-platform-plugins.patch' '0030-Fix-linking-against-static-plugins-with-qmake.patch' '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch') -sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7' - '4ec86e817e97b84ca883144c1d9637fa624be0049ff44d682be0352ef7fde929' - 'a44f778df1981a70211e84e30756c01da58900a88dcc42ec8946ae19ca541520' - 'c79cac867cd73c83e6be8c02c36cb95d100199ada1602a448983a8a624bac97a' - '32c71d398d66629e2d4598135ef70262b7510107a0136d557194aae4871206a2' - 'e134748cf88137663fbf6cf00f5b1e2dcd38eeb679546a073ea509099c89b37f' - 'f80f903cac3e2544ce4c480d7dff16e7bbb26ffaaee46ce33a70dff1d11d1e71' - '582053415533f197579becf60b3001988ddf5a9fe16f6aaa31697e619c5f6490' - 'bc80a103ddec2b0f726e2118b5a96bb6d5d00fe6ab44d8cd55b4ff27f4ab2db8' - '99c1b16f3725a6b63fe714efa477bcc27227a9051d52742c682b34ff089e72e2' - '231916474e098bec7f407a443240e465ca0756ca693ef080e4132d1bafff9bae' - 'a577d6efcb138c5a06fb2cc9a2a00451eb34a585047854cef78e2133d5cfedaf' - '92ec4e8237c84a9756016efba3120ac58a75316bf10727c28f8bb53ec52fba52' - 'd6f878b78c1fd285118873c065d1bf82f36a5af532cbe2d34675c5099e8c9733' - 'a452bbd2566e805a3cb62c0f76c3e4d375c988f923750a39b2f77ef04b6f1e3f' - '55aeb64a56ce77848e708ad5330fe04c6b2fb42b1bf2b7bb3be8962500d6f692' - 'efdd65bc89dcfab056024faeb1fd20738e08a03eb4e1a742a92a22b92341d34d' - '8148358ddb7693204c0d0532be54eaca0caa8a21fc05a7b96a5b4fec236bfd6c' - '6ccf074858de2e5d8aea85df1f86b2f642d9cbe10c93b51e655c8a33469bc4e2' - '096b7547ce73d396dfc47eca36bbeab06de4447d63f110cb8b83f674f7cbd9f5' - '481c1764d80a23aea2e4d38c7b86dc5eb432e4f8900d9d8ab1d16f4708351667' - '1dbd4613645ba8814f61032df5187c6d253cbab16a62f8dc8586d5acc7c73bd2' - '90a2d46373bf6b5b601a78ac5a2abb2335b3daf98d86ca4528b4cbed50f31a99' - 'f0e52e0fc7b69420cc0f7d961eb78f1731d83e3c6908920fb2a3029d6f4037c7' - '24da08db6f9ecaa66b8c2b408d772530abd92cc89230faac445d27f044f95798' - '2f29672a98cf65c77a31dd5435e538c5cd036d07be52bbbe56f7fdab989753e2' - '8c2655008ecd00d0d37da67604de1888b414042d846aebf4569bd7004b5234fd' - '9cfdb253384e964b9be4aef16ac36f37561e94bb608bbb9bd5549afc1ea5fffa' - '76810324f7da5958e2fc34f9a4498304f81a0d3f4b0522ace2a0eb55e0f24152' - 'e131b2c62e05a182d8e34f878d619673fb2b8047aba76afa31305fbbf1b519a3' - '635e126785ff8190802cbcf4c2627078c6e556b5aa66f0bed9a6a73eaf9d4a59' - '414fe06844458684cc300f0a0c653c5b2e8727918179eff7884c9c0ba5ea473e') +sha256sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a' + 'c758e9ec290052a3ea029f40e5d5cfaadd2135ad7841366393449a4c71d84a88' + 'a0280ed9dd31b2cdffa1c7ae25f9a6cb3a4164c76b7fa07c4e2eaa8cc01e6762' + '9a3c591e2645997a94d30687adfc08f1ea7f64597fef78c777ed7137071de02f' + '1d7fe2ef6be292e9ec84f313e4ba543f1b368a1ee0915f858d54615be93cf794' + '3099b7210a873ee12374d452fb98204d046a2d5c6b1a330d32d45ae59c95cd86' + 'c2a8f4a7536ad0293bdab882d01e0055bc7d4a3e97794f7c304d01d1daa24bf7' + '3b7e90637b3a0671fac0f8607d613bf0f3f9a73cc62e43848049125c7a925a52' + '2e08efe5160c91899ac549303f888c5872e1d198068c5a00c3a34d7040f5410f' + '82764b7047b65a262f7c49305dee6579171a5e179fa85f8801d121e03937576e' + '27dd7df0721e8d4d3f4f4c30c8e9ca8793f50a04f983b3489ff1227aae996f43' + '4f0754277a14bdd8682b5d3701871f8901d2dd9f00ef8318bf6d62e9d4a26171' + 'd4b3fb742c973119d1c98a34063fcc29861fa6325481a8baf5dfac13c32db597' + 'd70ce95ddaa3dac7bdf273c3a8926df6b41771d75f17c68e205a1b9bb80a77e1' + '0366353ce1e4da4e800be55b457d649b0c3e6ba83a2d53dc8c6e3e08dd82637f' + '4632228567fd25ffb75de6750120c0ceea1d2c4ce2e91ef214a39b54ee7b56fc' + 'ab79617e34dbc8bcefb63f0ff59a3efc5da2d313284aa3e690f8c6025a9cb090' + 'b4f68710feda5c11dc2c3b4fdc755bb2186599046a8443c6f61ff9d369357193' + 'a4656c1d3ec12ad50b2c92382775619d435e49a392bb08be5cbc8a654248f3dd' + '36e3520481ef8d58e7595195c0eb230df80034590c27622836a38199abf7721c' + '640ac515c0453def45cdaf2d5813d1ae95ce953014aeacb78cb1747fa2c0da3e' + '612b95a477b9956e61ac1557c0e885a7dd2ae0aa56ef69e29116cafcbc7b0d50' + '2bfb7e8400b0e14b5e8c14413d67b9fa437fe920fa9ffc458f769ea22b2bed29' + '26473b4a55ce4b764354ff54b40a6dcc6d93aea41b7175afeb1a030cb118f3a8' + '98058d1696ff05af14d10017062d697839736cf8cfef94ac77d6cefb6c46f311' + '30d2cf6c309c4922ebc4a5822aab76161950f7036666dc18489da22315ef214d' + '692c3e1679aa82c6aa395d75a06f02f0d1a0b05230197ef19fe4ef7c7b3b888e' + 'c285e9900a63d67a01accd6d7a798c5f2476e90f3d8ea8ffb0f272d90d942141' + 'fbd28eeed43e451240c52582f675e5f5ba069450ee20488bf993b33e76e8275c' + '1709f452c4986f6b7366412bc906b52e4a01d412e20d3fda561b7fa090ed8890' + '245af9755b5637200ea1d678e0ac1a493ed0fbcb9c25dc2a79c0a5e3c007a19a' + '810255e443f940b57e90f4934e4317c050d3edf3593cd0a30c1e2b5a35cf7f68') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -327,6 +327,7 @@ package() { "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5FontDatabaseSupport" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5PlatformCompositorSupport" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5ThemeSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5OpenGLExtensions*" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5WindowsUIAutomationSupport" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5VulkanSupport" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5Bootstrap" \ diff --git a/qt5-base/mingw-w64-opengl/qtbase-sha256.txt b/qt5-base/mingw-w64-opengl/qtbase-sha256.txt index 8105d678..4b5ee578 100644 --- a/qt5-base/mingw-w64-opengl/qtbase-sha256.txt +++ b/qt5-base/mingw-w64-opengl/qtbase-sha256.txt @@ -1 +1 @@ -d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7 +48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a 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 f8182ec0..7e41b92d 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 5a6b36b853699f49504173ca35a1c47c9a54d56f Mon Sep 17 00:00:00 2001 +From c416378bd70ab26f9ce9e34fe72a364dd19bae73 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/31] Adjust win32-g++ profile for cross compilation with @@ -21,7 +21,7 @@ Change-Id: I4c9b3c170ed13943abe0d8b397a8cb9e360538b6 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index 6369436863..17d2a5efec 100644 +index c3a1f3a373..5208d22bd6 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -8,18 +8,24 @@ @@ -43,10 +43,10 @@ index 6369436863..17d2a5efec 100644 MAKEFILE_GENERATOR = MINGW QMAKE_PLATFORM = win32 mingw --CONFIG += precompile_header +-CONFIG += debug_and_release debug_and_release_target precompile_header -DEFINES += UNICODE _UNICODE WIN32 MINGW_HAS_SECURE_API=1 -QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32 -+CONFIG += precompile_header $${CROSS_COMPILE_CUSTOM_CONFIG} ++CONFIG += debug_and_release debug_and_release_target precompile_header $${CROSS_COMPILE_CUSTOM_CONFIG} +DEFINES += UNICODE _UNICODE MINGW_HAS_SECURE_API=1 +QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32 WIN32 # can't add 'DEFINES += WIN64' and 'QMAKE_COMPILER_DEFINES += _WIN64' defines for @@ -163,5 +163,5 @@ index 5de482f23b..3c3d22c699 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.25.1 +2.26.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 349d12f0..d100924a 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 236c97172a05e530ab98153c0d16a4ddf59cd33c Mon Sep 17 00:00:00 2001 +From 06380a45c2cb2f6882e7102fdd46bcdd9e4aba48 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/31] Ensure GLdouble is defined when using dynamic OpenGL @@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.25.1 +2.26.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 a12c3199..eec82f7c 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 160ef19acaa0504bb04a8f5ffc22229102c3ec9b Mon Sep 17 00:00:00 2001 +From 40b1ebaa7481c339b437e976e760bf099df5c594 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 03/31] 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.25.1 +2.26.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 f974943e..9122c11e 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 d758e71cb38b4fec2f012121605185bf395206cf Mon Sep 17 00:00:00 2001 +From f1122d1929e271162eb062aad43097ad69c7159e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 04/31] Make sure *.pc files are installed correctly @@ -49,10 +49,10 @@ index ab970c966f..01f97c61d4 100644 void writePkgConfigFile(); // for pkg-config diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 86d10c213c..c1b28a52e9 100644 +index 3ec2704625..f33edb5bd9 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp -@@ -761,7 +761,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) +@@ -775,7 +775,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) } if(!ret.isEmpty()) ret += "\n\t"; @@ -62,5 +62,5 @@ index 86d10c213c..c1b28a52e9 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.25.1 +2.26.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 cfc95ac3..d303224b 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 c38954b7d8c29530a5290c52f7981d7a784e7a4f Mon Sep 17 00:00:00 2001 +From dc9860e99a09a4dc54cfe60959a34e06a288f7d6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 05/31] Don't add resource files to LIBS parameter @@ -24,5 +24,5 @@ index 096b041056..eb498b28e8 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.25.1 +2.26.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 9af15baf..36345b94 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 8b73190855f699bd7c1ff67c753fe3d17996f43b Mon Sep 17 00:00:00 2001 +From 2cfd0a32516ba85f0c608fb81341090c28209750 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 06/31] Prevent debug library names in pkg-config files @@ -29,5 +29,5 @@ index f9532e0db9..9c65f21ac0 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.25.1 +2.26.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 21243611..3425b12a 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 99c07cf7413a04cd7297a4c18e4ebf73351c8720 Mon Sep 17 00:00:00 2001 +From 3e1b4e602c5a2569d9a337990a2e38e3ef82f251 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 07/31] Fix linking against shared/static libpng @@ -26,5 +26,5 @@ index 0202f17b21..099c11da95 100644 ], "use": [ -- -2.25.1 +2.26.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 246b4196..a2de09a6 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 3a5c4c981dade3223099630a16a874ba083ecd55 Mon Sep 17 00:00:00 2001 +From d54fefe4a033a39ba628858c18ab0a95520069f2 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 08/31] Fix linking against static D-Bus @@ -9,7 +9,7 @@ Subject: [PATCH 08/31] Fix linking against static D-Bus 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.json b/configure.json -index 62d78f8dc6..f7d169f053 100644 +index 868f15db13..147cf9eb00 100644 --- a/configure.json +++ b/configure.json @@ -188,18 +188,23 @@ @@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644 # include #else -- -2.25.1 +2.26.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 8f41e997..2b435f7f 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 e1a1979b15712954adfca6d44f45dad99357286e Mon Sep 17 00:00:00 2001 +From 012e5b2dfbc5de85412bb450970d0320e369da30 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 09/31] 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 f7d169f053..846cb678c9 100644 +index 147cf9eb00..a481e54b8d 100644 --- a/configure.json +++ b/configure.json @@ -201,7 +201,7 @@ @@ -25,5 +25,5 @@ index f7d169f053..846cb678c9 100644 }, "condition": "config.win32 && features.shared" -- -2.25.1 +2.26.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 35423bfd..f5effe21 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 3c9bf1e7fcd5f965d9f3a91d05d762d6f4061a5e Mon Sep 17 00:00:00 2001 +From ca204fd0ed444fdf4e478540f8b5d88cb345be75 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 10/31] Fix linking against static freetype2 @@ -26,5 +26,5 @@ index 099c11da95..872deb3ad3 100644 { "libs": "-lfreetype" } ], -- -2.25.1 +2.26.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 68c5df49..b8515a34 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 c7515aea498a46c8d2291b8590989d6092ab3404 Mon Sep 17 00:00:00 2001 +From 483ae9b6bfc1f40e3617d8b6cd58ef93985cf397 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 11/31] Fix linking against static harfbuzz @@ -25,5 +25,5 @@ index 872deb3ad3..7daaaa5a11 100644 }, "imf": { -- -2.25.1 +2.26.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 a3b179b3..a0f3ac35 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 d3f6ecda90e28aabf58cbb4a92f22e803551ac05 Mon Sep 17 00:00:00 2001 +From 0c26bfba6773298fd314fc38ec1be7cb58a5d752 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 12/31] Fix linking against static pcre @@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1 1 file changed, 4 insertions(+) diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp -index 67be67c243..0bc4c5157c 100644 +index 59d21e0a23..518f91d753 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp @@ -53,6 +53,10 @@ @@ -24,5 +24,5 @@ index 67be67c243..0bc4c5157c 100644 #include -- -2.25.1 +2.26.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 ebcd671d..3249f32f 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 e6dde84ed7cc286a9e195b96e609f244654b4540 Mon Sep 17 00:00:00 2001 +From 2852ac7e9e087b8374daa044dba1885d5c2bbac5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 13/31] 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.25.1 +2.26.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 c1bc565b..f6ada4e2 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 d97b57e1de32789a2cdfee280c49b3b8dff31a55 Mon Sep 17 00:00:00 2001 +From 5f3fb54d36009c5eced4335e79437b5d8eecdf08 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 14/31] Fix linking against shared/static PostgreSQL @@ -24,5 +24,5 @@ index babd0465ce..37e25881f0 100644 ] }, -- -2.25.1 +2.26.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 1fb948e1..10faeb3a 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,20 +1,18 @@ -From 8fcc619606cfa41f46f9b605a4752e33c376d5a1 Mon Sep 17 00:00:00 2001 +From d61af2077d70356fc0f69aeb27e82bed66f8d52e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 15/31] Rename qtmain to qt5main Prevents conflict with mingw-w64-qt4 package - -Change-Id: I1a1533bb37d5c87b3f8e9534f67aa76026c44aed --- mkspecs/common/g++-win32.conf | 2 +- - mkspecs/features/create_cmake.prf | 4 ++-- + mkspecs/features/create_cmake.prf | 8 ++++---- mkspecs/features/win32/windows.prf | 4 ++-- src/winmain/winmain.pro | 2 +- - 4 files changed, 6 insertions(+), 6 deletions(-) + 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index 17d2a5efec..2975d371e3 100644 +index 5208d22bd6..1a058b787f 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -84,7 +84,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 @@ -27,20 +25,28 @@ index 17d2a5efec..2975d371e3 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 4aa5dad467..fa8c142ec5 100644 +index 0e71fd0015..0e8d41c685 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -321,8 +321,8 @@ mac { - CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll - CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll +@@ -325,14 +325,14 @@ mac { + } + mingw { - CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}$${debug_suffix}.a - CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a + CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a - !isEmpty(CMAKE_STATIC_TYPE) { - CMAKE_STATIC_WINDOWS_BUILD = "true" + CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a + } else { +- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib +- CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib ++ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib ++ CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib + + CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf index 272170d428..17f3ef9c2d 100644 --- a/mkspecs/features/win32/windows.prf @@ -70,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644 CONFIG += static -- -2.25.1 +2.26.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 4ddd04c2..715e6716 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 6ca73861aeb489e9e46c8ad051c7afd100d09cc9 Mon Sep 17 00:00:00 2001 +From f24d3dd8face31fb7b522ca383b8515ba2913911 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 16/31] Enable rpath for build tools @@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644 INSTALLS += target -- -2.25.1 +2.26.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 851b7e4f..2a946c4a 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 eba7f4ccfeb320a5b6a3a458c765ae2e63d38efc Mon Sep 17 00:00:00 2001 +From 3b9033c42d77fba36734f8268f042e2c0154c2b5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 17/31] Use system zlib for build tools @@ -23,5 +23,5 @@ index 9863ff5e69..02329611bc 100644 } else { CONFIG += no_core_dep -- -2.25.1 +2.26.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 8833b945..df15800f 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 6b5826e9aa80d2daa13cf1e20c01186145a73841 Mon Sep 17 00:00:00 2001 +From 5756d20ee409d114a355bd07051311757af46fa4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 18/31] Merge shared and static library trees @@ -48,7 +48,7 @@ index 81c84b28ef..910e59188f 100644 + CONFIG += no_smart_library_merge +} diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf -index 0e41b825ec..4c4b6dd12a 100644 +index 1d79f5c958..48f6e710b6 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -1,5 +1,16 @@ @@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.25.1 +2.26.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 eba90a8a..f811de33 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 c48e5bd1dca8cc003d70c9bf4f64b9954375afec Mon Sep 17 00:00:00 2001 +From e21df21893a3071ea5908c9cc19becda0287a231 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 19/31] Use *.dll.a as import lib extension @@ -6,7 +6,7 @@ Subject: [PATCH 19/31] Use *.dll.a as import lib extension The variables used here are provided by g++-win32.conf -Change-Id: I1175feedd96ef4940af87dc3662fedc8f4d1d764 +Change-Id: I40acb56685628ed52b3e6b89aab7f53f9a872b1a --- mkspecs/features/create_cmake.prf | 5 +++-- mkspecs/features/qt.prf | 15 ++++++++++++--- @@ -14,21 +14,21 @@ Change-Id: I1175feedd96ef4940af87dc3662fedc8f4d1d764 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index fa8c142ec5..e023f39a5d 100644 +index 0e8d41c685..a94f443de6 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -332,8 +332,9 @@ mac { - CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.prl - CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl - } else { -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a -+ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a -+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} -+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} - } +@@ -328,8 +328,9 @@ mac { + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a + CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a + +- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a +- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a ++ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a ++ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} ++ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} } else { - CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib + CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index bbada46c29..d6299d8eed 100644 --- a/mkspecs/features/qt.prf @@ -59,7 +59,7 @@ index bbada46c29..d6299d8eed 100644 } } diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index c1b28a52e9..3b4372ad05 100644 +index f33edb5bd9..3a75986257 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -99,9 +99,13 @@ private: @@ -94,5 +94,5 @@ index c1b28a52e9..3b4372ad05 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.25.1 +2.26.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 0444c851..36f759ea 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 fbd7da2201a41d429753dd3833e59a867d336497 Mon Sep 17 00:00:00 2001 +From 181461364ddf790c194108c4d6130cdd117c3a0a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 20/31] Pull dependencies of static libraries in CMake modules @@ -34,7 +34,7 @@ Change-Id: I6566d42d7e27d4cd23d261a0eacca9efad9ce6df 2 files changed, 135 insertions(+), 190 deletions(-) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 50364765fb..357c8b9cba 100644 +index 1099a761ce..a82e6a886f 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -53,6 +53,10 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura @@ -484,5 +484,5 @@ index 7b70cfed09..25f2162fe6 100644 -set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_TYPE \"$$CMAKE_PLUGIN_TYPE\") -set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_EXTENDS \"$$CMAKE_PLUGIN_EXTENDS\") -- -2.25.1 +2.26.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 130bbd3e..bf9ea9af 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 0bda7826502a4c823953ffbd1d9b4f851a61c651 Mon Sep 17 00:00:00 2001 +From f92560dca3a5ade9c23dc6f5cf84ec0ab6404080 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 21/31] Allow usage of static version with CMake @@ -11,20 +11,20 @@ installed in the same prefix - Set USE_STATIC_QT_BY_DEFAULT to use static version via regular find_package(Qt5Core) -Change-Id: Ib9411a9edbad2a82414b1af61075172a797f4318 +Change-Id: I339c8ef3a6ab96a3a6b85f7c8b93f1a5ee38cd71 --- - mkspecs/features/create_cmake.prf | 108 ++++--- + mkspecs/features/create_cmake.prf | 96 ++++-- .../data/cmake/Qt5BasicConfig.cmake.in | 304 ++++++++++++------ .../data/cmake/Qt5PluginTarget.cmake.in | 22 +- .../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, 319 insertions(+), 160 deletions(-) + 7 files changed, 320 insertions(+), 147 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 e023f39a5d..b2594d9921 100644 +index a94f443de6..a0166e4230 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -68,7 +68,7 @@ split_incpath { @@ -45,23 +45,24 @@ index e023f39a5d..b2594d9921 100644 internal_module { CMAKE_INTERNAL_MODULE = true -@@ -214,23 +216,25 @@ contains(CONFIG, plugin) { +@@ -214,20 +216,25 @@ contains(CONFIG, plugin) { win32 { !mingw|qtConfig(debug_and_release): debug_suffix="d" +- CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl +- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl +- - isEmpty(CMAKE_STATIC_TYPE) { + mingw { CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.dll CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.dll -+ CMAKE_PLUGIN_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a -+ CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a - CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl - CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl - } else:mingw { - CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a - CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a -- CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.prl -- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.prl ++ CMAKE_PLUGIN_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a ++ CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a ++ CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl ++ CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl + CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.static.prl + CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.static.prl } else { # MSVC static @@ -69,15 +70,15 @@ index e023f39a5d..b2594d9921 100644 CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.lib + CMAKE_PLUGIN_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.lib + CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.lib - CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl - CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl ++ CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl ++ CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl } } else { + # this branch is broken by the patch, only apply when building for Windows mac { isEmpty(CMAKE_STATIC_TYPE): CMAKE_PLUGIN_EXT = .dylib else: CMAKE_PLUGIN_EXT = .a -@@ -250,9 +254,9 @@ contains(CONFIG, plugin) { +@@ -247,9 +254,9 @@ contains(CONFIG, plugin) { } } cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in @@ -89,7 +90,7 @@ index e023f39a5d..b2594d9921 100644 !build_pass { QMAKE_SUBSTITUTES += cmake_target_file -@@ -261,7 +265,7 @@ contains(CONFIG, plugin) { +@@ -258,7 +265,7 @@ contains(CONFIG, plugin) { cmake_qt5_plugin_file.files = $$cmake_target_file.output static|staticlib: cmake_qt5_plugin_file.files += $$cmake_qt5_plugin_import_file.output @@ -98,7 +99,7 @@ index e023f39a5d..b2594d9921 100644 INSTALLS += cmake_qt5_plugin_file return() -@@ -274,26 +278,34 @@ mod_deps = +@@ -271,26 +278,34 @@ mod_deps = lib_deps = aux_mod_deps = aux_lib_deps = @@ -137,17 +138,24 @@ index e023f39a5d..b2594d9921 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 -@@ -324,18 +336,17 @@ mac { +@@ -317,13 +332,6 @@ mac { + CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll + CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll + +- !isEmpty(CMAKE_STATIC_TYPE) { +- CMAKE_STATIC_WINDOWS_BUILD = "true" +- +- CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl +- CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl +- } +- + mingw { CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a - -- !isEmpty(CMAKE_STATIC_TYPE) { -- CMAKE_STATIC_WINDOWS_BUILD = "true" -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a -+ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = dll.a -+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} -+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} +@@ -331,14 +339,30 @@ mac { + isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a + CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} + CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl + CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl + @@ -155,36 +163,16 @@ index e023f39a5d..b2594d9921 100644 + CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC = lib$${CMAKE_QT_STEM}.a + CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.static.prl + CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC = $${CMAKE_QT_STEM}.static.prl - -- CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.prl -- CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl -- } else { -- isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} -- } ++ } else { - CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll - CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll -@@ -343,19 +354,18 @@ mac { - CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib - CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib + CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib -- !isEmpty(CMAKE_STATIC_TYPE) { -- CMAKE_STATIC_WINDOWS_BUILD = "true" -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib -+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib -+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib + CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib + CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl + CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl - -- CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl -- CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl -- } else { -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib -- } ++ + CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.lib + CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC = $${CMAKE_QT_STEM}.lib + CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.static.prl @@ -195,7 +183,7 @@ index e023f39a5d..b2594d9921 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 -@@ -375,12 +385,12 @@ mac { +@@ -358,12 +382,12 @@ mac { INSTALLS += cmake_qt5_module_files cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in @@ -210,7 +198,7 @@ index e023f39a5d..b2594d9921 100644 !build_pass:QMAKE_SUBSTITUTES += \ cmake_config_file \ -@@ -390,11 +400,29 @@ cmake_qt5_module_files.files = \ +@@ -373,11 +397,29 @@ cmake_qt5_module_files.files = \ $$cmake_config_file.output \ $$cmake_config_version_file.output @@ -241,7 +229,7 @@ index e023f39a5d..b2594d9921 100644 !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file -@@ -406,7 +434,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake +@@ -389,7 +431,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake exists($$cmake_macros_file.input) { CMAKE_MODULE_MACROS = "true" @@ -250,7 +238,7 @@ index e023f39a5d..b2594d9921 100644 cmake_macros_file.CONFIG = verbatim !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file -@@ -414,7 +442,7 @@ exists($$cmake_macros_file.input) { +@@ -397,7 +439,7 @@ exists($$cmake_macros_file.input) { cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -260,7 +248,7 @@ index e023f39a5d..b2594d9921 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 357c8b9cba..38109b0182 100644 +index a82e6a886f..270d5c1c75 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) @@ -1061,5 +1049,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.25.1 +2.26.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 a98ba27d..004cb394 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 de31d365cb6423a2d49a92d4c388d6b0b59c2155 Mon Sep 17 00:00:00 2001 +From d214392ab20e45037c817c0150c5086993358e9f Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 22/31] Adjust linker flags for static build with @@ -25,5 +25,5 @@ index 58d1d5b366..967dc64a19 100644 +unset(_isExe) +!!ENDIF -- -2.25.1 +2.26.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 d4420499..01b005cc 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 543ad4d7a56be3c281cabaaa42115ce8c1ab6858 Mon Sep 17 00:00:00 2001 +From 58af82ed3fefd7b230341376c20dc8be84c913a3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 23/31] Use correct pkg-config --static flag @@ -22,5 +22,5 @@ index 910e59188f..aaa4123f4c 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.25.1 +2.26.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 17d26b5e..2aa74f4c 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 879dc7704da01c3dd0df17f7575c5d1a395c92b9 Mon Sep 17 00:00:00 2001 +From b14162daa442d61ba3747a68aff6b0a33677e606 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 24/31] Fix macro invoking moc, rcc and uic @@ -18,10 +18,10 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake -index 84c75401b1..3a35e30777 100644 +index 02f49a4b1e..581dbeac50 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 +@@ -139,8 +139,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target endif() set(_moc_extra_parameters_file @${_moc_parameters_file}) @@ -32,7 +32,7 @@ index 84c75401b1..3a35e30777 100644 DEPENDS ${infile} ${moc_depends} ${_moc_working_dir} VERBATIM) -@@ -248,8 +249,9 @@ function(QT5_ADD_BINARY_RESOURCES target ) +@@ -255,8 +256,9 @@ function(QT5_ADD_BINARY_RESOURCES target ) set(rc_depends ${rc_depends} ${_rc_depends}) endforeach() @@ -43,7 +43,7 @@ index 84c75401b1..3a35e30777 100644 ARGS ${rcc_options} --binary --name ${target} --output ${rcc_destination} ${infiles} DEPENDS ${rc_depends} ${out_depends} ${infiles} VERBATIM) add_custom_target(${target} ALL DEPENDS ${rcc_destination}) -@@ -281,8 +283,9 @@ function(QT5_ADD_RESOURCES outfiles ) +@@ -288,8 +290,9 @@ function(QT5_ADD_RESOURCES outfiles ) _QT5_PARSE_QRC_FILE(${infile} _out_depends _rc_depends) set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON) @@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.25.1 +2.26.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 1397d6a4..546d9b49 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 9552d093c269e20a62ba18609043eeb2f3a6739f Mon Sep 17 00:00:00 2001 +From b01de5ed0031d69b552b980214d4bfe6ce8ee52d Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 25/31] 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 8273ba3fe1..4cdb55d4b3 100644 +index 511b158b91..39760d5ce4 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf -@@ -150,5 +150,5 @@ defineTest(qtConfig) { +@@ -153,5 +153,5 @@ defineTest(qtConfig) { contains(QT.$${module}.disabled_features, $$1): \ return(false) } @@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.25.1 +2.26.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 9e452fb6..4ad59c2a 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 7adbe6e5728f93cbe5c57d12d626b0fd9a1a53d1 Mon Sep 17 00:00:00 2001 +From e2636a2a9b11a10ba86ce55a11d29623feca0c28 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 26/31] Enable and fix use of iconv @@ -74,5 +74,5 @@ index ae360239c6..5fd57a1a66 100644 }, "icu": { -- -2.25.1 +2.26.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 28a8c6c1..5f363544 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 5360d8b33d7de6d7176f8d58eccb24e86f1ea27c Mon Sep 17 00:00:00 2001 +From 8aad5efe320b053525a8cdcf5dd498c349cd5050 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 27/31] Ignore failing pkg-config test @@ -9,7 +9,7 @@ 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 846cb678c9..c39adc981f 100644 +index a481e54b8d..34cac288a7 100644 --- a/configure.json +++ b/configure.json @@ -755,7 +755,6 @@ @@ -21,5 +21,5 @@ index 846cb678c9..c39adc981f 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.25.1 +2.26.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 71677b29..4729b820 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 9373b1bc70fc28166449e309a5e0c66da9b8cfe9 Mon Sep 17 00:00:00 2001 +From 90787e1baa580ced40a79a20c8624ecdeee3aad4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 28/31] Prevent qmake from messing static lib dependencies @@ -27,7 +27,7 @@ index f7bd6dc663..b76c444012 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 3b4372ad05..cd10225e99 100644 +index 3a75986257..34e7776e44 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -106,6 +106,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) @@ -41,5 +41,5 @@ index 3b4372ad05..cd10225e99 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.25.1 +2.26.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 0dccfbcd..f20b64b1 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 5f73a31460be033f22aceb8d20446a7c249d4d67 Mon Sep 17 00:00:00 2001 +From 437223bd0628fc9f1081dc332412007df267e3fd Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 29/31] Hardcode linker flags for platform plugins @@ -152,5 +152,5 @@ index 50a3bb41a9..285d90c6d3 100644 include(windows.pri) -- -2.25.1 +2.26.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 2318f61f..cfeb7925 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 9edcc83a1b0e2686592a4cbdc6d550105d4fd1ff Mon Sep 17 00:00:00 2001 +From 3888a84625dae5abbf387498fe5f39166eab17e4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 30/31] 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.25.1 +2.26.0 diff --git a/qt5-base/mingw-w64-static/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/qt5-base/mingw-w64-static/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch index ccf282a5..c8711729 100644 --- a/qt5-base/mingw-w64-static/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch +++ b/qt5-base/mingw-w64-static/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch @@ -1,4 +1,4 @@ -From f8de051c13a2c97bef20a6b0282f5808498eb9c4 Mon Sep 17 00:00:00 2001 +From 68a2b716616ba060e856840cebb5601c61d60773 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 24 Jun 2019 13:51:02 +0200 Subject: [PATCH 31/31] Prevent 'Cannot find feature windows_vulkan_sdk' @@ -33,5 +33,5 @@ index 8475e4111a..c0eb8faa17 100644 LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD) for (nu, LD_USES) { -- -2.25.1 +2.26.0 diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD index febe2123..ba29ef76 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.14.1 +pkgver=5.14.2 pkgrel=1 pkgdesc='A cross-platform application and UI framework (mingw-w64)' # The static variant doesn't contain any executables which need to be executed on the build machine @@ -86,38 +86,38 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0029-Hardcode-linker-flags-for-platform-plugins.patch' '0030-Fix-linking-against-static-plugins-with-qmake.patch' '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch') -sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7' - '4ec86e817e97b84ca883144c1d9637fa624be0049ff44d682be0352ef7fde929' - 'a44f778df1981a70211e84e30756c01da58900a88dcc42ec8946ae19ca541520' - 'c79cac867cd73c83e6be8c02c36cb95d100199ada1602a448983a8a624bac97a' - '32c71d398d66629e2d4598135ef70262b7510107a0136d557194aae4871206a2' - 'e134748cf88137663fbf6cf00f5b1e2dcd38eeb679546a073ea509099c89b37f' - 'f80f903cac3e2544ce4c480d7dff16e7bbb26ffaaee46ce33a70dff1d11d1e71' - '582053415533f197579becf60b3001988ddf5a9fe16f6aaa31697e619c5f6490' - 'bc80a103ddec2b0f726e2118b5a96bb6d5d00fe6ab44d8cd55b4ff27f4ab2db8' - '99c1b16f3725a6b63fe714efa477bcc27227a9051d52742c682b34ff089e72e2' - '231916474e098bec7f407a443240e465ca0756ca693ef080e4132d1bafff9bae' - 'a577d6efcb138c5a06fb2cc9a2a00451eb34a585047854cef78e2133d5cfedaf' - '92ec4e8237c84a9756016efba3120ac58a75316bf10727c28f8bb53ec52fba52' - 'd6f878b78c1fd285118873c065d1bf82f36a5af532cbe2d34675c5099e8c9733' - 'a452bbd2566e805a3cb62c0f76c3e4d375c988f923750a39b2f77ef04b6f1e3f' - '55aeb64a56ce77848e708ad5330fe04c6b2fb42b1bf2b7bb3be8962500d6f692' - 'efdd65bc89dcfab056024faeb1fd20738e08a03eb4e1a742a92a22b92341d34d' - '8148358ddb7693204c0d0532be54eaca0caa8a21fc05a7b96a5b4fec236bfd6c' - '6ccf074858de2e5d8aea85df1f86b2f642d9cbe10c93b51e655c8a33469bc4e2' - '096b7547ce73d396dfc47eca36bbeab06de4447d63f110cb8b83f674f7cbd9f5' - '481c1764d80a23aea2e4d38c7b86dc5eb432e4f8900d9d8ab1d16f4708351667' - '1dbd4613645ba8814f61032df5187c6d253cbab16a62f8dc8586d5acc7c73bd2' - '90a2d46373bf6b5b601a78ac5a2abb2335b3daf98d86ca4528b4cbed50f31a99' - 'f0e52e0fc7b69420cc0f7d961eb78f1731d83e3c6908920fb2a3029d6f4037c7' - '24da08db6f9ecaa66b8c2b408d772530abd92cc89230faac445d27f044f95798' - '2f29672a98cf65c77a31dd5435e538c5cd036d07be52bbbe56f7fdab989753e2' - '8c2655008ecd00d0d37da67604de1888b414042d846aebf4569bd7004b5234fd' - '9cfdb253384e964b9be4aef16ac36f37561e94bb608bbb9bd5549afc1ea5fffa' - '76810324f7da5958e2fc34f9a4498304f81a0d3f4b0522ace2a0eb55e0f24152' - 'e131b2c62e05a182d8e34f878d619673fb2b8047aba76afa31305fbbf1b519a3' - '635e126785ff8190802cbcf4c2627078c6e556b5aa66f0bed9a6a73eaf9d4a59' - '414fe06844458684cc300f0a0c653c5b2e8727918179eff7884c9c0ba5ea473e') +sha256sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a' + 'c758e9ec290052a3ea029f40e5d5cfaadd2135ad7841366393449a4c71d84a88' + 'a0280ed9dd31b2cdffa1c7ae25f9a6cb3a4164c76b7fa07c4e2eaa8cc01e6762' + '9a3c591e2645997a94d30687adfc08f1ea7f64597fef78c777ed7137071de02f' + '1d7fe2ef6be292e9ec84f313e4ba543f1b368a1ee0915f858d54615be93cf794' + '3099b7210a873ee12374d452fb98204d046a2d5c6b1a330d32d45ae59c95cd86' + 'c2a8f4a7536ad0293bdab882d01e0055bc7d4a3e97794f7c304d01d1daa24bf7' + '3b7e90637b3a0671fac0f8607d613bf0f3f9a73cc62e43848049125c7a925a52' + '2e08efe5160c91899ac549303f888c5872e1d198068c5a00c3a34d7040f5410f' + '82764b7047b65a262f7c49305dee6579171a5e179fa85f8801d121e03937576e' + '27dd7df0721e8d4d3f4f4c30c8e9ca8793f50a04f983b3489ff1227aae996f43' + '4f0754277a14bdd8682b5d3701871f8901d2dd9f00ef8318bf6d62e9d4a26171' + 'd4b3fb742c973119d1c98a34063fcc29861fa6325481a8baf5dfac13c32db597' + 'd70ce95ddaa3dac7bdf273c3a8926df6b41771d75f17c68e205a1b9bb80a77e1' + '0366353ce1e4da4e800be55b457d649b0c3e6ba83a2d53dc8c6e3e08dd82637f' + '4632228567fd25ffb75de6750120c0ceea1d2c4ce2e91ef214a39b54ee7b56fc' + 'ab79617e34dbc8bcefb63f0ff59a3efc5da2d313284aa3e690f8c6025a9cb090' + 'b4f68710feda5c11dc2c3b4fdc755bb2186599046a8443c6f61ff9d369357193' + 'a4656c1d3ec12ad50b2c92382775619d435e49a392bb08be5cbc8a654248f3dd' + '36e3520481ef8d58e7595195c0eb230df80034590c27622836a38199abf7721c' + '640ac515c0453def45cdaf2d5813d1ae95ce953014aeacb78cb1747fa2c0da3e' + '612b95a477b9956e61ac1557c0e885a7dd2ae0aa56ef69e29116cafcbc7b0d50' + '2bfb7e8400b0e14b5e8c14413d67b9fa437fe920fa9ffc458f769ea22b2bed29' + '26473b4a55ce4b764354ff54b40a6dcc6d93aea41b7175afeb1a030cb118f3a8' + '98058d1696ff05af14d10017062d697839736cf8cfef94ac77d6cefb6c46f311' + '30d2cf6c309c4922ebc4a5822aab76161950f7036666dc18489da22315ef214d' + '692c3e1679aa82c6aa395d75a06f02f0d1a0b05230197ef19fe4ef7c7b3b888e' + 'c285e9900a63d67a01accd6d7a798c5f2476e90f3d8ea8ffb0f272d90d942141' + 'fbd28eeed43e451240c52582f675e5f5ba069450ee20488bf993b33e76e8275c' + '1709f452c4986f6b7366412bc906b52e4a01d412e20d3fda561b7fa090ed8890' + '245af9755b5637200ea1d678e0ac1a493ed0fbcb9c25dc2a79c0a5e3c007a19a' + '810255e443f940b57e90f4934e4317c050d3edf3593cd0a30c1e2b5a35cf7f68') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -327,6 +327,7 @@ package() { "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5FontDatabaseSupport" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5PlatformCompositorSupport" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5ThemeSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5OpenGLExtensions*" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5WindowsUIAutomationSupport" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5VulkanSupport" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5Bootstrap" \ diff --git a/qt5-base/mingw-w64-static/qtbase-sha256.txt b/qt5-base/mingw-w64-static/qtbase-sha256.txt index 8105d678..4b5ee578 100644 --- a/qt5-base/mingw-w64-static/qtbase-sha256.txt +++ b/qt5-base/mingw-w64-static/qtbase-sha256.txt @@ -1 +1 @@ -d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7 +48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a 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 f8182ec0..7e41b92d 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 5a6b36b853699f49504173ca35a1c47c9a54d56f Mon Sep 17 00:00:00 2001 +From c416378bd70ab26f9ce9e34fe72a364dd19bae73 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/31] Adjust win32-g++ profile for cross compilation with @@ -21,7 +21,7 @@ Change-Id: I4c9b3c170ed13943abe0d8b397a8cb9e360538b6 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index 6369436863..17d2a5efec 100644 +index c3a1f3a373..5208d22bd6 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -8,18 +8,24 @@ @@ -43,10 +43,10 @@ index 6369436863..17d2a5efec 100644 MAKEFILE_GENERATOR = MINGW QMAKE_PLATFORM = win32 mingw --CONFIG += precompile_header +-CONFIG += debug_and_release debug_and_release_target precompile_header -DEFINES += UNICODE _UNICODE WIN32 MINGW_HAS_SECURE_API=1 -QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32 -+CONFIG += precompile_header $${CROSS_COMPILE_CUSTOM_CONFIG} ++CONFIG += debug_and_release debug_and_release_target precompile_header $${CROSS_COMPILE_CUSTOM_CONFIG} +DEFINES += UNICODE _UNICODE MINGW_HAS_SECURE_API=1 +QMAKE_COMPILER_DEFINES += __GNUC__ _WIN32 WIN32 # can't add 'DEFINES += WIN64' and 'QMAKE_COMPILER_DEFINES += _WIN64' defines for @@ -163,5 +163,5 @@ index 5de482f23b..3c3d22c699 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.25.1 +2.26.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 349d12f0..d100924a 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 236c97172a05e530ab98153c0d16a4ddf59cd33c Mon Sep 17 00:00:00 2001 +From 06380a45c2cb2f6882e7102fdd46bcdd9e4aba48 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/31] Ensure GLdouble is defined when using dynamic OpenGL @@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.25.1 +2.26.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 a12c3199..eec82f7c 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 160ef19acaa0504bb04a8f5ffc22229102c3ec9b Mon Sep 17 00:00:00 2001 +From 40b1ebaa7481c339b437e976e760bf099df5c594 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 03/31] 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.25.1 +2.26.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 f974943e..9122c11e 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 d758e71cb38b4fec2f012121605185bf395206cf Mon Sep 17 00:00:00 2001 +From f1122d1929e271162eb062aad43097ad69c7159e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 04/31] Make sure *.pc files are installed correctly @@ -49,10 +49,10 @@ index ab970c966f..01f97c61d4 100644 void writePkgConfigFile(); // for pkg-config diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index 86d10c213c..c1b28a52e9 100644 +index 3ec2704625..f33edb5bd9 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp -@@ -761,7 +761,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) +@@ -775,7 +775,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t) } if(!ret.isEmpty()) ret += "\n\t"; @@ -62,5 +62,5 @@ index 86d10c213c..c1b28a52e9 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.25.1 +2.26.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 cfc95ac3..d303224b 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 c38954b7d8c29530a5290c52f7981d7a784e7a4f Mon Sep 17 00:00:00 2001 +From dc9860e99a09a4dc54cfe60959a34e06a288f7d6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 05/31] Don't add resource files to LIBS parameter @@ -24,5 +24,5 @@ index 096b041056..eb498b28e8 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.25.1 +2.26.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 9af15baf..36345b94 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 8b73190855f699bd7c1ff67c753fe3d17996f43b Mon Sep 17 00:00:00 2001 +From 2cfd0a32516ba85f0c608fb81341090c28209750 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 06/31] Prevent debug library names in pkg-config files @@ -29,5 +29,5 @@ index f9532e0db9..9c65f21ac0 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.25.1 +2.26.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 21243611..3425b12a 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 99c07cf7413a04cd7297a4c18e4ebf73351c8720 Mon Sep 17 00:00:00 2001 +From 3e1b4e602c5a2569d9a337990a2e38e3ef82f251 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 07/31] Fix linking against shared/static libpng @@ -26,5 +26,5 @@ index 0202f17b21..099c11da95 100644 ], "use": [ -- -2.25.1 +2.26.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 246b4196..a2de09a6 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 3a5c4c981dade3223099630a16a874ba083ecd55 Mon Sep 17 00:00:00 2001 +From d54fefe4a033a39ba628858c18ab0a95520069f2 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 08/31] Fix linking against static D-Bus @@ -9,7 +9,7 @@ Subject: [PATCH 08/31] Fix linking against static D-Bus 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.json b/configure.json -index 62d78f8dc6..f7d169f053 100644 +index 868f15db13..147cf9eb00 100644 --- a/configure.json +++ b/configure.json @@ -188,18 +188,23 @@ @@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644 # include #else -- -2.25.1 +2.26.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 8f41e997..2b435f7f 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 e1a1979b15712954adfca6d44f45dad99357286e Mon Sep 17 00:00:00 2001 +From 012e5b2dfbc5de85412bb450970d0320e369da30 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 09/31] 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 f7d169f053..846cb678c9 100644 +index 147cf9eb00..a481e54b8d 100644 --- a/configure.json +++ b/configure.json @@ -201,7 +201,7 @@ @@ -25,5 +25,5 @@ index f7d169f053..846cb678c9 100644 }, "condition": "config.win32 && features.shared" -- -2.25.1 +2.26.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 35423bfd..f5effe21 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 3c9bf1e7fcd5f965d9f3a91d05d762d6f4061a5e Mon Sep 17 00:00:00 2001 +From ca204fd0ed444fdf4e478540f8b5d88cb345be75 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 10/31] Fix linking against static freetype2 @@ -26,5 +26,5 @@ index 099c11da95..872deb3ad3 100644 { "libs": "-lfreetype" } ], -- -2.25.1 +2.26.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 68c5df49..b8515a34 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 c7515aea498a46c8d2291b8590989d6092ab3404 Mon Sep 17 00:00:00 2001 +From 483ae9b6bfc1f40e3617d8b6cd58ef93985cf397 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 11/31] Fix linking against static harfbuzz @@ -25,5 +25,5 @@ index 872deb3ad3..7daaaa5a11 100644 }, "imf": { -- -2.25.1 +2.26.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 a3b179b3..a0f3ac35 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 d3f6ecda90e28aabf58cbb4a92f22e803551ac05 Mon Sep 17 00:00:00 2001 +From 0c26bfba6773298fd314fc38ec1be7cb58a5d752 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 12/31] Fix linking against static pcre @@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1 1 file changed, 4 insertions(+) diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp -index 67be67c243..0bc4c5157c 100644 +index 59d21e0a23..518f91d753 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp @@ -53,6 +53,10 @@ @@ -24,5 +24,5 @@ index 67be67c243..0bc4c5157c 100644 #include -- -2.25.1 +2.26.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 ebcd671d..3249f32f 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 e6dde84ed7cc286a9e195b96e609f244654b4540 Mon Sep 17 00:00:00 2001 +From 2852ac7e9e087b8374daa044dba1885d5c2bbac5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 13/31] 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.25.1 +2.26.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 c1bc565b..f6ada4e2 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 d97b57e1de32789a2cdfee280c49b3b8dff31a55 Mon Sep 17 00:00:00 2001 +From 5f3fb54d36009c5eced4335e79437b5d8eecdf08 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 14/31] Fix linking against shared/static PostgreSQL @@ -24,5 +24,5 @@ index babd0465ce..37e25881f0 100644 ] }, -- -2.25.1 +2.26.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 1fb948e1..10faeb3a 100644 --- a/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch @@ -1,20 +1,18 @@ -From 8fcc619606cfa41f46f9b605a4752e33c376d5a1 Mon Sep 17 00:00:00 2001 +From d61af2077d70356fc0f69aeb27e82bed66f8d52e Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 15/31] Rename qtmain to qt5main Prevents conflict with mingw-w64-qt4 package - -Change-Id: I1a1533bb37d5c87b3f8e9534f67aa76026c44aed --- mkspecs/common/g++-win32.conf | 2 +- - mkspecs/features/create_cmake.prf | 4 ++-- + mkspecs/features/create_cmake.prf | 8 ++++---- mkspecs/features/win32/windows.prf | 4 ++-- src/winmain/winmain.pro | 2 +- - 4 files changed, 6 insertions(+), 6 deletions(-) + 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index 17d2a5efec..2975d371e3 100644 +index 5208d22bd6..1a058b787f 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf @@ -84,7 +84,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 @@ -27,20 +25,28 @@ index 17d2a5efec..2975d371e3 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 4aa5dad467..fa8c142ec5 100644 +index 0e71fd0015..0e8d41c685 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -321,8 +321,8 @@ mac { - CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll - CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll +@@ -325,14 +325,14 @@ mac { + } + mingw { - CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}$${debug_suffix}.a - CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a + CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a - !isEmpty(CMAKE_STATIC_TYPE) { - CMAKE_STATIC_WINDOWS_BUILD = "true" + CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a + } else { +- CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib +- CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib ++ CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib ++ CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib + + CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf index 272170d428..17f3ef9c2d 100644 --- a/mkspecs/features/win32/windows.prf @@ -70,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644 CONFIG += static -- -2.25.1 +2.26.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 4ddd04c2..715e6716 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 6ca73861aeb489e9e46c8ad051c7afd100d09cc9 Mon Sep 17 00:00:00 2001 +From f24d3dd8face31fb7b522ca383b8515ba2913911 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 16/31] Enable rpath for build tools @@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644 INSTALLS += target -- -2.25.1 +2.26.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 851b7e4f..2a946c4a 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 eba7f4ccfeb320a5b6a3a458c765ae2e63d38efc Mon Sep 17 00:00:00 2001 +From 3b9033c42d77fba36734f8268f042e2c0154c2b5 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 17/31] Use system zlib for build tools @@ -23,5 +23,5 @@ index 9863ff5e69..02329611bc 100644 } else { CONFIG += no_core_dep -- -2.25.1 +2.26.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 8833b945..df15800f 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 6b5826e9aa80d2daa13cf1e20c01186145a73841 Mon Sep 17 00:00:00 2001 +From 5756d20ee409d114a355bd07051311757af46fa4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 18/31] Merge shared and static library trees @@ -48,7 +48,7 @@ index 81c84b28ef..910e59188f 100644 + CONFIG += no_smart_library_merge +} diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf -index 0e41b825ec..4c4b6dd12a 100644 +index 1d79f5c958..48f6e710b6 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -1,5 +1,16 @@ @@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.25.1 +2.26.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 eba90a8a..f811de33 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 c48e5bd1dca8cc003d70c9bf4f64b9954375afec Mon Sep 17 00:00:00 2001 +From e21df21893a3071ea5908c9cc19becda0287a231 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 19/31] Use *.dll.a as import lib extension @@ -6,7 +6,7 @@ Subject: [PATCH 19/31] Use *.dll.a as import lib extension The variables used here are provided by g++-win32.conf -Change-Id: I1175feedd96ef4940af87dc3662fedc8f4d1d764 +Change-Id: I40acb56685628ed52b3e6b89aab7f53f9a872b1a --- mkspecs/features/create_cmake.prf | 5 +++-- mkspecs/features/qt.prf | 15 ++++++++++++--- @@ -14,21 +14,21 @@ Change-Id: I1175feedd96ef4940af87dc3662fedc8f4d1d764 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index fa8c142ec5..e023f39a5d 100644 +index 0e8d41c685..a94f443de6 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -332,8 +332,9 @@ mac { - CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.prl - CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl - } else { -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a -+ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a -+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} -+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} - } +@@ -328,8 +328,9 @@ mac { + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a + CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a + +- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a +- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a ++ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a ++ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} ++ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} } else { - CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib + CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index bbada46c29..d6299d8eed 100644 --- a/mkspecs/features/qt.prf @@ -59,7 +59,7 @@ index bbada46c29..d6299d8eed 100644 } } diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index c1b28a52e9..3b4372ad05 100644 +index f33edb5bd9..3a75986257 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -99,9 +99,13 @@ private: @@ -94,5 +94,5 @@ index c1b28a52e9..3b4372ad05 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.25.1 +2.26.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 0444c851..36f759ea 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 fbd7da2201a41d429753dd3833e59a867d336497 Mon Sep 17 00:00:00 2001 +From 181461364ddf790c194108c4d6130cdd117c3a0a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 20/31] Pull dependencies of static libraries in CMake modules @@ -34,7 +34,7 @@ Change-Id: I6566d42d7e27d4cd23d261a0eacca9efad9ce6df 2 files changed, 135 insertions(+), 190 deletions(-) diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in -index 50364765fb..357c8b9cba 100644 +index 1099a761ce..a82e6a886f 100644 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in @@ -53,6 +53,10 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura @@ -484,5 +484,5 @@ index 7b70cfed09..25f2162fe6 100644 -set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_TYPE \"$$CMAKE_PLUGIN_TYPE\") -set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_EXTENDS \"$$CMAKE_PLUGIN_EXTENDS\") -- -2.25.1 +2.26.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 130bbd3e..bf9ea9af 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 0bda7826502a4c823953ffbd1d9b4f851a61c651 Mon Sep 17 00:00:00 2001 +From f92560dca3a5ade9c23dc6f5cf84ec0ab6404080 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 21/31] Allow usage of static version with CMake @@ -11,20 +11,20 @@ installed in the same prefix - Set USE_STATIC_QT_BY_DEFAULT to use static version via regular find_package(Qt5Core) -Change-Id: Ib9411a9edbad2a82414b1af61075172a797f4318 +Change-Id: I339c8ef3a6ab96a3a6b85f7c8b93f1a5ee38cd71 --- - mkspecs/features/create_cmake.prf | 108 ++++--- + mkspecs/features/create_cmake.prf | 96 ++++-- .../data/cmake/Qt5BasicConfig.cmake.in | 304 ++++++++++++------ .../data/cmake/Qt5PluginTarget.cmake.in | 22 +- .../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, 319 insertions(+), 160 deletions(-) + 7 files changed, 320 insertions(+), 147 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 e023f39a5d..b2594d9921 100644 +index a94f443de6..a0166e4230 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -68,7 +68,7 @@ split_incpath { @@ -45,23 +45,24 @@ index e023f39a5d..b2594d9921 100644 internal_module { CMAKE_INTERNAL_MODULE = true -@@ -214,23 +216,25 @@ contains(CONFIG, plugin) { +@@ -214,20 +216,25 @@ contains(CONFIG, plugin) { win32 { !mingw|qtConfig(debug_and_release): debug_suffix="d" +- CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl +- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl +- - isEmpty(CMAKE_STATIC_TYPE) { + mingw { CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.dll CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.dll -+ CMAKE_PLUGIN_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a -+ CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a - CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl - CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl - } else:mingw { - CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a - CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a -- CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.prl -- CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.prl ++ CMAKE_PLUGIN_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a ++ CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a ++ CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl ++ CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl + CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.static.prl + CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.static.prl } else { # MSVC static @@ -69,15 +70,15 @@ index e023f39a5d..b2594d9921 100644 CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.lib + CMAKE_PLUGIN_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.lib + CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.lib - CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl - CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl ++ CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl ++ CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl } } else { + # this branch is broken by the patch, only apply when building for Windows mac { isEmpty(CMAKE_STATIC_TYPE): CMAKE_PLUGIN_EXT = .dylib else: CMAKE_PLUGIN_EXT = .a -@@ -250,9 +254,9 @@ contains(CONFIG, plugin) { +@@ -247,9 +254,9 @@ contains(CONFIG, plugin) { } } cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in @@ -89,7 +90,7 @@ index e023f39a5d..b2594d9921 100644 !build_pass { QMAKE_SUBSTITUTES += cmake_target_file -@@ -261,7 +265,7 @@ contains(CONFIG, plugin) { +@@ -258,7 +265,7 @@ contains(CONFIG, plugin) { cmake_qt5_plugin_file.files = $$cmake_target_file.output static|staticlib: cmake_qt5_plugin_file.files += $$cmake_qt5_plugin_import_file.output @@ -98,7 +99,7 @@ index e023f39a5d..b2594d9921 100644 INSTALLS += cmake_qt5_plugin_file return() -@@ -274,26 +278,34 @@ mod_deps = +@@ -271,26 +278,34 @@ mod_deps = lib_deps = aux_mod_deps = aux_lib_deps = @@ -137,17 +138,24 @@ index e023f39a5d..b2594d9921 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 -@@ -324,18 +336,17 @@ mac { +@@ -317,13 +332,6 @@ mac { + CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll + CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll + +- !isEmpty(CMAKE_STATIC_TYPE) { +- CMAKE_STATIC_WINDOWS_BUILD = "true" +- +- CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl +- CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl +- } +- + mingw { CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a - -- !isEmpty(CMAKE_STATIC_TYPE) { -- CMAKE_STATIC_WINDOWS_BUILD = "true" -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a -+ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = dll.a -+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} -+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} +@@ -331,14 +339,30 @@ mac { + isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a + CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} + CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl + CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl + @@ -155,36 +163,16 @@ index e023f39a5d..b2594d9921 100644 + CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC = lib$${CMAKE_QT_STEM}.a + CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.static.prl + CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC = $${CMAKE_QT_STEM}.static.prl - -- CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.prl -- CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl -- } else { -- isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB} -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB} -- } ++ } else { - CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll - CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll -@@ -343,19 +354,18 @@ mac { - CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib - CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib + CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib + CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib -- !isEmpty(CMAKE_STATIC_TYPE) { -- CMAKE_STATIC_WINDOWS_BUILD = "true" -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib -+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib -+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib + CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib + CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl + CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl - -- CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl -- CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl -- } else { -- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib -- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib -- } ++ + CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.lib + CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC = $${CMAKE_QT_STEM}.lib + CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.static.prl @@ -195,7 +183,7 @@ index e023f39a5d..b2594d9921 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 -@@ -375,12 +385,12 @@ mac { +@@ -358,12 +382,12 @@ mac { INSTALLS += cmake_qt5_module_files cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in @@ -210,7 +198,7 @@ index e023f39a5d..b2594d9921 100644 !build_pass:QMAKE_SUBSTITUTES += \ cmake_config_file \ -@@ -390,11 +400,29 @@ cmake_qt5_module_files.files = \ +@@ -373,11 +397,29 @@ cmake_qt5_module_files.files = \ $$cmake_config_file.output \ $$cmake_config_version_file.output @@ -241,7 +229,7 @@ index e023f39a5d..b2594d9921 100644 !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file -@@ -406,7 +434,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake +@@ -389,7 +431,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake exists($$cmake_macros_file.input) { CMAKE_MODULE_MACROS = "true" @@ -250,7 +238,7 @@ index e023f39a5d..b2594d9921 100644 cmake_macros_file.CONFIG = verbatim !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file -@@ -414,7 +442,7 @@ exists($$cmake_macros_file.input) { +@@ -397,7 +439,7 @@ exists($$cmake_macros_file.input) { cmake_qt5_module_files.files += $$cmake_macros_file.output } @@ -260,7 +248,7 @@ index e023f39a5d..b2594d9921 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 357c8b9cba..38109b0182 100644 +index a82e6a886f..270d5c1c75 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) @@ -1061,5 +1049,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.25.1 +2.26.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 a98ba27d..004cb394 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 de31d365cb6423a2d49a92d4c388d6b0b59c2155 Mon Sep 17 00:00:00 2001 +From d214392ab20e45037c817c0150c5086993358e9f Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 22/31] Adjust linker flags for static build with @@ -25,5 +25,5 @@ index 58d1d5b366..967dc64a19 100644 +unset(_isExe) +!!ENDIF -- -2.25.1 +2.26.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 d4420499..01b005cc 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 543ad4d7a56be3c281cabaaa42115ce8c1ab6858 Mon Sep 17 00:00:00 2001 +From 58af82ed3fefd7b230341376c20dc8be84c913a3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 23/31] Use correct pkg-config --static flag @@ -22,5 +22,5 @@ index 910e59188f..aaa4123f4c 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.25.1 +2.26.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 17d26b5e..2aa74f4c 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 879dc7704da01c3dd0df17f7575c5d1a395c92b9 Mon Sep 17 00:00:00 2001 +From b14162daa442d61ba3747a68aff6b0a33677e606 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 24/31] Fix macro invoking moc, rcc and uic @@ -18,10 +18,10 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake -index 84c75401b1..3a35e30777 100644 +index 02f49a4b1e..581dbeac50 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 +@@ -139,8 +139,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target endif() set(_moc_extra_parameters_file @${_moc_parameters_file}) @@ -32,7 +32,7 @@ index 84c75401b1..3a35e30777 100644 DEPENDS ${infile} ${moc_depends} ${_moc_working_dir} VERBATIM) -@@ -248,8 +249,9 @@ function(QT5_ADD_BINARY_RESOURCES target ) +@@ -255,8 +256,9 @@ function(QT5_ADD_BINARY_RESOURCES target ) set(rc_depends ${rc_depends} ${_rc_depends}) endforeach() @@ -43,7 +43,7 @@ index 84c75401b1..3a35e30777 100644 ARGS ${rcc_options} --binary --name ${target} --output ${rcc_destination} ${infiles} DEPENDS ${rc_depends} ${out_depends} ${infiles} VERBATIM) add_custom_target(${target} ALL DEPENDS ${rcc_destination}) -@@ -281,8 +283,9 @@ function(QT5_ADD_RESOURCES outfiles ) +@@ -288,8 +290,9 @@ function(QT5_ADD_RESOURCES outfiles ) _QT5_PARSE_QRC_FILE(${infile} _out_depends _rc_depends) set_source_files_properties(${infile} PROPERTIES SKIP_AUTORCC ON) @@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.25.1 +2.26.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 1397d6a4..546d9b49 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 9552d093c269e20a62ba18609043eeb2f3a6739f Mon Sep 17 00:00:00 2001 +From b01de5ed0031d69b552b980214d4bfe6ce8ee52d Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 25/31] 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 8273ba3fe1..4cdb55d4b3 100644 +index 511b158b91..39760d5ce4 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf -@@ -150,5 +150,5 @@ defineTest(qtConfig) { +@@ -153,5 +153,5 @@ defineTest(qtConfig) { contains(QT.$${module}.disabled_features, $$1): \ return(false) } @@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.25.1 +2.26.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 9e452fb6..4ad59c2a 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 7adbe6e5728f93cbe5c57d12d626b0fd9a1a53d1 Mon Sep 17 00:00:00 2001 +From e2636a2a9b11a10ba86ce55a11d29623feca0c28 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 26/31] Enable and fix use of iconv @@ -74,5 +74,5 @@ index ae360239c6..5fd57a1a66 100644 }, "icu": { -- -2.25.1 +2.26.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 28a8c6c1..5f363544 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 5360d8b33d7de6d7176f8d58eccb24e86f1ea27c Mon Sep 17 00:00:00 2001 +From 8aad5efe320b053525a8cdcf5dd498c349cd5050 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 27/31] Ignore failing pkg-config test @@ -9,7 +9,7 @@ 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 846cb678c9..c39adc981f 100644 +index a481e54b8d..34cac288a7 100644 --- a/configure.json +++ b/configure.json @@ -755,7 +755,6 @@ @@ -21,5 +21,5 @@ index 846cb678c9..c39adc981f 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.25.1 +2.26.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 71677b29..4729b820 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 9373b1bc70fc28166449e309a5e0c66da9b8cfe9 Mon Sep 17 00:00:00 2001 +From 90787e1baa580ced40a79a20c8624ecdeee3aad4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 28/31] Prevent qmake from messing static lib dependencies @@ -27,7 +27,7 @@ index f7bd6dc663..b76c444012 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 3b4372ad05..cd10225e99 100644 +index 3a75986257..34e7776e44 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -106,6 +106,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) @@ -41,5 +41,5 @@ index 3b4372ad05..cd10225e99 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.25.1 +2.26.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 0dccfbcd..f20b64b1 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 5f73a31460be033f22aceb8d20446a7c249d4d67 Mon Sep 17 00:00:00 2001 +From 437223bd0628fc9f1081dc332412007df267e3fd Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 29/31] Hardcode linker flags for platform plugins @@ -152,5 +152,5 @@ index 50a3bb41a9..285d90c6d3 100644 include(windows.pri) -- -2.25.1 +2.26.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 2318f61f..cfeb7925 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 9edcc83a1b0e2686592a4cbdc6d550105d4fd1ff Mon Sep 17 00:00:00 2001 +From 3888a84625dae5abbf387498fe5f39166eab17e4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 30/31] 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.25.1 +2.26.0 diff --git a/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch index ccf282a5..c8711729 100644 --- a/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch +++ b/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch @@ -1,4 +1,4 @@ -From f8de051c13a2c97bef20a6b0282f5808498eb9c4 Mon Sep 17 00:00:00 2001 +From 68a2b716616ba060e856840cebb5601c61d60773 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 24 Jun 2019 13:51:02 +0200 Subject: [PATCH 31/31] Prevent 'Cannot find feature windows_vulkan_sdk' @@ -33,5 +33,5 @@ index 8475e4111a..c0eb8faa17 100644 LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD) for (nu, LD_USES) { -- -2.25.1 +2.26.0 diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD index 0b9a731e..d3bd31a5 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.14.1 +pkgver=5.14.2 pkgrel=1 pkgdesc='A cross-platform application and UI framework (mingw-w64)' # The static variant doesn't contain any executables which need to be executed on the build machine @@ -86,38 +86,38 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0029-Hardcode-linker-flags-for-platform-plugins.patch' '0030-Fix-linking-against-static-plugins-with-qmake.patch' '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch') -sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7' - '4ec86e817e97b84ca883144c1d9637fa624be0049ff44d682be0352ef7fde929' - 'a44f778df1981a70211e84e30756c01da58900a88dcc42ec8946ae19ca541520' - 'c79cac867cd73c83e6be8c02c36cb95d100199ada1602a448983a8a624bac97a' - '32c71d398d66629e2d4598135ef70262b7510107a0136d557194aae4871206a2' - 'e134748cf88137663fbf6cf00f5b1e2dcd38eeb679546a073ea509099c89b37f' - 'f80f903cac3e2544ce4c480d7dff16e7bbb26ffaaee46ce33a70dff1d11d1e71' - '582053415533f197579becf60b3001988ddf5a9fe16f6aaa31697e619c5f6490' - 'bc80a103ddec2b0f726e2118b5a96bb6d5d00fe6ab44d8cd55b4ff27f4ab2db8' - '99c1b16f3725a6b63fe714efa477bcc27227a9051d52742c682b34ff089e72e2' - '231916474e098bec7f407a443240e465ca0756ca693ef080e4132d1bafff9bae' - 'a577d6efcb138c5a06fb2cc9a2a00451eb34a585047854cef78e2133d5cfedaf' - '92ec4e8237c84a9756016efba3120ac58a75316bf10727c28f8bb53ec52fba52' - 'd6f878b78c1fd285118873c065d1bf82f36a5af532cbe2d34675c5099e8c9733' - 'a452bbd2566e805a3cb62c0f76c3e4d375c988f923750a39b2f77ef04b6f1e3f' - '55aeb64a56ce77848e708ad5330fe04c6b2fb42b1bf2b7bb3be8962500d6f692' - 'efdd65bc89dcfab056024faeb1fd20738e08a03eb4e1a742a92a22b92341d34d' - '8148358ddb7693204c0d0532be54eaca0caa8a21fc05a7b96a5b4fec236bfd6c' - '6ccf074858de2e5d8aea85df1f86b2f642d9cbe10c93b51e655c8a33469bc4e2' - '096b7547ce73d396dfc47eca36bbeab06de4447d63f110cb8b83f674f7cbd9f5' - '481c1764d80a23aea2e4d38c7b86dc5eb432e4f8900d9d8ab1d16f4708351667' - '1dbd4613645ba8814f61032df5187c6d253cbab16a62f8dc8586d5acc7c73bd2' - '90a2d46373bf6b5b601a78ac5a2abb2335b3daf98d86ca4528b4cbed50f31a99' - 'f0e52e0fc7b69420cc0f7d961eb78f1731d83e3c6908920fb2a3029d6f4037c7' - '24da08db6f9ecaa66b8c2b408d772530abd92cc89230faac445d27f044f95798' - '2f29672a98cf65c77a31dd5435e538c5cd036d07be52bbbe56f7fdab989753e2' - '8c2655008ecd00d0d37da67604de1888b414042d846aebf4569bd7004b5234fd' - '9cfdb253384e964b9be4aef16ac36f37561e94bb608bbb9bd5549afc1ea5fffa' - '76810324f7da5958e2fc34f9a4498304f81a0d3f4b0522ace2a0eb55e0f24152' - 'e131b2c62e05a182d8e34f878d619673fb2b8047aba76afa31305fbbf1b519a3' - '635e126785ff8190802cbcf4c2627078c6e556b5aa66f0bed9a6a73eaf9d4a59' - '414fe06844458684cc300f0a0c653c5b2e8727918179eff7884c9c0ba5ea473e') +sha256sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a' + 'c758e9ec290052a3ea029f40e5d5cfaadd2135ad7841366393449a4c71d84a88' + 'a0280ed9dd31b2cdffa1c7ae25f9a6cb3a4164c76b7fa07c4e2eaa8cc01e6762' + '9a3c591e2645997a94d30687adfc08f1ea7f64597fef78c777ed7137071de02f' + '1d7fe2ef6be292e9ec84f313e4ba543f1b368a1ee0915f858d54615be93cf794' + '3099b7210a873ee12374d452fb98204d046a2d5c6b1a330d32d45ae59c95cd86' + 'c2a8f4a7536ad0293bdab882d01e0055bc7d4a3e97794f7c304d01d1daa24bf7' + '3b7e90637b3a0671fac0f8607d613bf0f3f9a73cc62e43848049125c7a925a52' + '2e08efe5160c91899ac549303f888c5872e1d198068c5a00c3a34d7040f5410f' + '82764b7047b65a262f7c49305dee6579171a5e179fa85f8801d121e03937576e' + '27dd7df0721e8d4d3f4f4c30c8e9ca8793f50a04f983b3489ff1227aae996f43' + '4f0754277a14bdd8682b5d3701871f8901d2dd9f00ef8318bf6d62e9d4a26171' + 'd4b3fb742c973119d1c98a34063fcc29861fa6325481a8baf5dfac13c32db597' + 'd70ce95ddaa3dac7bdf273c3a8926df6b41771d75f17c68e205a1b9bb80a77e1' + '0366353ce1e4da4e800be55b457d649b0c3e6ba83a2d53dc8c6e3e08dd82637f' + '4632228567fd25ffb75de6750120c0ceea1d2c4ce2e91ef214a39b54ee7b56fc' + 'ab79617e34dbc8bcefb63f0ff59a3efc5da2d313284aa3e690f8c6025a9cb090' + 'b4f68710feda5c11dc2c3b4fdc755bb2186599046a8443c6f61ff9d369357193' + 'a4656c1d3ec12ad50b2c92382775619d435e49a392bb08be5cbc8a654248f3dd' + '36e3520481ef8d58e7595195c0eb230df80034590c27622836a38199abf7721c' + '640ac515c0453def45cdaf2d5813d1ae95ce953014aeacb78cb1747fa2c0da3e' + '612b95a477b9956e61ac1557c0e885a7dd2ae0aa56ef69e29116cafcbc7b0d50' + '2bfb7e8400b0e14b5e8c14413d67b9fa437fe920fa9ffc458f769ea22b2bed29' + '26473b4a55ce4b764354ff54b40a6dcc6d93aea41b7175afeb1a030cb118f3a8' + '98058d1696ff05af14d10017062d697839736cf8cfef94ac77d6cefb6c46f311' + '30d2cf6c309c4922ebc4a5822aab76161950f7036666dc18489da22315ef214d' + '692c3e1679aa82c6aa395d75a06f02f0d1a0b05230197ef19fe4ef7c7b3b888e' + 'c285e9900a63d67a01accd6d7a798c5f2476e90f3d8ea8ffb0f272d90d942141' + 'fbd28eeed43e451240c52582f675e5f5ba069450ee20488bf993b33e76e8275c' + '1709f452c4986f6b7366412bc906b52e4a01d412e20d3fda561b7fa090ed8890' + '245af9755b5637200ea1d678e0ac1a493ed0fbcb9c25dc2a79c0a5e3c007a19a' + '810255e443f940b57e90f4934e4317c050d3edf3593cd0a30c1e2b5a35cf7f68') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -327,6 +327,7 @@ package() { "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5FontDatabaseSupport" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5PlatformCompositorSupport" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5ThemeSupport" \ + "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5OpenGLExtensions*" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5WindowsUIAutomationSupport" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5VulkanSupport" \ "${pkgdir}/usr/${_arch}/lib/cmake/StaticQt5Bootstrap" \ diff --git a/qt5-base/mingw-w64/qtbase-sha256.txt b/qt5-base/mingw-w64/qtbase-sha256.txt index 8105d678..4b5ee578 100644 --- a/qt5-base/mingw-w64/qtbase-sha256.txt +++ b/qt5-base/mingw-w64/qtbase-sha256.txt @@ -1 +1 @@ -d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7 +48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a diff --git a/qt5-charts/mingw-w64/PKGBUILD b/qt5-charts/mingw-w64/PKGBUILD index e1d16de1..54653707 100644 --- a/qt5-charts/mingw-w64/PKGBUILD +++ b/qt5-charts/mingw-w64/PKGBUILD @@ -12,7 +12,7 @@ _qt_module=qtcharts pkgname=mingw-w64-qt5-charts -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Provides a set of easy to use chart components (mingw-w64)" @@ -25,7 +25,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=('3dd7466c06130ec3a7842189a203a72576e7ed5424950903410fa1a4f70d9c2b') +sha256sums=('adb25203ea748d886cc3d8993c20def702115eccea311594592058134ba83bb7') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-charts/mingw-w64/PKGBUILD.sh.ep b/qt5-charts/mingw-w64/PKGBUILD.sh.ep index 7b145393..0d25e198 100644 --- a/qt5-charts/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-charts/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt5-module'; \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Provides a set of easy to use chart components (mingw-w64)" diff --git a/qt5-charts/mingw-w64/qtcharts-sha256.txt b/qt5-charts/mingw-w64/qtcharts-sha256.txt index 26a0fda8..0188e805 100644 --- a/qt5-charts/mingw-w64/qtcharts-sha256.txt +++ b/qt5-charts/mingw-w64/qtcharts-sha256.txt @@ -1 +1 @@ -3dd7466c06130ec3a7842189a203a72576e7ed5424950903410fa1a4f70d9c2b +adb25203ea748d886cc3d8993c20def702115eccea311594592058134ba83bb7 diff --git a/qt5-connectivity/mingw-w64/0001-Fix-case-of-setupapi.h-for-mingw-w64.patch b/qt5-connectivity/mingw-w64/0001-Fix-case-of-setupapi.h-for-mingw-w64.patch deleted file mode 100644 index 02e348f7..00000000 --- a/qt5-connectivity/mingw-w64/0001-Fix-case-of-setupapi.h-for-mingw-w64.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7c08a83848ab4102d2ec4a98c503c7ace26e3e24 Mon Sep 17 00:00:00 2001 -From: Martchus -Date: Tue, 24 Dec 2019 13:06:11 +0100 -Subject: [PATCH] Fix case of setupapi.h for mingw-w64 - ---- - src/bluetooth/qlowenergycontroller_win.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/bluetooth/qlowenergycontroller_win.cpp b/src/bluetooth/qlowenergycontroller_win.cpp -index ced69685..7a30be9a 100644 ---- a/src/bluetooth/qlowenergycontroller_win.cpp -+++ b/src/bluetooth/qlowenergycontroller_win.cpp -@@ -51,7 +51,7 @@ - - #include // for std::max - --#include -+#include - - QT_BEGIN_NAMESPACE - --- -2.25.0 - diff --git a/qt5-connectivity/mingw-w64/PKGBUILD b/qt5-connectivity/mingw-w64/PKGBUILD index ff1649e0..b7fcec7d 100644 --- a/qt5-connectivity/mingw-w64/PKGBUILD +++ b/qt5-connectivity/mingw-w64/PKGBUILD @@ -7,14 +7,12 @@ # Do not edit it manually! See README.md in the repository's root directory # for more information. -# All patches are managed at https://github.com/Martchus/qtconnectivity - # Includes dynamic and static versions; if only one version is requried, just # set $NO_STATIC_LIBS or $NO_SHARED_LIBS. _qt_module=qtconnectivity pkgname=mingw-w64-qt5-connectivity -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Provides access to Bluetooth hardware (mingw-w64)" @@ -25,10 +23,8 @@ options=('!strip' '!buildflags' 'staticlibs') 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" - '0001-Fix-case-of-setupapi.h-for-mingw-w64.patch') -sha256sums=('ef0cb1883c0e765cacf6c8b9422997b93fd861cf2289e56791615401eefa2d72' - 'f78533cd673d15d81b8ab136c892d7e1b61569bb84b48b27345dfa8d6dc3123b') +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +sha256sums=('abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' @@ -39,15 +35,6 @@ _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_SHARED_LIBS ]] || \ _configurations+=('CONFIG+=actually_a_shared_build CONFIG+=shared') -prepare() { - cd "${srcdir}/${_pkgfqn}" - - # apply patches; further descriptions can be found in patch files itself - for patch in "$srcdir/"*.patch; do - patch -p1 -i "$patch" - done -} - build() { cd "${srcdir}/${_pkgfqn}" diff --git a/qt5-connectivity/mingw-w64/PKGBUILD.sh.ep b/qt5-connectivity/mingw-w64/PKGBUILD.sh.ep index 0a9838db..a8ebb6b4 100644 --- a/qt5-connectivity/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-connectivity/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt5-module'; \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Provides access to Bluetooth hardware (mingw-w64)" diff --git a/qt5-connectivity/mingw-w64/qtconnectivity-sha256.txt b/qt5-connectivity/mingw-w64/qtconnectivity-sha256.txt index 5aa118ad..05f08643 100644 --- a/qt5-connectivity/mingw-w64/qtconnectivity-sha256.txt +++ b/qt5-connectivity/mingw-w64/qtconnectivity-sha256.txt @@ -1 +1 @@ -ef0cb1883c0e765cacf6c8b9422997b93fd861cf2289e56791615401eefa2d72 +abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28 diff --git a/qt5-datavis3d/mingw-w64/PKGBUILD b/qt5-datavis3d/mingw-w64/PKGBUILD index 184edf10..6137de6f 100644 --- a/qt5-datavis3d/mingw-w64/PKGBUILD +++ b/qt5-datavis3d/mingw-w64/PKGBUILD @@ -12,7 +12,7 @@ _qt_module=qtdatavis3d pkgname=mingw-w64-qt5-datavis3d -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Qt Data Visualization module (mingw-w64)" @@ -25,7 +25,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=('cfb94803a88c7405abf78ac445c4603b614889504fbf5279c9c192451a378f96') +sha256sums=('723c03db2d2805b1be4ca534ac7bc867a1a21894d33a7e9261a382f3fa9d0e20') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-datavis3d/mingw-w64/PKGBUILD.sh.ep b/qt5-datavis3d/mingw-w64/PKGBUILD.sh.ep index 333673af..21a1133a 100644 --- a/qt5-datavis3d/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-datavis3d/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt5-module'; \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Qt Data Visualization module (mingw-w64)" diff --git a/qt5-datavis3d/mingw-w64/qtdatavis3d-sha256.txt b/qt5-datavis3d/mingw-w64/qtdatavis3d-sha256.txt index f05ca799..623d7906 100644 --- a/qt5-datavis3d/mingw-w64/qtdatavis3d-sha256.txt +++ b/qt5-datavis3d/mingw-w64/qtdatavis3d-sha256.txt @@ -1 +1 @@ -cfb94803a88c7405abf78ac445c4603b614889504fbf5279c9c192451a378f96 +723c03db2d2805b1be4ca534ac7bc867a1a21894d33a7e9261a382f3fa9d0e20 diff --git a/qt5-declarative/apple-darwin/PKGBUILD b/qt5-declarative/apple-darwin/PKGBUILD index e175b135..a6903c18 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.14.1 +pkgver=5.14.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Classes for QML and JavaScript languages (apple-darwin)" diff --git a/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch b/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch index c3f9a849..308c2da6 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 @@ -18,5 +18,5 @@ index 9ddb9885cd..9775d85e08 100644 foreach(_other_plugin ${_qt5qml_other_plugins}) include(${_other_plugin} OPTIONAL) -- -2.25.0 +2.26.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 116f1f25..86df31e0 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 @@ -33,5 +33,5 @@ index bf8155c6ec..2bfa230bcc 100644 # define QML_PARSER_EXPORT # elif defined(QT_BUILD_QML_LIB) -- -2.25.0 +2.26.0 diff --git a/qt5-declarative/mingw-w64/PKGBUILD b/qt5-declarative/mingw-w64/PKGBUILD index 96cb553e..128f2c7d 100755 --- a/qt5-declarative/mingw-w64/PKGBUILD +++ b/qt5-declarative/mingw-w64/PKGBUILD @@ -17,7 +17,7 @@ _qt_module=qtdeclarative pkgname=mingw-w64-qt5-declarative -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Classes for QML and JavaScript languages (mingw-w64)' @@ -31,9 +31,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=('762fe495d2f97fd70f06dc7d3929506ea3b5e3151ad813e0629209b7bc504c8a' - '81b34580fd40feab6596051674d37fcaafb4cbbe47db8792ae261d8f8ee8ed8f' - '8b6d62ccd68bc955908983162c24ef4688c6f3c44c4678b41e8b0b7e58467935') +sha256sums=('a3c4617adc9760347c93d2eb6c25d22f620cd22f44afa0494eb499a805831650' + 'ee3ce91b18ff2beb650d56fd84bbeb1b22baee784aa56bfa81db64397a81b7ae' + '732f560982d87c890f2da859bc24116b9f3061bc0ec227ab201e449d34aedda7') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-declarative/mingw-w64/PKGBUILD.sh.ep b/qt5-declarative/mingw-w64/PKGBUILD.sh.ep index 6376996f..aad6b3fd 100644 --- a/qt5-declarative/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-declarative/mingw-w64/PKGBUILD.sh.ep @@ -6,7 +6,7 @@ # Contributor: ohmyarch % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Classes for QML and JavaScript languages (mingw-w64)' diff --git a/qt5-declarative/mingw-w64/qtdeclarative-sha256.txt b/qt5-declarative/mingw-w64/qtdeclarative-sha256.txt index b851e941..2ed54c12 100644 --- a/qt5-declarative/mingw-w64/qtdeclarative-sha256.txt +++ b/qt5-declarative/mingw-w64/qtdeclarative-sha256.txt @@ -1 +1 @@ -762fe495d2f97fd70f06dc7d3929506ea3b5e3151ad813e0629209b7bc504c8a +a3c4617adc9760347c93d2eb6c25d22f620cd22f44afa0494eb499a805831650 diff --git a/qt5-gamepad/mingw-w64/PKGBUILD b/qt5-gamepad/mingw-w64/PKGBUILD index 48e8c860..0e39b1af 100644 --- a/qt5-gamepad/mingw-w64/PKGBUILD +++ b/qt5-gamepad/mingw-w64/PKGBUILD @@ -12,7 +12,7 @@ _qt_module=qtgamepad pkgname=mingw-w64-qt5-gamepad -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Adds support for getting events from gamepad devices (mingw-w64)" @@ -25,7 +25,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=('13277d7362ebe912b55e233674bc862e4b5342705c9207bd16c83f107d0e3499') +sha256sums=('f77daadb4755cf760e11812264259fb103396fd1b06df1e06b5df162081c8d03') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-gamepad/mingw-w64/PKGBUILD.sh.ep b/qt5-gamepad/mingw-w64/PKGBUILD.sh.ep index d7824cab..3c7a41dd 100644 --- a/qt5-gamepad/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-gamepad/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt5-module'; \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Adds support for getting events from gamepad devices (mingw-w64)" diff --git a/qt5-gamepad/mingw-w64/qtgamepad-sha256.txt b/qt5-gamepad/mingw-w64/qtgamepad-sha256.txt index 53820d39..069938d8 100644 --- a/qt5-gamepad/mingw-w64/qtgamepad-sha256.txt +++ b/qt5-gamepad/mingw-w64/qtgamepad-sha256.txt @@ -1 +1 @@ -13277d7362ebe912b55e233674bc862e4b5342705c9207bd16c83f107d0e3499 +f77daadb4755cf760e11812264259fb103396fd1b06df1e06b5df162081c8d03 diff --git a/qt5-graphicaleffects/mingw-w64/PKGBUILD b/qt5-graphicaleffects/mingw-w64/PKGBUILD index 286b83ea..a92b6136 100644 --- a/qt5-graphicaleffects/mingw-w64/PKGBUILD +++ b/qt5-graphicaleffects/mingw-w64/PKGBUILD @@ -14,7 +14,7 @@ _qt_module=qtgraphicaleffects pkgname=mingw-w64-qt5-graphicaleffects -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Graphical effects for use with Qt Quick 2 (mingw-w64)" @@ -26,7 +26,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=('aabb87d9f982a8cb213de06b954cef29551f2d9ce10afa0ff9e5571203b56138') +sha256sums=('487a7f858244a08264363733055a8cf8b00e77c658c5608cc462817d15e4b50f') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-graphicaleffects/mingw-w64/PKGBUILD.sh.ep b/qt5-graphicaleffects/mingw-w64/PKGBUILD.sh.ep index 417a9574..ab4e6d71 100644 --- a/qt5-graphicaleffects/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-graphicaleffects/mingw-w64/PKGBUILD.sh.ep @@ -5,7 +5,7 @@ # Contributor: Filip Brcic % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Graphical effects for use with Qt Quick 2 (mingw-w64)" diff --git a/qt5-graphicaleffects/mingw-w64/qtgraphicaleffects-sha256.txt b/qt5-graphicaleffects/mingw-w64/qtgraphicaleffects-sha256.txt index a1db1cb9..b7fffd4b 100644 --- a/qt5-graphicaleffects/mingw-w64/qtgraphicaleffects-sha256.txt +++ b/qt5-graphicaleffects/mingw-w64/qtgraphicaleffects-sha256.txt @@ -1 +1 @@ -aabb87d9f982a8cb213de06b954cef29551f2d9ce10afa0ff9e5571203b56138 +487a7f858244a08264363733055a8cf8b00e77c658c5608cc462817d15e4b50f diff --git a/qt5-imageformats/apple-darwin/PKGBUILD b/qt5-imageformats/apple-darwin/PKGBUILD index 383a50cb..c5f57555 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.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (apple-darwin)" diff --git a/qt5-imageformats/mingw-w64/PKGBUILD b/qt5-imageformats/mingw-w64/PKGBUILD index a6fa2aa4..a6634bd5 100644 --- a/qt5-imageformats/mingw-w64/PKGBUILD +++ b/qt5-imageformats/mingw-w64/PKGBUILD @@ -14,7 +14,7 @@ _qt_module=qtimageformats pkgname=mingw-w64-qt5-imageformats -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)" @@ -30,7 +30,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=('b8b177ea68df3a99f45740cb3193e3b38738c5e2b272028445bd31a4305c8e5e') +sha256sums=('733eca0165c15e046b106039c989dac7f6bc2ecf215396d965ed065369264f8c') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-imageformats/mingw-w64/PKGBUILD.sh.ep b/qt5-imageformats/mingw-w64/PKGBUILD.sh.ep index dff00855..12b39fc9 100644 --- a/qt5-imageformats/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-imageformats/mingw-w64/PKGBUILD.sh.ep @@ -5,7 +5,7 @@ # Contributor: Filip Brcic % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)" diff --git a/qt5-imageformats/mingw-w64/qtimageformats-sha256.txt b/qt5-imageformats/mingw-w64/qtimageformats-sha256.txt index 3c541116..f969e095 100644 --- a/qt5-imageformats/mingw-w64/qtimageformats-sha256.txt +++ b/qt5-imageformats/mingw-w64/qtimageformats-sha256.txt @@ -1 +1 @@ -b8b177ea68df3a99f45740cb3193e3b38738c5e2b272028445bd31a4305c8e5e +733eca0165c15e046b106039c989dac7f6bc2ecf215396d965ed065369264f8c 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 cbe90c57..0c0e9a59 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 @@ -23,5 +23,5 @@ index 40605806..fa82a012 100644 plugin.json \ qmldir -- -2.25.0 +2.26.0 diff --git a/qt5-location/mingw-w64/PKGBUILD b/qt5-location/mingw-w64/PKGBUILD index 7f248314..3b03e9dc 100644 --- a/qt5-location/mingw-w64/PKGBUILD +++ b/qt5-location/mingw-w64/PKGBUILD @@ -13,14 +13,14 @@ # Includes dynamic and static versions; if only one version is requried, just # set $NO_STATIC_LIBS or $NO_SHARED_LIBS. -# Skip building mapboxgl as it increases compile time significantly and -# likely not a lot of people actually using it; if you need it, just remove the -# following line: -_additional_qmake_args+='QT.global.disabled_features+=geoservices_mapboxgl' +# Skip building mapbox and mapboxgl; that decreases the compile time significantly and +# likely not a lot of people actually using it; if you need it, just remove the corresponding +# qmake flags: +_additional_qmake_args+='-- -no-feature-geoservices_mapbox -no-feature-geoservices_mapboxgl' _qt_module=qtlocation pkgname=mingw-w64-qt5-location -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc='Provides access to position, satellite and area monitoring classes (mingw-w64)' @@ -33,8 +33,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=('a0dd1712a5b7a0425b57d17318294b6f7e968c4b81d52048696d029b04d2f12f' - '5180fad65717eca47134e8019ada8f8f5e755df59c854568af35d0d5395d11b0') +sha256sums=('c37708bc396f6dac397b49a6a268d5edb39e1c8296ca2337ce9e80bde04775cc' + '3bd42653817aa67bc4202848628e9b01cd03356d588745734da6c54dad61ccd2') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-location/mingw-w64/PKGBUILD.sh.ep b/qt5-location/mingw-w64/PKGBUILD.sh.ep index e929358a..52eb15dd 100644 --- a/qt5-location/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-location/mingw-w64/PKGBUILD.sh.ep @@ -5,14 +5,14 @@ % end \ % content_for comment_header => begin -# Skip building mapboxgl as it increases compile time significantly and -# likely not a lot of people actually using it; if you need it, just remove the -# following line: -_additional_qmake_args+='QT.global.disabled_features+=geoservices_mapboxgl' +# Skip building mapbox and mapboxgl; that decreases the compile time significantly and +# likely not a lot of people actually using it; if you need it, just remove the corresponding +# qmake flags: +_additional_qmake_args+='-- -no-feature-geoservices_mapbox -no-feature-geoservices_mapboxgl' % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc='Provides access to position, satellite and area monitoring classes (mingw-w64)' diff --git a/qt5-location/mingw-w64/qtlocation-sha256.txt b/qt5-location/mingw-w64/qtlocation-sha256.txt index d181d816..b7b7b65b 100644 --- a/qt5-location/mingw-w64/qtlocation-sha256.txt +++ b/qt5-location/mingw-w64/qtlocation-sha256.txt @@ -1 +1 @@ -a0dd1712a5b7a0425b57d17318294b6f7e968c4b81d52048696d029b04d2f12f +c37708bc396f6dac397b49a6a268d5edb39e1c8296ca2337ce9e80bde04775cc 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 3669437f..f28eb1b3 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 @@ -37,5 +37,5 @@ index 12693e4f..f759a8f2 100644 QT_BEGIN_NAMESPACE -- -2.25.0 +2.26.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 26d83fbe..67f24817 100644 --- a/qt5-multimedia/mingw-w64/0002-Fix-build-with-ANGLE.patch +++ b/qt5-multimedia/mingw-w64/0002-Fix-build-with-ANGLE.patch @@ -25,5 +25,5 @@ index d8e2da6d..41ef4d96 100644 #endif -- -2.25.0 +2.26.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 210110aa..90bc6142 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 @@ -28,5 +28,5 @@ index 27bb3abb..5aa207dd 100644 SOURCES += dsserviceplugin.cpp -- -2.25.0 +2.26.0 diff --git a/qt5-multimedia/mingw-w64/0004-Fix-case-of-header-file-includes-for-building-with-m.patch b/qt5-multimedia/mingw-w64/0004-Fix-case-of-header-file-includes-for-building-with-m.patch index 42b388fd..2717b71a 100644 --- a/qt5-multimedia/mingw-w64/0004-Fix-case-of-header-file-includes-for-building-with-m.patch +++ b/qt5-multimedia/mingw-w64/0004-Fix-case-of-header-file-includes-for-building-with-m.patch @@ -93,5 +93,5 @@ index c6f4e856..15ef6f0a 100644 #include #include -- -2.25.0 +2.26.0 diff --git a/qt5-multimedia/mingw-w64/PKGBUILD b/qt5-multimedia/mingw-w64/PKGBUILD index c502aa35..ed7380a4 100644 --- a/qt5-multimedia/mingw-w64/PKGBUILD +++ b/qt5-multimedia/mingw-w64/PKGBUILD @@ -15,7 +15,7 @@ _qt_module=qtmultimedia pkgname=mingw-w64-qt5-multimedia -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)' @@ -31,11 +31,11 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0002-Fix-build-with-ANGLE.patch' '0003-Link-directshow-plugin-against-libamstrmid.patch' '0004-Fix-case-of-header-file-includes-for-building-with-m.patch') -sha256sums=('c458121c8db7ff77eefe643a7c9847ff324647f2603bb5664bcafa6435edeae7' - '868eee99997f42ea69f1fd58938b447be77a20b3e210f6b4a2e547666f5e8456' - 'c47b93ba7de47f0a67c7a200b1d9d36b7aefa507c5a8f2fb510cc69545fd3a7b' - 'e35c8f9877b2ade5c650ca79e56b527db30dcfc39048f2694e4da25281f530a0' - 'a008984f200628a3a58bcde1c95247b578af77d0abcab242f2a16f46db23e911') +sha256sums=('7acd8ede6835314206e407b35b668f0add67544577fb51fe67afb03137fb9fe9' + '99ef1ba681ad5db2e5f3ae3f83de7e25a63e6885befd236b0381f1940a464dab' + '72da977e5489d04fc5396cb25f3d56b0dd8bfd5b6ea543d06ba18bc1bb5bfdcb' + '9222eec2ae3f4d3e007c99ed6dfe5852cc98e797e1c7c78583ed1b2f9eab3919' + 'ab81776ff0f05f45c8c265af92ef167aebd3e1ae3ee41a715163838e0f18523b') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-multimedia/mingw-w64/PKGBUILD.sh.ep b/qt5-multimedia/mingw-w64/PKGBUILD.sh.ep index 40584ca7..3c7561fd 100644 --- a/qt5-multimedia/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-multimedia/mingw-w64/PKGBUILD.sh.ep @@ -4,7 +4,7 @@ # Contributor: ant32 % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)' diff --git a/qt5-multimedia/mingw-w64/qtmultimedia-sha256.txt b/qt5-multimedia/mingw-w64/qtmultimedia-sha256.txt index 9f75822e..99e7d12d 100644 --- a/qt5-multimedia/mingw-w64/qtmultimedia-sha256.txt +++ b/qt5-multimedia/mingw-w64/qtmultimedia-sha256.txt @@ -1 +1 @@ -c458121c8db7ff77eefe643a7c9847ff324647f2603bb5664bcafa6435edeae7 +7acd8ede6835314206e407b35b668f0add67544577fb51fe67afb03137fb9fe9 diff --git a/qt5-networkauth/mingw-w64/PKGBUILD b/qt5-networkauth/mingw-w64/PKGBUILD index 4546abdf..a7637dca 100644 --- a/qt5-networkauth/mingw-w64/PKGBUILD +++ b/qt5-networkauth/mingw-w64/PKGBUILD @@ -13,7 +13,7 @@ _qt_module=qtnetworkauth pkgname=mingw-w64-qt5-networkauth -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Network authentication module (mingw-w64)" @@ -26,7 +26,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=('e7f9705d014056a0d8a9751e7ad4b472f1184b8ef822124f0363753730536ae0') +sha256sums=('4f00513dd18598487d02187b80b54c669662cf8a8f2573858c7f9282d7b9265e') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-networkauth/mingw-w64/PKGBUILD.sh.ep b/qt5-networkauth/mingw-w64/PKGBUILD.sh.ep index dcb8d37d..9b637636 100644 --- a/qt5-networkauth/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-networkauth/mingw-w64/PKGBUILD.sh.ep @@ -4,7 +4,7 @@ # Contributor: ant32 % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Network authentication module (mingw-w64)" diff --git a/qt5-networkauth/mingw-w64/qtnetworkauth-sha256.txt b/qt5-networkauth/mingw-w64/qtnetworkauth-sha256.txt index bc49e70d..3a43fb68 100644 --- a/qt5-networkauth/mingw-w64/qtnetworkauth-sha256.txt +++ b/qt5-networkauth/mingw-w64/qtnetworkauth-sha256.txt @@ -1 +1 @@ -e7f9705d014056a0d8a9751e7ad4b472f1184b8ef822124f0363753730536ae0 +4f00513dd18598487d02187b80b54c669662cf8a8f2573858c7f9282d7b9265e diff --git a/qt5-quickcontrols/mingw-w64/PKGBUILD b/qt5-quickcontrols/mingw-w64/PKGBUILD index 3bc419b0..692f9adf 100644 --- a/qt5-quickcontrols/mingw-w64/PKGBUILD +++ b/qt5-quickcontrols/mingw-w64/PKGBUILD @@ -14,7 +14,7 @@ _qt_module=qtquickcontrols pkgname=mingw-w64-qt5-quickcontrols -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)" @@ -26,7 +26,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=('54519e7c6748bb9af46435a7ba2ce1c53e4ad164a70e88915fe0e61277540a1a') +sha256sums=('d55def1dd4ee1250bd6a4e76849f4e362368b6411c2216d5f669c761216d4461') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-quickcontrols/mingw-w64/PKGBUILD.sh.ep b/qt5-quickcontrols/mingw-w64/PKGBUILD.sh.ep index d4432e10..d88cdabb 100644 --- a/qt5-quickcontrols/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-quickcontrols/mingw-w64/PKGBUILD.sh.ep @@ -5,7 +5,7 @@ # Contributor: Filip Brcic % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)" diff --git a/qt5-quickcontrols/mingw-w64/qtquickcontrols-sha256.txt b/qt5-quickcontrols/mingw-w64/qtquickcontrols-sha256.txt index a6b25535..5d2cba95 100644 --- a/qt5-quickcontrols/mingw-w64/qtquickcontrols-sha256.txt +++ b/qt5-quickcontrols/mingw-w64/qtquickcontrols-sha256.txt @@ -1 +1 @@ -54519e7c6748bb9af46435a7ba2ce1c53e4ad164a70e88915fe0e61277540a1a +d55def1dd4ee1250bd6a4e76849f4e362368b6411c2216d5f669c761216d4461 diff --git a/qt5-quickcontrols2/mingw-w64/PKGBUILD b/qt5-quickcontrols2/mingw-w64/PKGBUILD index 473c07fe..c8acaed6 100644 --- a/qt5-quickcontrols2/mingw-w64/PKGBUILD +++ b/qt5-quickcontrols2/mingw-w64/PKGBUILD @@ -14,7 +14,7 @@ _qt_module=qtquickcontrols2 pkgname=mingw-w64-qt5-quickcontrols2 -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)" @@ -26,7 +26,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=('52d652c48933cc8416a91138eb6fb4c31625734265671f286b6c0d3e27d120ae') +sha256sums=('faf7d349d8f4a8db36cd3c62a5724bcf689300f2fdb7dc1ea034392aab981560') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-quickcontrols2/mingw-w64/PKGBUILD.sh.ep b/qt5-quickcontrols2/mingw-w64/PKGBUILD.sh.ep index d4432e10..d88cdabb 100644 --- a/qt5-quickcontrols2/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-quickcontrols2/mingw-w64/PKGBUILD.sh.ep @@ -5,7 +5,7 @@ # Contributor: Filip Brcic % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)" diff --git a/qt5-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt b/qt5-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt index 22013faa..1a7a20fa 100644 --- a/qt5-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt +++ b/qt5-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt @@ -1 +1 @@ -52d652c48933cc8416a91138eb6fb4c31625734265671f286b6c0d3e27d120ae +faf7d349d8f4a8db36cd3c62a5724bcf689300f2fdb7dc1ea034392aab981560 diff --git a/qt5-remoteobjects/mingw-w64/PKGBUILD b/qt5-remoteobjects/mingw-w64/PKGBUILD index e21b726e..d97b5edc 100644 --- a/qt5-remoteobjects/mingw-w64/PKGBUILD +++ b/qt5-remoteobjects/mingw-w64/PKGBUILD @@ -12,7 +12,7 @@ _qt_module=qtremoteobjects pkgname=mingw-w64-qt5-remoteobjects -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Inter-process communication (IPC) module developed for Qt (mingw-w64)" @@ -25,7 +25,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=('189c8bddaebde0420742af0d85b7e7bf00c558f030bc0a7b704ce86072706e75') +sha256sums=('a6a601c4f4aab6fe41a462dae57033819f697e3317240a382cee45c08be614d6') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-remoteobjects/mingw-w64/PKGBUILD.sh.ep b/qt5-remoteobjects/mingw-w64/PKGBUILD.sh.ep index ece820d9..b981b2b9 100644 --- a/qt5-remoteobjects/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-remoteobjects/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt5-module'; \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Inter-process communication (IPC) module developed for Qt (mingw-w64)" diff --git a/qt5-remoteobjects/mingw-w64/qtremoteobjects-sha256.txt b/qt5-remoteobjects/mingw-w64/qtremoteobjects-sha256.txt index 026bd288..d4ed75b4 100644 --- a/qt5-remoteobjects/mingw-w64/qtremoteobjects-sha256.txt +++ b/qt5-remoteobjects/mingw-w64/qtremoteobjects-sha256.txt @@ -1 +1 @@ -189c8bddaebde0420742af0d85b7e7bf00c558f030bc0a7b704ce86072706e75 +a6a601c4f4aab6fe41a462dae57033819f697e3317240a382cee45c08be614d6 diff --git a/qt5-script/mingw-w64/PKGBUILD b/qt5-script/mingw-w64/PKGBUILD index 93b4673c..3a796330 100644 --- a/qt5-script/mingw-w64/PKGBUILD +++ b/qt5-script/mingw-w64/PKGBUILD @@ -14,7 +14,7 @@ _qt_module=qtscript pkgname=mingw-w64-qt5-script -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility (mingw-w64)" @@ -28,7 +28,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=('d8071e665935f7f6733f5ef700054a0cbbf8b569e7900439b89d3301f70adadd') +sha256sums=('e9fd487ccb3cbf00e86b0b803aa79e9f6bbe7a337b8e97d069e040c3e0789bfe') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-script/mingw-w64/PKGBUILD.sh.ep b/qt5-script/mingw-w64/PKGBUILD.sh.ep index b174597b..20c9861e 100644 --- a/qt5-script/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-script/mingw-w64/PKGBUILD.sh.ep @@ -5,7 +5,7 @@ # Contributor: Filip Brcic % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility (mingw-w64)" diff --git a/qt5-script/mingw-w64/qtscript-sha256.txt b/qt5-script/mingw-w64/qtscript-sha256.txt index 40637f44..5ed858af 100644 --- a/qt5-script/mingw-w64/qtscript-sha256.txt +++ b/qt5-script/mingw-w64/qtscript-sha256.txt @@ -1 +1 @@ -d8071e665935f7f6733f5ef700054a0cbbf8b569e7900439b89d3301f70adadd +e9fd487ccb3cbf00e86b0b803aa79e9f6bbe7a337b8e97d069e040c3e0789bfe diff --git a/qt5-scxml/mingw-w64/PKGBUILD b/qt5-scxml/mingw-w64/PKGBUILD index d4f3d5f5..d8f13186 100644 --- a/qt5-scxml/mingw-w64/PKGBUILD +++ b/qt5-scxml/mingw-w64/PKGBUILD @@ -12,7 +12,7 @@ _qt_module=qtscxml pkgname=mingw-w64-qt5-scxml -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Static and runtime integration of SCXML models into Qt code (mingw-w64)" @@ -24,7 +24,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=('6dbcf012cc11931050c8d9422cbf478ee173dfb0c5b8aebf0f829b6f74d741aa') +sha256sums=('030cea352a56074f577200f967ef37c959b2767127de61f766f59b0d99763790') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-scxml/mingw-w64/PKGBUILD.sh.ep b/qt5-scxml/mingw-w64/PKGBUILD.sh.ep index 15b76779..be001a40 100644 --- a/qt5-scxml/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-scxml/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt5-module'; \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Static and runtime integration of SCXML models into Qt code (mingw-w64)" diff --git a/qt5-scxml/mingw-w64/qtscxml-sha256.txt b/qt5-scxml/mingw-w64/qtscxml-sha256.txt index e0fe8711..b22319ab 100644 --- a/qt5-scxml/mingw-w64/qtscxml-sha256.txt +++ b/qt5-scxml/mingw-w64/qtscxml-sha256.txt @@ -1 +1 @@ -6dbcf012cc11931050c8d9422cbf478ee173dfb0c5b8aebf0f829b6f74d741aa +030cea352a56074f577200f967ef37c959b2767127de61f766f59b0d99763790 diff --git a/qt5-sensors/mingw-w64/PKGBUILD b/qt5-sensors/mingw-w64/PKGBUILD index c3d92ed6..addebd28 100644 --- a/qt5-sensors/mingw-w64/PKGBUILD +++ b/qt5-sensors/mingw-w64/PKGBUILD @@ -14,7 +14,7 @@ _qt_module=qtsensors pkgname=mingw-w64-qt5-sensors -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Provides access to sensor hardware and motion gesture recognition (mingw-w64)" @@ -26,7 +26,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=('eda3862cf079ac2357553be4faaae0136aa017e954506ca0c4239995b5be214c') +sha256sums=('bccfca6910b0383d8f65823496ff5011abed2fa8fd446b4b27333d0fd7bb8c61') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-sensors/mingw-w64/PKGBUILD.sh.ep b/qt5-sensors/mingw-w64/PKGBUILD.sh.ep index e221709e..f137d76a 100644 --- a/qt5-sensors/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-sensors/mingw-w64/PKGBUILD.sh.ep @@ -5,7 +5,7 @@ # Contributor: Filip Brcic % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Provides access to sensor hardware and motion gesture recognition (mingw-w64)" diff --git a/qt5-sensors/mingw-w64/qtsensors-sha256.txt b/qt5-sensors/mingw-w64/qtsensors-sha256.txt index da77bb7d..a8ecf7b1 100644 --- a/qt5-sensors/mingw-w64/qtsensors-sha256.txt +++ b/qt5-sensors/mingw-w64/qtsensors-sha256.txt @@ -1 +1 @@ -eda3862cf079ac2357553be4faaae0136aa017e954506ca0c4239995b5be214c +bccfca6910b0383d8f65823496ff5011abed2fa8fd446b4b27333d0fd7bb8c61 diff --git a/qt5-serialport/mingw-w64/PKGBUILD b/qt5-serialport/mingw-w64/PKGBUILD index 77aef2e8..2e8f90c2 100644 --- a/qt5-serialport/mingw-w64/PKGBUILD +++ b/qt5-serialport/mingw-w64/PKGBUILD @@ -13,7 +13,7 @@ _qt_module=qtserialport pkgname=mingw-w64-qt5-serialport -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Provides access to hardware and virtual serial ports (mingw-w64)" @@ -25,7 +25,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=('ac7e51e99294998fae8bb3e2feebbd1820ecd774eb9ad8e7ea507f5bd06dcd6f') +sha256sums=('a6d977dd723ad4d3368b5163691405b8852f809974a96ec54103494e834aea21') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-serialport/mingw-w64/PKGBUILD.sh.ep b/qt5-serialport/mingw-w64/PKGBUILD.sh.ep index c4c9dedb..73f8f712 100644 --- a/qt5-serialport/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-serialport/mingw-w64/PKGBUILD.sh.ep @@ -4,7 +4,7 @@ # Contributor: ant32 % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Provides access to hardware and virtual serial ports (mingw-w64)" diff --git a/qt5-serialport/mingw-w64/qtserialport-sha256.txt b/qt5-serialport/mingw-w64/qtserialport-sha256.txt index caf9c0a0..03435287 100644 --- a/qt5-serialport/mingw-w64/qtserialport-sha256.txt +++ b/qt5-serialport/mingw-w64/qtserialport-sha256.txt @@ -1 +1 @@ -ac7e51e99294998fae8bb3e2feebbd1820ecd774eb9ad8e7ea507f5bd06dcd6f +a6d977dd723ad4d3368b5163691405b8852f809974a96ec54103494e834aea21 diff --git a/qt5-speech/mingw-w64/PKGBUILD b/qt5-speech/mingw-w64/PKGBUILD index 7b57381f..8f7dc135 100644 --- a/qt5-speech/mingw-w64/PKGBUILD +++ b/qt5-speech/mingw-w64/PKGBUILD @@ -12,7 +12,7 @@ _qt_module=qtspeech pkgname=mingw-w64-qt5-speech -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Qt module to make text to speech and speech recognition easy (mingw-w64)" @@ -28,7 +28,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=('abd9a1863a64de0a148ae37e5fdecde7fd486348f7b26c054008f8506223e425') +sha256sums=('5e9e8ea62f0207ba894df1e136df0af9fc5443c7817d28c39f0ea2bbae9ec6da') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-speech/mingw-w64/PKGBUILD.sh.ep b/qt5-speech/mingw-w64/PKGBUILD.sh.ep index 0d85d38e..e561ca7e 100644 --- a/qt5-speech/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-speech/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt5-module'; \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Qt module to make text to speech and speech recognition easy (mingw-w64)" diff --git a/qt5-speech/mingw-w64/qtspeech-sha256.txt b/qt5-speech/mingw-w64/qtspeech-sha256.txt index f8d16d9b..6b5a5922 100644 --- a/qt5-speech/mingw-w64/qtspeech-sha256.txt +++ b/qt5-speech/mingw-w64/qtspeech-sha256.txt @@ -1 +1 @@ -abd9a1863a64de0a148ae37e5fdecde7fd486348f7b26c054008f8506223e425 +5e9e8ea62f0207ba894df1e136df0af9fc5443c7817d28c39f0ea2bbae9ec6da diff --git a/qt5-svg/apple-darwin/PKGBUILD b/qt5-svg/apple-darwin/PKGBUILD index 17d4ea3b..a6f8e9dd 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.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Classes for displaying the contents of SVG files (apple-darwin)" diff --git a/qt5-svg/mingw-w64/PKGBUILD b/qt5-svg/mingw-w64/PKGBUILD index 93690688..69697949 100644 --- a/qt5-svg/mingw-w64/PKGBUILD +++ b/qt5-svg/mingw-w64/PKGBUILD @@ -13,7 +13,7 @@ _qt_module=qtsvg pkgname=mingw-w64-qt5-svg -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)" @@ -25,7 +25,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=('8540a57312f815f81a45b891b49959d776727fde17579bb6bf1a537996bc9359') +sha256sums=('c7d7faa01a3e7a6e4d38fafcec5529a488258218749779e6fa0e09a21173b5a1') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-svg/mingw-w64/PKGBUILD.sh.ep b/qt5-svg/mingw-w64/PKGBUILD.sh.ep index 94974ec0..317ffb82 100644 --- a/qt5-svg/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-svg/mingw-w64/PKGBUILD.sh.ep @@ -4,7 +4,7 @@ # Contributor: ant32 % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)" diff --git a/qt5-svg/mingw-w64/qtsvg-sha256.txt b/qt5-svg/mingw-w64/qtsvg-sha256.txt index a1d6e062..1edd4c62 100644 --- a/qt5-svg/mingw-w64/qtsvg-sha256.txt +++ b/qt5-svg/mingw-w64/qtsvg-sha256.txt @@ -1 +1 @@ -8540a57312f815f81a45b891b49959d776727fde17579bb6bf1a537996bc9359 +c7d7faa01a3e7a6e4d38fafcec5529a488258218749779e6fa0e09a21173b5a1 diff --git a/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch b/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch index 20426192..b638cf49 100644 --- a/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch +++ b/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch @@ -38,5 +38,5 @@ index 23beeb39..bf1b0ad6 100644 DEPENDS ${_abs_FILE} VERBATIM ) -- -2.25.0 +2.26.0 diff --git a/qt5-tools/mingw-w64/PKGBUILD b/qt5-tools/mingw-w64/PKGBUILD index b418c817..ada49a1e 100755 --- a/qt5-tools/mingw-w64/PKGBUILD +++ b/qt5-tools/mingw-w64/PKGBUILD @@ -26,7 +26,7 @@ _qt_module=qttools pkgname=mingw-w64-qt5-tools -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)" @@ -39,8 +39,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=('7f5e6370cf4ed59f2bdd6517870cdcb1df9a055bbd885d056d90938ab302c70c' - 'd40cb534f47950c6a7d372e40ed07efede64bf92810a6929372e531549d6d0f0') +sha256sums=('5bb0cf7832b88eb6bc9d4289f98307eb14b16a453ad6cf42cca13c4fe1a053c5' + '3bb3e214211ce334f98b511b74613096cc38a92396dc5944ae58810f32a61eee') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-tools/mingw-w64/PKGBUILD.sh.ep b/qt5-tools/mingw-w64/PKGBUILD.sh.ep index 4c20da7c..6238e362 100644 --- a/qt5-tools/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-tools/mingw-w64/PKGBUILD.sh.ep @@ -18,7 +18,7 @@ % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)" diff --git a/qt5-tools/mingw-w64/qttools-sha256.txt b/qt5-tools/mingw-w64/qttools-sha256.txt index c407bfb7..82a523d1 100644 --- a/qt5-tools/mingw-w64/qttools-sha256.txt +++ b/qt5-tools/mingw-w64/qttools-sha256.txt @@ -1 +1 @@ -7f5e6370cf4ed59f2bdd6517870cdcb1df9a055bbd885d056d90938ab302c70c +5bb0cf7832b88eb6bc9d4289f98307eb14b16a453ad6cf42cca13c4fe1a053c5 diff --git a/qt5-translations/apple-darwin/PKGBUILD b/qt5-translations/apple-darwin/PKGBUILD index 3f16f1bb..6b867ba0 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.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="A cross-platform application and UI framework (translations, apple-darwin)" diff --git a/qt5-translations/mingw-w64/PKGBUILD b/qt5-translations/mingw-w64/PKGBUILD index a69ec08a..bf4b380a 100644 --- a/qt5-translations/mingw-w64/PKGBUILD +++ b/qt5-translations/mingw-w64/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qttranslations pkgname=mingw-w64-qt5-translations -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="A cross-platform application and UI framework (translations, 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=('a7598068802f4ddda99865ea9c3503015d02ed1e1ff5875e936b42ab8eb2de46') +sha256sums=('2088ebee9f5dd0336c9fd11436899a95b7ce0141ce072290de1e8f315d82d1a6') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-translations/mingw-w64/PKGBUILD.sh.ep b/qt5-translations/mingw-w64/PKGBUILD.sh.ep index 0683bc3f..ffc6c42a 100644 --- a/qt5-translations/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-translations/mingw-w64/PKGBUILD.sh.ep @@ -5,7 +5,7 @@ # Contributor: Filip Brcic % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="A cross-platform application and UI framework (translations, mingw-w64)" diff --git a/qt5-translations/mingw-w64/qttranslations-sha256.txt b/qt5-translations/mingw-w64/qttranslations-sha256.txt index 2f35d1a3..6e2c8324 100644 --- a/qt5-translations/mingw-w64/qttranslations-sha256.txt +++ b/qt5-translations/mingw-w64/qttranslations-sha256.txt @@ -1 +1 @@ -a7598068802f4ddda99865ea9c3503015d02ed1e1ff5875e936b42ab8eb2de46 +2088ebee9f5dd0336c9fd11436899a95b7ce0141ce072290de1e8f315d82d1a6 diff --git a/qt5-virtualkeyboard/mingw-w64/PKGBUILD b/qt5-virtualkeyboard/mingw-w64/PKGBUILD index a4ab4ff9..3a3e4cf8 100644 --- a/qt5-virtualkeyboard/mingw-w64/PKGBUILD +++ b/qt5-virtualkeyboard/mingw-w64/PKGBUILD @@ -14,7 +14,7 @@ _qt_module=qtvirtualkeyboard pkgname=mingw-w64-qt5-virtualkeyboard #_fix_deps_of_static_3rdparty_libs='s:\(-L\/.*\/lib.*\.a\) \(\/.*\/libqt\)\(openwnn\|pinyin\|tcime\)\(d*\.a\)\(.*\):\2\3\4 \1 \5:g' # -L is used (pre Qt 5.13) _fix_deps_of_static_3rdparty_libs='s:\(LIBS *= *\)\(.*\)\(\/build\/.*\/libqt\)\(openwnn\|pinyin\|tcime\)\(d*\.a\)\(.*\):\1 \3\4\5 \2 \6:g' # absolute paths are used (Qt 5.13 and above) -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Virtual keyboard framework (translations, mingw-w64)" @@ -26,7 +26,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=('277baaf6043328d06585c7a9046461308aa7602b21f531bcda12e6df5bce5295') +sha256sums=('364f3338563e617e7c964a37170b415b546c5f82965e781271f9dada3e3868d7') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-virtualkeyboard/mingw-w64/PKGBUILD.sh.ep b/qt5-virtualkeyboard/mingw-w64/PKGBUILD.sh.ep index fe43360c..51b1f8e4 100644 --- a/qt5-virtualkeyboard/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-virtualkeyboard/mingw-w64/PKGBUILD.sh.ep @@ -2,7 +2,7 @@ \ #_fix_deps_of_static_3rdparty_libs='s:\(-L\/.*\/lib.*\.a\) \(\/.*\/libqt\)\(openwnn\|pinyin\|tcime\)\(d*\.a\)\(.*\):\2\3\4 \1 \5:g' # -L is used (pre Qt 5.13) _fix_deps_of_static_3rdparty_libs='s:\(LIBS *= *\)\(.*\)\(\/build\/.*\/libqt\)\(openwnn\|pinyin\|tcime\)\(d*\.a\)\(.*\):\1 \3\4\5 \2 \6:g' # absolute paths are used (Qt 5.13 and above) -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Virtual keyboard framework (translations, mingw-w64)" diff --git a/qt5-virtualkeyboard/mingw-w64/qtvirtualkeyboard-sha256.txt b/qt5-virtualkeyboard/mingw-w64/qtvirtualkeyboard-sha256.txt index 29ef187d..fa4f1e22 100644 --- a/qt5-virtualkeyboard/mingw-w64/qtvirtualkeyboard-sha256.txt +++ b/qt5-virtualkeyboard/mingw-w64/qtvirtualkeyboard-sha256.txt @@ -1 +1 @@ -277baaf6043328d06585c7a9046461308aa7602b21f531bcda12e6df5bce5295 +364f3338563e617e7c964a37170b415b546c5f82965e781271f9dada3e3868d7 diff --git a/qt5-webchannel/mingw-w64/PKGBUILD b/qt5-webchannel/mingw-w64/PKGBUILD index 49112b4e..8c91369e 100644 --- a/qt5-webchannel/mingw-w64/PKGBUILD +++ b/qt5-webchannel/mingw-w64/PKGBUILD @@ -12,7 +12,7 @@ _qt_module=qtwebchannel pkgname=mingw-w64-qt5-webchannel -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc='Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients (mingw-w64)' @@ -24,7 +24,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=('3af5262fde14c7dfe7bcc12d5796a482837bd09f0878851fd8de5db0b1985e6a') +sha256sums=('7d1dc8441523638c3d455c7d408ec65aebc073acab80e24063865f929231f874') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-webchannel/mingw-w64/PKGBUILD.sh.ep b/qt5-webchannel/mingw-w64/PKGBUILD.sh.ep index 642bd31d..ea4131ab 100644 --- a/qt5-webchannel/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-webchannel/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt5-module'; \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc='Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients (mingw-w64)' diff --git a/qt5-webchannel/mingw-w64/qtwebchannel-sha256.txt b/qt5-webchannel/mingw-w64/qtwebchannel-sha256.txt index fb593247..13e4db57 100644 --- a/qt5-webchannel/mingw-w64/qtwebchannel-sha256.txt +++ b/qt5-webchannel/mingw-w64/qtwebchannel-sha256.txt @@ -1 +1 @@ -3af5262fde14c7dfe7bcc12d5796a482837bd09f0878851fd8de5db0b1985e6a +7d1dc8441523638c3d455c7d408ec65aebc073acab80e24063865f929231f874 diff --git a/qt5-webengine/mingw-w64/PKGBUILD b/qt5-webengine/mingw-w64/PKGBUILD index 9925aa39..c6f1f642 100644 --- a/qt5-webengine/mingw-w64/PKGBUILD +++ b/qt5-webengine/mingw-w64/PKGBUILD @@ -16,7 +16,7 @@ _qt_module=qtwebengine pkgname=mingw-w64-qt5-webengine -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc='Provides support for web applications using the Chromium browser project (mingw-w64)' diff --git a/qt5-webengine/mingw-w64/PKGBUILD.sh.ep b/qt5-webengine/mingw-w64/PKGBUILD.sh.ep index ebccb81f..1a2f633a 100644 --- a/qt5-webengine/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-webengine/mingw-w64/PKGBUILD.sh.ep @@ -5,7 +5,7 @@ % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc='Provides support for web applications using the Chromium browser project (mingw-w64)' diff --git a/qt5-webglplugin/mingw-w64/0001-Hardcode-linker-flags-for-platform-plugin.patch b/qt5-webglplugin/mingw-w64/0001-Hardcode-linker-flags-for-platform-plugin.patch index eee8edfe..b6fea22e 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 @@ -42,5 +42,5 @@ index 7f7227c..45f8f66 100644 qtHaveModule(quick) { QT += quick -- -2.25.0 +2.26.0 diff --git a/qt5-webglplugin/mingw-w64/PKGBUILD b/qt5-webglplugin/mingw-w64/PKGBUILD index ff7ac0ef..9182d496 100644 --- a/qt5-webglplugin/mingw-w64/PKGBUILD +++ b/qt5-webglplugin/mingw-w64/PKGBUILD @@ -14,7 +14,7 @@ _qt_module=qtwebglplugin pkgname=mingw-w64-qt5-webglplugin -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="QPA plugin for running an application via a browser using streamed WebGL commands (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-Hardcode-linker-flags-for-platform-plugin.patch') -sha256sums=('de7768ab6a8de06e09467b6dc8714fa71ed5781e2654aa3498a7105328f565a6' - '018bb036b93ff1235918fa1e96800f2ffb158dec93079819e817780ab3309e4e') +sha256sums=('eb4118910b65d03d8448658ac1646e860d337e59b82d6575beda21824e313417' + '1184f0f013645a272da8589a6bb4aaabcb7de13c3d577139871ca63a90a80c13') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-webglplugin/mingw-w64/PKGBUILD.sh.ep b/qt5-webglplugin/mingw-w64/PKGBUILD.sh.ep index a50b9a4c..c9b2a6a1 100644 --- a/qt5-webglplugin/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-webglplugin/mingw-w64/PKGBUILD.sh.ep @@ -1,6 +1,6 @@ % layout 'mingw-w64-qt5-module'; \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="QPA plugin for running an application via a browser using streamed WebGL commands (mingw-w64)" diff --git a/qt5-webglplugin/mingw-w64/qtwebglplugin-sha256.txt b/qt5-webglplugin/mingw-w64/qtwebglplugin-sha256.txt index 015ccd82..4e6d470d 100644 --- a/qt5-webglplugin/mingw-w64/qtwebglplugin-sha256.txt +++ b/qt5-webglplugin/mingw-w64/qtwebglplugin-sha256.txt @@ -1 +1 @@ -de7768ab6a8de06e09467b6dc8714fa71ed5781e2654aa3498a7105328f565a6 +eb4118910b65d03d8448658ac1646e860d337e59b82d6575beda21824e313417 diff --git a/qt5-websockets/mingw-w64/PKGBUILD b/qt5-websockets/mingw-w64/PKGBUILD index b05ad6ea..43054a20 100644 --- a/qt5-websockets/mingw-w64/PKGBUILD +++ b/qt5-websockets/mingw-w64/PKGBUILD @@ -13,7 +13,7 @@ _qt_module=qtwebsockets pkgname=mingw-w64-qt5-websockets -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Provides WebSocket communication compliant with RFC 6455 (mingw-w64)" @@ -25,7 +25,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=('742fb3d39043728ca4fc1533e9a1e3b701bc5bf4e27cba316077e9f0df0b3fef') +sha256sums=('f06e62b18313fe1b40a35566e79645de4a8e7ac9f7717d1d98a06c5b49afca84') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-websockets/mingw-w64/PKGBUILD.sh.ep b/qt5-websockets/mingw-w64/PKGBUILD.sh.ep index ce4d3d65..bc287979 100644 --- a/qt5-websockets/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-websockets/mingw-w64/PKGBUILD.sh.ep @@ -4,7 +4,7 @@ # Contributor: ant32 % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Provides WebSocket communication compliant with RFC 6455 (mingw-w64)" diff --git a/qt5-websockets/mingw-w64/qtwebsockets-sha256.txt b/qt5-websockets/mingw-w64/qtwebsockets-sha256.txt index 24d7ee0a..3cc70051 100644 --- a/qt5-websockets/mingw-w64/qtwebsockets-sha256.txt +++ b/qt5-websockets/mingw-w64/qtwebsockets-sha256.txt @@ -1 +1 @@ -742fb3d39043728ca4fc1533e9a1e3b701bc5bf4e27cba316077e9f0df0b3fef +f06e62b18313fe1b40a35566e79645de4a8e7ac9f7717d1d98a06c5b49afca84 diff --git a/qt5-winextras/mingw-w64/PKGBUILD b/qt5-winextras/mingw-w64/PKGBUILD index 6ee0d71d..1a3a6c5c 100644 --- a/qt5-winextras/mingw-w64/PKGBUILD +++ b/qt5-winextras/mingw-w64/PKGBUILD @@ -13,7 +13,7 @@ _qt_module=qtwinextras pkgname=mingw-w64-qt5-winextras -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Classes and functions that enable you to use Windows-specific functions (mingw-w64)" @@ -25,7 +25,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=('222b888b89a8fb02948faf985e8614ac543603a000c1cf2e7489f8bf15ccc3cc') +sha256sums=('980f1bc31b37c8597c0bac55f69ecf00d1677218ce82f7bc3933236cb6d907f2') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-winextras/mingw-w64/PKGBUILD.sh.ep b/qt5-winextras/mingw-w64/PKGBUILD.sh.ep index 82120ebd..17e45af6 100644 --- a/qt5-winextras/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-winextras/mingw-w64/PKGBUILD.sh.ep @@ -4,7 +4,7 @@ # Contributor: ant32 % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Classes and functions that enable you to use Windows-specific functions (mingw-w64)" diff --git a/qt5-winextras/mingw-w64/qtwinextras-sha256.txt b/qt5-winextras/mingw-w64/qtwinextras-sha256.txt index 34c6eceb..09efc7b1 100644 --- a/qt5-winextras/mingw-w64/qtwinextras-sha256.txt +++ b/qt5-winextras/mingw-w64/qtwinextras-sha256.txt @@ -1 +1 @@ -222b888b89a8fb02948faf985e8614ac543603a000c1cf2e7489f8bf15ccc3cc +980f1bc31b37c8597c0bac55f69ecf00d1677218ce82f7bc3933236cb6d907f2 diff --git a/qt5-xmlpatterns/mingw-w64/PKGBUILD b/qt5-xmlpatterns/mingw-w64/PKGBUILD index ff8b8387..40c63ba3 100644 --- a/qt5-xmlpatterns/mingw-w64/PKGBUILD +++ b/qt5-xmlpatterns/mingw-w64/PKGBUILD @@ -13,7 +13,7 @@ _qt_module=qtxmlpatterns pkgname=mingw-w64-qt5-xmlpatterns -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Support for XPath, XQuery, XSLT and XML schema validation (mingw-w64)" @@ -25,7 +25,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=('fb993a112e591c84ea159a752a4026031a212a7af6f31a1b288552c924c18224') +sha256sums=('219a876665345e3801baff71f31f30f5495c1cb9ab23fbbd27602632c80fcfb7') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-xmlpatterns/mingw-w64/PKGBUILD.sh.ep b/qt5-xmlpatterns/mingw-w64/PKGBUILD.sh.ep index 08244da8..eabf46ac 100644 --- a/qt5-xmlpatterns/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-xmlpatterns/mingw-w64/PKGBUILD.sh.ep @@ -4,7 +4,7 @@ # Contributor: ant32 % end \ -pkgver=5.14.1 +pkgver=5.14.2 pkgrel=1 arch=('any') pkgdesc="Support for XPath, XQuery, XSLT and XML schema validation (mingw-w64)" diff --git a/qt5-xmlpatterns/mingw-w64/qtxmlpatterns-sha256.txt b/qt5-xmlpatterns/mingw-w64/qtxmlpatterns-sha256.txt index ba0ef9df..afd4c8d0 100644 --- a/qt5-xmlpatterns/mingw-w64/qtxmlpatterns-sha256.txt +++ b/qt5-xmlpatterns/mingw-w64/qtxmlpatterns-sha256.txt @@ -1 +1 @@ -fb993a112e591c84ea159a752a4026031a212a7af6f31a1b288552c924c18224 +219a876665345e3801baff71f31f30f5495c1cb9ab23fbbd27602632c80fcfb7