diff --git a/devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep b/devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep index eb02522a..b0abe59b 100644 --- a/devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep +++ b/devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep @@ -31,7 +31,7 @@ _qt_module=qt<%== $qt_module %> pkgname=<%= $package_name %> -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 pkgdesc='A cross-platform application and UI framework, <%= $opengl_backend %> OpenGL backend (mingw-w64)' arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>) diff --git a/devel/versions.sh b/devel/versions.sh index 0bf049ff..24ff3181 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.15.1 + [qt5]=5.15.2 [qt6]=6.0.0-beta4 ) declare -A github_names=( diff --git a/qt5-3d/mingw-w64-static/PKGBUILD b/qt5-3d/mingw-w64-static/PKGBUILD index f977d659..eec7ddcf 100644 --- a/qt5-3d/mingw-w64-static/PKGBUILD +++ b/qt5-3d/mingw-w64-static/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qt3d pkgname=mingw-w64-qt5-3d-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)" @@ -22,7 +22,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=('29aac2c38b6b2fb1e7d54829ff8b4c9aae12a70ffab9707c7388f1e134dd9411') +sha256sums=('03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-3d/mingw-w64-static/qt3d-sha256.txt b/qt5-3d/mingw-w64-static/qt3d-sha256.txt index ccc00c59..8e85980b 100644 --- a/qt5-3d/mingw-w64-static/qt3d-sha256.txt +++ b/qt5-3d/mingw-w64-static/qt3d-sha256.txt @@ -1 +1 @@ -29aac2c38b6b2fb1e7d54829ff8b4c9aae12a70ffab9707c7388f1e134dd9411 +03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d diff --git a/qt5-3d/mingw-w64/PKGBUILD b/qt5-3d/mingw-w64/PKGBUILD index 257db7d8..ffa600fc 100644 --- a/qt5-3d/mingw-w64/PKGBUILD +++ b/qt5-3d/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qt3d pkgname=mingw-w64-qt5-3d -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)" @@ -22,7 +22,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=('29aac2c38b6b2fb1e7d54829ff8b4c9aae12a70ffab9707c7388f1e134dd9411') +sha256sums=('03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d') _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 443c4545..6af63ac0 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.15.1 +pkgver=5.15.2 pkgrel=1 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>) 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 ccc00c59..8e85980b 100644 --- a/qt5-3d/mingw-w64/qt3d-sha256.txt +++ b/qt5-3d/mingw-w64/qt3d-sha256.txt @@ -1 +1 @@ -29aac2c38b6b2fb1e7d54829ff8b4c9aae12a70ffab9707c7388f1e134dd9411 +03ed6a48c813c75296c19f5d721184ab168280b69d2656cf16f877d3d4c55c1d 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 5c9beffb..bda43b2f 100644 --- a/qt5-activeqt/mingw-w64/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch +++ b/qt5-activeqt/mingw-w64/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch @@ -1,4 +1,4 @@ -From ab2f571f3c72bea8ab6478db089592c301259394 Mon Sep 17 00:00:00 2001 +From f3eb4a339ad53d96f59cf172e6e5f356b0d43bbd Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 17:17:46 +0200 Subject: [PATCH 1/2] Don't require windows.h when using native Linux gcc @@ -17,5 +17,5 @@ index 7f9a8d4..6f3548a 100644 SOURCES = main.cpp -- -2.28.0 +2.29.2 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 aa12cac1..63945595 100644 --- a/qt5-activeqt/mingw-w64/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch +++ b/qt5-activeqt/mingw-w64/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch @@ -1,4 +1,4 @@ -From 5652ce8e4225793cb4041be6aadee82d4ac84c27 Mon Sep 17 00:00:00 2001 +From 7b74ca5cb9fb9077eb26e73a84822850e8608c50 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 17:21:08 +0200 Subject: [PATCH 2/2] Handle win64 in dumpcpp and @@ -11,7 +11,7 @@ See https://bugreports.qt.io/browse/QTBUG-46827 2 files changed, 12 insertions(+) diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp -index 3203096..6adf9eb 100644 +index 2903cdf..12e3801 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -2202,6 +2202,10 @@ void MetaObjectGenerator::readClassInfo() @@ -26,11 +26,11 @@ index 3203096..6adf9eb 100644 break; } diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp -index 780d41b..029e10b 100644 +index 55aa80b..a1282f2 100644 --- a/tools/dumpcpp/main.cpp +++ b/tools/dumpcpp/main.cpp -@@ -1580,6 +1580,10 @@ int main(int argc, char **argv) - typeLib = settings.value(QLatin1Char('/') + codes.at(c) + QLatin1String("/0/win32/.")).toString(); +@@ -1586,6 +1586,10 @@ int main(int argc, char **argv) + typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString(); if (QFile::exists(typeLib)) break; + typeLib = settings.value(QLatin1String("/") + codes.at(c) + QLatin1String("/0/win64/.")).toByteArray(); @@ -40,8 +40,8 @@ index 780d41b..029e10b 100644 } if (!typeLib.isEmpty()) -@@ -1639,6 +1643,10 @@ int main(int argc, char **argv) - + QLatin1String("/win32/.")).toString(); +@@ -1650,6 +1654,10 @@ int main(int argc, char **argv) + typeLib = settings.value(keyPrefix + QLatin1String("win32/.")).toString(); if (QFile::exists(typeLib)) break; + typeLib = settings.value(key + QLatin1String("/") + codes.at(c) + QLatin1String("/win64/.")).toByteArray(); @@ -52,5 +52,5 @@ index 780d41b..029e10b 100644 } -- -2.28.0 +2.29.2 diff --git a/qt5-activeqt/mingw-w64/PKGBUILD b/qt5-activeqt/mingw-w64/PKGBUILD index bf562af0..817252f4 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.15.1 +pkgver=5.15.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=('4f8bbd320349d89ae7867de4bc752cf984f96c6def2b951564dcd5e4f53529c1' - 'b76fbe967e7f8af79fd2e4a1d64144edbfcd3ab5e7b70a19410215f93ccc16c1' - '486e1b7856e8b516abe93828edf83ede4f7e557e23ba1f2071034e984569c343') +sha256sums=('868161fee0876d17079cd5bed58d1667bf19ffd0018cbe515129f11510ad2a5c' + '05443c9a67b30160a7d4264da9c57b1a2fdbc3c74bab8e9f69c51ac8feeac2cb' + '06aa9413f31edd4f8c51d65cf6a8e1add8d5a6af2588f18bdc2e67164ebdaea7') _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 fc340891..c1ea7068 100644 --- a/qt5-activeqt/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-activeqt/mingw-w64/PKGBUILD.sh.ep @@ -10,7 +10,7 @@ % end \ -pkgver=5.15.1 +pkgver=5.15.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 aa4e9c51..25f9d7e1 100644 --- a/qt5-activeqt/mingw-w64/qtactiveqt-sha256.txt +++ b/qt5-activeqt/mingw-w64/qtactiveqt-sha256.txt @@ -1 +1 @@ -4f8bbd320349d89ae7867de4bc752cf984f96c6def2b951564dcd5e4f53529c1 +868161fee0876d17079cd5bed58d1667bf19ffd0018cbe515129f11510ad2a5c 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 deb6dcd8..06b812e0 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 14c05838f544ef232c784aa546f2a11b4cf2593e Mon Sep 17 00:00:00 2001 +From ce90790a4f5c2dcf9398d846f63a6c6b50411dcb 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 @@ -161,5 +161,5 @@ index 5de482f23b..3c3d22c699 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.28.0 +2.29.2 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 255b881a..a7ba57b4 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 9fa2f31eb911ab3d64286af43961b7fe0b8afbea Mon Sep 17 00:00:00 2001 +From adbb14a78c0091c81925e5e79644ff8361e7b8e9 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.28.0 +2.29.2 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 e7c5c11f..31b28046 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 f6042da88367558cd294c2593c8cc3a6e8949667 Mon Sep 17 00:00:00 2001 +From 520b519d962852792bd4ac3c2d1206afa329b65e 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.28.0 +2.29.2 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 97d28d1f..7ad86637 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 dcc115680078ce6d4c9682736b9b1fdf09abec63 Mon Sep 17 00:00:00 2001 +From 45491f6d0b4d828f3b4ce6b76ec3c7d68cec6b06 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 @@ -62,5 +62,5 @@ index 5e446bd7e2..183cef2908 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.28.0 +2.29.2 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 cce33fa0..8fe274d0 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 a580a7539f99448391f2b16903f8746d610f131a Mon Sep 17 00:00:00 2001 +From 806b631662ffebfa38085e1f9e708aee2c19f1d9 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 ee9a41838b..8d1dcae85b 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.28.0 +2.29.2 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 8070d2ed..0bc5e996 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 006235cdee71011db441e0ea5265cb9c93937f6c Mon Sep 17 00:00:00 2001 +From 3d816219968cfcaacfd30b6011263c8bb4d975c0 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 e94084381c..8e4d11484f 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.28.0 +2.29.2 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 c777ccaf..040ddbb4 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 7122a1ddd12d8852ed31fc4cc2f6523f09f66363 Mon Sep 17 00:00:00 2001 +From 77037d64693385c1cdcc2814890567e79548b40d 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 @@ -9,7 +9,7 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 1f08795c57..7a5fc6ce7a 100644 +index c8c4864eca..be519a6d39 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -399,8 +399,10 @@ @@ -26,5 +26,5 @@ index 1f08795c57..7a5fc6ce7a 100644 ], "use": [ -- -2.28.0 +2.29.2 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 160eb9c3..82d8973a 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 4898dc76052b6d77f99e56270979a4bb251998c5 Mon Sep 17 00:00:00 2001 +From be0366f6b3d32f5c80038eca7d0c7ddd5375aa85 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,10 +9,10 @@ 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 50d69b740d..2433da3c20 100644 +index c273aeeef1..57c40030d8 100644 --- a/configure.json +++ b/configure.json -@@ -188,18 +188,23 @@ +@@ -190,18 +190,23 @@ "dbus": { "label": "D-Bus >= 1.2", "test": { @@ -54,5 +54,5 @@ index accaa4f5ed..4b11c74caa 100644 # include #else -- -2.28.0 +2.29.2 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 08f2ac7f..2d4c36b9 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 39cac9030befe8b2d490b3397c99fe5bbbd935b6 Mon Sep 17 00:00:00 2001 +From adb495753f647c7b78d923bb512e18003cd309a4 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,10 +12,10 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.json b/configure.json -index 2433da3c20..bde226843b 100644 +index 57c40030d8..2fa3c08440 100644 --- a/configure.json +++ b/configure.json -@@ -201,7 +201,7 @@ +@@ -203,7 +203,7 @@ { "libs": "", "builds": { @@ -25,5 +25,5 @@ index 2433da3c20..bde226843b 100644 }, "condition": "config.win32 && features.shared" -- -2.28.0 +2.29.2 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 682678f7..fc9a35eb 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 788846ebc422894f3e6aa8f39485e0ab88abe81a Mon Sep 17 00:00:00 2001 +From 8a8da9fb5e44acf747985254b8e4a0e663397c15 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 @@ -8,7 +8,7 @@ Subject: [PATCH 10/31] Fix linking against static freetype2 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 7a5fc6ce7a..b117f6fff6 100644 +index be519a6d39..d74fd3bc24 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -238,8 +238,11 @@ @@ -26,5 +26,5 @@ index 7a5fc6ce7a..b117f6fff6 100644 { "libs": "-lfreetype" } ], -- -2.28.0 +2.29.2 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 062c21f4..e03dd7e6 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 0fb1b65cd6c37419e0292b90a47e1d4682cbb042 Mon Sep 17 00:00:00 2001 +From 32692f0bf4ae8f35145d963fe95b82a11a20e6ca 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 @@ -8,7 +8,7 @@ Subject: [PATCH 11/31] Fix linking against static harfbuzz 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index b117f6fff6..2a0207920a 100644 +index d74fd3bc24..d6759ed96a 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -306,7 +306,11 @@ @@ -25,5 +25,5 @@ index b117f6fff6..2a0207920a 100644 }, "imf": { -- -2.28.0 +2.29.2 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 28b23b68..403c1e86 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 f67ffa152627401a4daba9dea452acc4a6cb5621 Mon Sep 17 00:00:00 2001 +From 3bb30ee7403e468705aa03e1d92f797d6ce38332 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 729269d0f4..128baafd56 100644 +index d7e3cc5ee2..e17c19fbae 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp @@ -53,6 +53,10 @@ @@ -24,5 +24,5 @@ index 729269d0f4..128baafd56 100644 #include -- -2.28.0 +2.29.2 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 2347714d..dda69c2f 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 d3170e1695855d72ca9a1e093a20d88ae12372ef Mon Sep 17 00:00:00 2001 +From 5d301704de074aeee8464bf9933296a437353a6f 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 28ccbeadcd..7262914c64 100644 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.28.0 +2.29.2 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 a9f801d1..366913c8 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 997237bc94e9f12d309e55a119002be7496dd280 Mon Sep 17 00:00:00 2001 +From 0f760f0e2b127ca9e765d2bbf4200b047bfa1a5e 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 7262914c64..852ba558be 100644 ] }, -- -2.28.0 +2.29.2 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 42308a30..449698a9 100644 --- a/qt5-base/mingw-w64-angle/0015-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64-angle/0015-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 7ef86aea3eaffb36605e5d53e8fd6759e0931699 Mon Sep 17 00:00:00 2001 +From 092e86f5dedf3173be832f868b60b1c306c42bfa 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 @@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644 CONFIG += static -- -2.28.0 +2.29.2 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 659a0ac7..c4cf6a4e 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 2b3b220623dd50228e3b47403a7e07fc73804400 Mon Sep 17 00:00:00 2001 +From fc76d4187ab337a5efb96d6b80099f5075df69ee 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.28.0 +2.29.2 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 1caa3e44..6a30f8cd 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 2509527af89dd69120d68c9a6959028a18649996 Mon Sep 17 00:00:00 2001 +From 2e0b11f0f0ba3e756f010b5948b24089be5e3aed 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 @@ -8,7 +8,7 @@ Subject: [PATCH 17/31] Use system zlib for build tools 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro -index c212ccbb6f..1bf9f1e4f9 100644 +index 24862a07db..698e6cfb95 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -158,7 +158,9 @@ macx { @@ -23,5 +23,5 @@ index c212ccbb6f..1bf9f1e4f9 100644 } else { CONFIG += no_core_dep -- -2.28.0 +2.29.2 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 77d47d8f..ae13c161 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 323393dab8e135dbfbba3e82b164765ac1c82a56 Mon Sep 17 00:00:00 2001 +From bd22c9c095f87d358ea2269bfdd19cc31078b0b1 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 @@ -17,10 +17,10 @@ Change-Id: I1de08df42d83d411aae519691cd3cde1fd6f3d1d 7 files changed, 74 insertions(+), 11 deletions(-) diff --git a/configure.pri b/configure.pri -index 3dedffcace..89938dfc32 100644 +index 49755f7abf..53c67f885b 100644 --- a/configure.pri +++ b/configure.pri -@@ -654,7 +654,12 @@ defineTest(qtConfOutput_machineTuple) { +@@ -659,7 +659,12 @@ defineTest(qtConfOutput_machineTuple) { defineTest(qtConfOutput_commitOptions) { # qdevice.pri needs to be written early, because the compile tests require it. @@ -34,7 +34,7 @@ index 3dedffcace..89938dfc32 100644 } # type (empty or 'host'), option name, default value -@@ -1393,3 +1398,12 @@ defineTest(createConfigStatus) { +@@ -1398,3 +1403,12 @@ defineTest(createConfigStatus) { QMAKE_POST_CONFIGURE += \ "createConfigStatus()" @@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.28.0 +2.29.2 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 30de2d56..7ae06611 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 366f840385b1e1f575bfb291806d5d0578e195af Mon Sep 17 00:00:00 2001 +From ae893f34a059c78cf274d1ed05c2d4c4bfb66218 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 @@ -94,5 +94,5 @@ index 183cef2908..03732df4a8 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.28.0 +2.29.2 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 e526054b..4bcd8f46 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 62658e138ba05a9c076cad73c6f007dcf4f7d3a7 Mon Sep 17 00:00:00 2001 +From 1b69d19dd9ef7d00a5eec9a22961c3232e19e5b1 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 @@ -501,5 +501,5 @@ index b550a52c60..acbe1cc33b 100644 +endif() \ No newline at end of file -- -2.28.0 +2.29.2 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 8f3a83e0..17ed0bed 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 ea8cf4e19c1f78d2f50ef20d92e89d32311eac7a Mon Sep 17 00:00:00 2001 +From 494194c5b6b2775e756e911f5befde85e9ce13e4 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 @@ -1091,5 +1091,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.28.0 +2.29.2 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 1931672c..d8d31d0b 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 340f5dd2ffd05d07d7bf66b5092eca5c99cb4737 Mon Sep 17 00:00:00 2001 +From 0f44180723f14ae9861b406238d973e0ca20c405 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 @@ -27,5 +27,5 @@ index 9da1361c95..5e802dea4c 100644 +set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\") +unset(_isExe) -- -2.28.0 +2.29.2 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 e4988af9..873c3996 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 5654cdfaf7565e7410e6a005e9083053aa6882b6 Mon Sep 17 00:00:00 2001 +From 0084c7966f46b5a64cac040a8c50c793ba680930 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 @@ -8,7 +8,7 @@ Subject: [PATCH 23/31] Use correct pkg-config --static flag 1 file changed, 3 insertions(+) diff --git a/configure.pri b/configure.pri -index 89938dfc32..121064e1f8 100644 +index 53c67f885b..8934b72291 100644 --- a/configure.pri +++ b/configure.pri @@ -351,6 +351,9 @@ defineTest(qtConfTest_detectPkgConfig) { @@ -22,5 +22,5 @@ index 89938dfc32..121064e1f8 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.28.0 +2.29.2 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 64053e97..2a0983f1 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 8394e428ad059d5ba5c647969b6f0e66178ddb53 Mon Sep 17 00:00:00 2001 +From e5389013ff78085fdfdfbf1da5b0644e784c916d 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 @@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.28.0 +2.29.2 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 e1fed849..beb723a6 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 ab4f998fa0c472b0f1c3b6ec84e505cfe2b8a94d Mon Sep 17 00:00:00 2001 +From d29a2b44643831e439755d11348b69dc9ed6d60b 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 @@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.28.0 +2.29.2 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 95407e46..f0ac0098 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 6a90a8a3b0d86865419cdd9f6e1a9a581cd8fc9c Mon Sep 17 00:00:00 2001 +From becf49560bdf91b82df7bec0bc06c54d7ab8c948 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 c5e0423273..0b12e22351 100644 }, "icu": { -- -2.28.0 +2.29.2 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 a47da0c5..0eef1044 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 ba1da244bc63546bf22b7f4be8164c8c63917510 Mon Sep 17 00:00:00 2001 +From 2fd3c54980c0be5efa03f64c8998287d683ff54f 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,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best 1 file changed, 1 deletion(-) diff --git a/configure.json b/configure.json -index bde226843b..653ed122d9 100644 +index 2fa3c08440..d96d2a6ecb 100644 --- a/configure.json +++ b/configure.json -@@ -770,7 +770,6 @@ +@@ -772,7 +772,6 @@ "pkg-config": { "label": "Using pkg-config", "autoDetect": "!config.darwin && !config.win32", @@ -21,5 +21,5 @@ index bde226843b..653ed122d9 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.28.0 +2.29.2 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 819fb97a..14e719aa 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 c5a084e56a5c766909c6513e673ec5fbb2fde4c6 Mon Sep 17 00:00:00 2001 +From e6e16f20966d91dd3c0020d4784d04e79b95613f 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 @@ -41,5 +41,5 @@ index 03732df4a8..602f7609f5 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.28.0 +2.29.2 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 54d6ba04..25482a8a 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 29c9cbb846b7c55894d95ceeffea80ce1485f03e Mon Sep 17 00:00:00 2001 +From d7d5e89ed1d5b7ea3962588eb719a85c85356f09 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 @@ -172,5 +172,5 @@ index 50a3bb41a9..53c011642f 100644 include(windows.pri) -- -2.28.0 +2.29.2 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 88595eea..a306ece1 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 ed933add3678150e845c63523cee9c09f02538fd Mon Sep 17 00:00:00 2001 +From cd3c5ceea13a08c8eea88eea90b24a2cacf816a3 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 b79b324b88..6a03b7a74b 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.28.0 +2.29.2 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 6e3084dd..6632e2d1 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 e6dce973da0d16d725107c4c8b78ec3f4134b056 Mon Sep 17 00:00:00 2001 +From 25a9b54ce96ea574fe18bc6df5dc2ee571d22c36 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.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-angle/PKGBUILD b/qt5-base/mingw-w64-angle/PKGBUILD index cf0ae969..b7c38dfc 100644 --- a/qt5-base/mingw-w64-angle/PKGBUILD +++ b/qt5-base/mingw-w64-angle/PKGBUILD @@ -19,7 +19,7 @@ _qt_module=qtbase pkgname=mingw-w64-qt5-base-angle -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 pkgdesc='A cross-platform application and UI framework, ANGLE OpenGL backend (mingw-w64)' arch=('i686' 'x86_64') @@ -73,37 +73,37 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0030-Fix-linking-against-static-plugins-with-qmake.patch' '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch') sha256sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a' - 'fec4ca039859f9cc9685b34a7bd2da9e0fe24b5b1f85d7cd12665631fa797b44' - 'a0ea35e6eef4fed06360efa05e11b898f6033d893e1f1657a240cc03e43f076e' - 'cda13b2856fafe92b1369d6f2d01bd4d9bbdb0ec96c25e91e48ba25267c74c6c' - 'e13cd18ad781512862b5d288a53ebd09dc0e8bcc6fd3c4e833d0c593f28edd3a' - '273af9db2954c1d62e29d2a8328bbfa918bae617456aff6645df4bfb72796e0d' - '84a801d904fe308a56a9112af9aa73656eacf36ed7684449363281bfe4108543' - '190795aa778ae4e7bd8a74ce56504c697435129b73d2f0418511a4a230f68bc5' - '3fff6151dcf76bed12864dba51e4d04d39f8b3969c502a71ed547b527b310d7a' - '56240f509157a04ba1f1a23b0e058c2212d66e34aca68a688c15f5d8804bf174' - '02ca3a112f3e35749c141ed9c7e87a1fd0e82aa852541024b85f40a99d24d9fc' - '3b4dcce669d359953603257e621e6ebc30fb88f0f1c48b35ec443c574f2b05e8' - 'ba302124391aea5438e82195dd276edd8942f04cff7c6b85a9f0a5279749566b' - '68b5f9e0535c8d030161e67a0e8ee8bec2a80a9c8f69c09a4ad25fe98eb9dfd2' - 'ab46b53eb6272185a05d11820317db421be6e4440166967911e7d59d4f0a03d4' - 'c11a14a02e48e39e8212097915aed2347825a33022d367f322e34f3aaaf33f90' - '6d7c8fd7a162174355dd12399bd8f47f470557751dc117271c02e2e7b385d424' - '3c28f5658e0f960091c1991586167ee06bcecd8d843123fbf37ab78a1f5f30f0' - 'f9545474bd73be049dbf84fc2ff455e924e6fb29bb807809c384bf56a0227ad6' - '2998069e3a427c940f496d75df4cea05acb10d3e82c333a5c957e37f0543a0e8' - 'a301ddcd46b9b2fb58d592af88ac6acf81b2dbd328fb8c4c3ef49abffe343267' - '3d1257390ff151365d7fa29cde5f9c118310fe727243fb6f50ad30ab117c3384' - '19534087d5fc4b434859d68476ebd0647fdc04bf78f24943b7ab88cccf09b08a' - '5a57c66303d4a898dd5cccd9c639f367b50b508256fdf9c00ba5179bb00d701c' - '84b9e41b7320834a73edf1d192e511801feb51cd2de60ecc28e46982cd572df4' - '85bba2428090518dca878ca117299b065913f125c00cede57b31d37a02d0b787' - 'f0429a442805c2e0181e8b3b7814259586fdcba000bf324c0e367858c351f6b1' - 'c8479468cfb4a70fe65a1317f3fbacd40dcdc7a8bafc88648160509ee8b216e8' - 'a2eb9e683b12efe7fbb365749bdd5373e0fbf6438fe5342effab93f3a262d808' - '4c097460c443ec0ca47a41ea1ad6fdaa08e394b7a883d54da69bf9557ccbea31' - 'e1f2b8bfe9f3cdacceb6d9b73573ad39ea73ac0fce74448c7df0262b34b703bb' - '553c15e8cf230c3d3f3fa4c4a7a5a46d18027a4d6c7493f3eab56ca97bd906d9') + 'b3b49e5580f296f993a0aba0b34bd5ae2399f8d1809456878c1881451b14c27e' + '833b8fc2dd8f0bb4a914fb7f5018b28954752b2d54cec2388332885c929a9266' + 'e49f91d9f8f56afc856a9e143feb4ad9cf54c804f773374e5ccb6d1fc264a7bc' + '944288f57ac8cc9063a75a3a6b421c20a3e8b02a5fd5294f7da7df28c840302b' + 'b421b77303f6f03682c04f1bd1c2c63e07b120dc724de93a9248330d0080ee26' + '595fe18bbefb6f7e271a9daeefbd008d6350ef44b16b4b72c4d3183ba14509ee' + '238900f33394be14378b58445abe28dcd66343ed4f0760c8f944508c02ae831b' + 'bbde0b8ac3a9639a90e2937367deb769ea39ee55b036995a253ec8fdd1d2bd2c' + '859c065f54819266b33bab6b57f76f8c21065a48ff36104b191e218e31f20f9e' + '896c0b0d346f271f90609c6b49490ee86d3076ae620af1127503ee397a7664bb' + '15c69cd06b6e28100ad118ed045abef670acd41609351cd8e2652f1aeec9c8c4' + '499b3a1177e2340b5063553452b0a9a44f232e47839f03087939f52da38d0548' + 'bbe45a397cbc4c0303125937710e305c6dbb0e4a8713b4a520ff820208295ea8' + '3fedd43cccc7000271766f7b4ff85efafc9c65ce3b9f40f4c443a0f352518631' + '2b4854083457f85a82e8f05c23d3983095ff8aa1d1e0ea5cfe1f7e9731b061f8' + '6d4dc98c2b9e0ed743332797e1511262bda3b240e4685c2150a40415650c78f0' + '27b0eb4795713e1c6804dbb446970684c19cc2797f9e371eb2605c852d404b05' + '0fa5c3b49425cfb357e9d04bf993e065174d8b44e450dd134aa24187ed66e0e1' + 'd990f99f04dcf52cae5d7f6dd4394aae778683c2d9ebcb41b485129af8c2cf2f' + '7a395f7e9f26a650e09ad4b35563d5cb46c34dfae1c7de2f4dcf0e86f9dd1927' + 'd38cbc2d4566a3915475fa29ae2982173cd1339abdbff292f5cd520c7c741039' + '2b90d5b001da77692805a8fc9f6ac77ed8d3bfce48f52c89be1b13e915b5ef7c' + '5b973e490c3bbbc3aba7bf2b4fa704c38f92601c7736b483334025e2fc913285' + '73683e5bc8672c09c7c4e86b4787bbb5792570a511768509db6c7a7f45a58109' + 'cc8d458974c5168a7956d4682a63b0c15f9918256820ae908b88e5dd18d95811' + '3cb99ad9d910bad53ad8565d0be2fb6bb4a0d1075dbb73fd85cb2ffbe404d73e' + 'ea31c31ccbd47f6d77a1cf00768a9c247b368d79e3ba19dca4854c29f1a69a69' + 'e6ed01492dacf7367d8f444eb00e2bcdae1fc3b3f1648858e6e379b1565f8943' + 'd4cd03c966a6a1c37ce21f9e6bbd9deaadbb62f31a1a652ac12cd48a651fc47d' + 'd9f55e93cfde4bd6d46744697ae846490912342bdb84ad8c4ba0cf7689b472ab' + 'd5478d6cbcb1067bf1b8e3e52210f1416d734303e387facb165b92f281789436') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-base/mingw-w64-dynamic/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/qt5-base/mingw-w64-dynamic/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch index deb6dcd8..06b812e0 100644 --- a/qt5-base/mingw-w64-dynamic/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch +++ b/qt5-base/mingw-w64-dynamic/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch @@ -1,4 +1,4 @@ -From 14c05838f544ef232c784aa546f2a11b4cf2593e Mon Sep 17 00:00:00 2001 +From ce90790a4f5c2dcf9398d846f63a6c6b50411dcb 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 @@ -161,5 +161,5 @@ index 5de482f23b..3c3d22c699 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index 255b881a..a7ba57b4 100644 --- a/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch +++ b/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch @@ -1,4 +1,4 @@ -From 9fa2f31eb911ab3d64286af43961b7fe0b8afbea Mon Sep 17 00:00:00 2001 +From adbb14a78c0091c81925e5e79644ff8361e7b8e9 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.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64-dynamic/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index e7c5c11f..31b28046 100644 --- a/qt5-base/mingw-w64-dynamic/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64-dynamic/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From f6042da88367558cd294c2593c8cc3a6e8949667 Mon Sep 17 00:00:00 2001 +From 520b519d962852792bd4ac3c2d1206afa329b65e 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.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0004-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64-dynamic/0004-Make-sure-.pc-files-are-installed-correctly.patch index 97d28d1f..7ad86637 100644 --- a/qt5-base/mingw-w64-dynamic/0004-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64-dynamic/0004-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From dcc115680078ce6d4c9682736b9b1fdf09abec63 Mon Sep 17 00:00:00 2001 +From 45491f6d0b4d828f3b4ce6b76ec3c7d68cec6b06 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 @@ -62,5 +62,5 @@ index 5e446bd7e2..183cef2908 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0005-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64-dynamic/0005-Don-t-add-resource-files-to-LIBS-parameter.patch index cce33fa0..8fe274d0 100644 --- a/qt5-base/mingw-w64-dynamic/0005-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64-dynamic/0005-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From a580a7539f99448391f2b16903f8746d610f131a Mon Sep 17 00:00:00 2001 +From 806b631662ffebfa38085e1f9e708aee2c19f1d9 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 ee9a41838b..8d1dcae85b 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0006-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64-dynamic/0006-Prevent-debug-library-names-in-pkg-config-files.patch index 8070d2ed..0bc5e996 100644 --- a/qt5-base/mingw-w64-dynamic/0006-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64-dynamic/0006-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 006235cdee71011db441e0ea5265cb9c93937f6c Mon Sep 17 00:00:00 2001 +From 3d816219968cfcaacfd30b6011263c8bb4d975c0 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 e94084381c..8e4d11484f 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0007-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64-dynamic/0007-Fix-linking-against-shared-static-libpng.patch index c777ccaf..040ddbb4 100644 --- a/qt5-base/mingw-w64-dynamic/0007-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64-dynamic/0007-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From 7122a1ddd12d8852ed31fc4cc2f6523f09f66363 Mon Sep 17 00:00:00 2001 +From 77037d64693385c1cdcc2814890567e79548b40d 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 @@ -9,7 +9,7 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 1f08795c57..7a5fc6ce7a 100644 +index c8c4864eca..be519a6d39 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -399,8 +399,10 @@ @@ -26,5 +26,5 @@ index 1f08795c57..7a5fc6ce7a 100644 ], "use": [ -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-static-D-Bus.patch index 160eb9c3..82d8973a 100644 --- a/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From 4898dc76052b6d77f99e56270979a4bb251998c5 Mon Sep 17 00:00:00 2001 +From be0366f6b3d32f5c80038eca7d0c7ddd5375aa85 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,10 +9,10 @@ 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 50d69b740d..2433da3c20 100644 +index c273aeeef1..57c40030d8 100644 --- a/configure.json +++ b/configure.json -@@ -188,18 +188,23 @@ +@@ -190,18 +190,23 @@ "dbus": { "label": "D-Bus >= 1.2", "test": { @@ -54,5 +54,5 @@ index accaa4f5ed..4b11c74caa 100644 # include #else -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64-dynamic/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index 08f2ac7f..2d4c36b9 100644 --- a/qt5-base/mingw-w64-dynamic/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/qt5-base/mingw-w64-dynamic/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 39cac9030befe8b2d490b3397c99fe5bbbd935b6 Mon Sep 17 00:00:00 2001 +From adb495753f647c7b78d923bb512e18003cd309a4 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,10 +12,10 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.json b/configure.json -index 2433da3c20..bde226843b 100644 +index 57c40030d8..2fa3c08440 100644 --- a/configure.json +++ b/configure.json -@@ -201,7 +201,7 @@ +@@ -203,7 +203,7 @@ { "libs": "", "builds": { @@ -25,5 +25,5 @@ index 2433da3c20..bde226843b 100644 }, "condition": "config.win32 && features.shared" -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0010-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64-dynamic/0010-Fix-linking-against-static-freetype2.patch index 682678f7..fc9a35eb 100644 --- a/qt5-base/mingw-w64-dynamic/0010-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64-dynamic/0010-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From 788846ebc422894f3e6aa8f39485e0ab88abe81a Mon Sep 17 00:00:00 2001 +From 8a8da9fb5e44acf747985254b8e4a0e663397c15 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 @@ -8,7 +8,7 @@ Subject: [PATCH 10/31] Fix linking against static freetype2 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 7a5fc6ce7a..b117f6fff6 100644 +index be519a6d39..d74fd3bc24 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -238,8 +238,11 @@ @@ -26,5 +26,5 @@ index 7a5fc6ce7a..b117f6fff6 100644 { "libs": "-lfreetype" } ], -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-harfbuzz.patch index 062c21f4..e03dd7e6 100644 --- a/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From 0fb1b65cd6c37419e0292b90a47e1d4682cbb042 Mon Sep 17 00:00:00 2001 +From 32692f0bf4ae8f35145d963fe95b82a11a20e6ca 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 @@ -8,7 +8,7 @@ Subject: [PATCH 11/31] Fix linking against static harfbuzz 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index b117f6fff6..2a0207920a 100644 +index d74fd3bc24..d6759ed96a 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -306,7 +306,11 @@ @@ -25,5 +25,5 @@ index b117f6fff6..2a0207920a 100644 }, "imf": { -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-pcre.patch index 28b23b68..403c1e86 100644 --- a/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From f67ffa152627401a4daba9dea452acc4a6cb5621 Mon Sep 17 00:00:00 2001 +From 3bb30ee7403e468705aa03e1d92f797d6ce38332 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 729269d0f4..128baafd56 100644 +index d7e3cc5ee2..e17c19fbae 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp @@ -53,6 +53,10 @@ @@ -24,5 +24,5 @@ index 729269d0f4..128baafd56 100644 #include -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-shared-static-MariaDB.patch index 2347714d..dda69c2f 100644 --- a/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From d3170e1695855d72ca9a1e093a20d88ae12372ef Mon Sep 17 00:00:00 2001 +From 5d301704de074aeee8464bf9933296a437353a6f 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 28ccbeadcd..7262914c64 100644 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-PostgreSQL.patch index a9f801d1..366913c8 100644 --- a/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From 997237bc94e9f12d309e55a119002be7496dd280 Mon Sep 17 00:00:00 2001 +From 0f760f0e2b127ca9e765d2bbf4200b047bfa1a5e 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 7262914c64..852ba558be 100644 ] }, -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0015-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-dynamic/0015-Rename-qtmain-to-qt5main.patch index 42308a30..449698a9 100644 --- a/qt5-base/mingw-w64-dynamic/0015-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64-dynamic/0015-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 7ef86aea3eaffb36605e5d53e8fd6759e0931699 Mon Sep 17 00:00:00 2001 +From 092e86f5dedf3173be832f868b60b1c306c42bfa 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 @@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644 CONFIG += static -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0016-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64-dynamic/0016-Enable-rpath-for-build-tools.patch index 659a0ac7..c4cf6a4e 100644 --- a/qt5-base/mingw-w64-dynamic/0016-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64-dynamic/0016-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From 2b3b220623dd50228e3b47403a7e07fc73804400 Mon Sep 17 00:00:00 2001 +From fc76d4187ab337a5efb96d6b80099f5075df69ee 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.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0017-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64-dynamic/0017-Use-system-zlib-for-build-tools.patch index 1caa3e44..6a30f8cd 100644 --- a/qt5-base/mingw-w64-dynamic/0017-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64-dynamic/0017-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From 2509527af89dd69120d68c9a6959028a18649996 Mon Sep 17 00:00:00 2001 +From 2e0b11f0f0ba3e756f010b5948b24089be5e3aed 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 @@ -8,7 +8,7 @@ Subject: [PATCH 17/31] Use system zlib for build tools 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro -index c212ccbb6f..1bf9f1e4f9 100644 +index 24862a07db..698e6cfb95 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -158,7 +158,9 @@ macx { @@ -23,5 +23,5 @@ index c212ccbb6f..1bf9f1e4f9 100644 } else { CONFIG += no_core_dep -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0018-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64-dynamic/0018-Merge-shared-and-static-library-trees.patch index 77d47d8f..ae13c161 100644 --- a/qt5-base/mingw-w64-dynamic/0018-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64-dynamic/0018-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 323393dab8e135dbfbba3e82b164765ac1c82a56 Mon Sep 17 00:00:00 2001 +From bd22c9c095f87d358ea2269bfdd19cc31078b0b1 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 @@ -17,10 +17,10 @@ Change-Id: I1de08df42d83d411aae519691cd3cde1fd6f3d1d 7 files changed, 74 insertions(+), 11 deletions(-) diff --git a/configure.pri b/configure.pri -index 3dedffcace..89938dfc32 100644 +index 49755f7abf..53c67f885b 100644 --- a/configure.pri +++ b/configure.pri -@@ -654,7 +654,12 @@ defineTest(qtConfOutput_machineTuple) { +@@ -659,7 +659,12 @@ defineTest(qtConfOutput_machineTuple) { defineTest(qtConfOutput_commitOptions) { # qdevice.pri needs to be written early, because the compile tests require it. @@ -34,7 +34,7 @@ index 3dedffcace..89938dfc32 100644 } # type (empty or 'host'), option name, default value -@@ -1393,3 +1398,12 @@ defineTest(createConfigStatus) { +@@ -1398,3 +1403,12 @@ defineTest(createConfigStatus) { QMAKE_POST_CONFIGURE += \ "createConfigStatus()" @@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0019-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64-dynamic/0019-Use-.dll.a-as-import-lib-extension.patch index 30de2d56..7ae06611 100644 --- a/qt5-base/mingw-w64-dynamic/0019-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64-dynamic/0019-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From 366f840385b1e1f575bfb291806d5d0578e195af Mon Sep 17 00:00:00 2001 +From ae893f34a059c78cf274d1ed05c2d4c4bfb66218 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 @@ -94,5 +94,5 @@ index 183cef2908..03732df4a8 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64-dynamic/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index e526054b..4bcd8f46 100644 --- a/qt5-base/mingw-w64-dynamic/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/qt5-base/mingw-w64-dynamic/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From 62658e138ba05a9c076cad73c6f007dcf4f7d3a7 Mon Sep 17 00:00:00 2001 +From 1b69d19dd9ef7d00a5eec9a22961c3232e19e5b1 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 @@ -501,5 +501,5 @@ index b550a52c60..acbe1cc33b 100644 +endif() \ No newline at end of file -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0021-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-dynamic/0021-Allow-usage-of-static-version-with-CMake.patch index 8f3a83e0..17ed0bed 100644 --- a/qt5-base/mingw-w64-dynamic/0021-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64-dynamic/0021-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From ea8cf4e19c1f78d2f50ef20d92e89d32311eac7a Mon Sep 17 00:00:00 2001 +From 494194c5b6b2775e756e911f5befde85e9ce13e4 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 @@ -1091,5 +1091,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64-dynamic/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index 1931672c..d8d31d0b 100644 --- a/qt5-base/mingw-w64-dynamic/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/qt5-base/mingw-w64-dynamic/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From 340f5dd2ffd05d07d7bf66b5092eca5c99cb4737 Mon Sep 17 00:00:00 2001 +From 0f44180723f14ae9861b406238d973e0ca20c405 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 @@ -27,5 +27,5 @@ index 9da1361c95..5e802dea4c 100644 +set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\") +unset(_isExe) -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0023-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-dynamic/0023-Use-correct-pkg-config-static-flag.patch index e4988af9..873c3996 100644 --- a/qt5-base/mingw-w64-dynamic/0023-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64-dynamic/0023-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From 5654cdfaf7565e7410e6a005e9083053aa6882b6 Mon Sep 17 00:00:00 2001 +From 0084c7966f46b5a64cac040a8c50c793ba680930 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 @@ -8,7 +8,7 @@ Subject: [PATCH 23/31] Use correct pkg-config --static flag 1 file changed, 3 insertions(+) diff --git a/configure.pri b/configure.pri -index 89938dfc32..121064e1f8 100644 +index 53c67f885b..8934b72291 100644 --- a/configure.pri +++ b/configure.pri @@ -351,6 +351,9 @@ defineTest(qtConfTest_detectPkgConfig) { @@ -22,5 +22,5 @@ index 89938dfc32..121064e1f8 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-dynamic/0024-Fix-macro-invoking-moc-rcc-and-uic.patch index 64053e97..2a0983f1 100644 --- a/qt5-base/mingw-w64-dynamic/0024-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/qt5-base/mingw-w64-dynamic/0024-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From 8394e428ad059d5ba5c647969b6f0e66178ddb53 Mon Sep 17 00:00:00 2001 +From e5389013ff78085fdfdfbf1da5b0644e784c916d 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 @@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0025-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-dynamic/0025-Ignore-errors-about-missing-feature-static.patch index e1fed849..beb723a6 100644 --- a/qt5-base/mingw-w64-dynamic/0025-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64-dynamic/0025-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From ab4f998fa0c472b0f1c3b6ec84e505cfe2b8a94d Mon Sep 17 00:00:00 2001 +From d29a2b44643831e439755d11348b69dc9ed6d60b 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 @@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0026-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-dynamic/0026-Enable-and-fix-use-of-iconv.patch index 95407e46..f0ac0098 100644 --- a/qt5-base/mingw-w64-dynamic/0026-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64-dynamic/0026-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 6a90a8a3b0d86865419cdd9f6e1a9a581cd8fc9c Mon Sep 17 00:00:00 2001 +From becf49560bdf91b82df7bec0bc06c54d7ab8c948 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 c5e0423273..0b12e22351 100644 }, "icu": { -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0027-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-dynamic/0027-Ignore-failing-pkg-config-test.patch index a47da0c5..0eef1044 100644 --- a/qt5-base/mingw-w64-dynamic/0027-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64-dynamic/0027-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From ba1da244bc63546bf22b7f4be8164c8c63917510 Mon Sep 17 00:00:00 2001 +From 2fd3c54980c0be5efa03f64c8998287d683ff54f 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,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best 1 file changed, 1 deletion(-) diff --git a/configure.json b/configure.json -index bde226843b..653ed122d9 100644 +index 2fa3c08440..d96d2a6ecb 100644 --- a/configure.json +++ b/configure.json -@@ -770,7 +770,6 @@ +@@ -772,7 +772,6 @@ "pkg-config": { "label": "Using pkg-config", "autoDetect": "!config.darwin && !config.win32", @@ -21,5 +21,5 @@ index bde226843b..653ed122d9 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-dynamic/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch index 819fb97a..14e719aa 100644 --- a/qt5-base/mingw-w64-dynamic/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64-dynamic/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From c5a084e56a5c766909c6513e673ec5fbb2fde4c6 Mon Sep 17 00:00:00 2001 +From e6e16f20966d91dd3c0020d4784d04e79b95613f 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 @@ -41,5 +41,5 @@ index 03732df4a8..602f7609f5 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0029-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64-dynamic/0029-Hardcode-linker-flags-for-platform-plugins.patch index 54d6ba04..25482a8a 100644 --- a/qt5-base/mingw-w64-dynamic/0029-Hardcode-linker-flags-for-platform-plugins.patch +++ b/qt5-base/mingw-w64-dynamic/0029-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From 29c9cbb846b7c55894d95ceeffea80ce1485f03e Mon Sep 17 00:00:00 2001 +From d7d5e89ed1d5b7ea3962588eb719a85c85356f09 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 @@ -172,5 +172,5 @@ index 50a3bb41a9..53c011642f 100644 include(windows.pri) -- -2.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0030-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64-dynamic/0030-Fix-linking-against-static-plugins-with-qmake.patch index 88595eea..a306ece1 100644 --- a/qt5-base/mingw-w64-dynamic/0030-Fix-linking-against-static-plugins-with-qmake.patch +++ b/qt5-base/mingw-w64-dynamic/0030-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From ed933add3678150e845c63523cee9c09f02538fd Mon Sep 17 00:00:00 2001 +From cd3c5ceea13a08c8eea88eea90b24a2cacf816a3 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 b79b324b88..6a03b7a74b 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.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/qt5-base/mingw-w64-dynamic/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch index 6e3084dd..6632e2d1 100644 --- a/qt5-base/mingw-w64-dynamic/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch +++ b/qt5-base/mingw-w64-dynamic/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch @@ -1,4 +1,4 @@ -From e6dce973da0d16d725107c4c8b78ec3f4134b056 Mon Sep 17 00:00:00 2001 +From 25a9b54ce96ea574fe18bc6df5dc2ee571d22c36 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.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-dynamic/PKGBUILD b/qt5-base/mingw-w64-dynamic/PKGBUILD index d7344f75..94d77c81 100644 --- a/qt5-base/mingw-w64-dynamic/PKGBUILD +++ b/qt5-base/mingw-w64-dynamic/PKGBUILD @@ -19,7 +19,7 @@ _qt_module=qtbase pkgname=mingw-w64-qt5-base-dynamic -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 pkgdesc='A cross-platform application and UI framework, dynamic OpenGL backend (mingw-w64)' arch=('i686' 'x86_64') @@ -73,37 +73,37 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0030-Fix-linking-against-static-plugins-with-qmake.patch' '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch') sha256sums=('48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a' - 'fec4ca039859f9cc9685b34a7bd2da9e0fe24b5b1f85d7cd12665631fa797b44' - 'a0ea35e6eef4fed06360efa05e11b898f6033d893e1f1657a240cc03e43f076e' - 'cda13b2856fafe92b1369d6f2d01bd4d9bbdb0ec96c25e91e48ba25267c74c6c' - 'e13cd18ad781512862b5d288a53ebd09dc0e8bcc6fd3c4e833d0c593f28edd3a' - '273af9db2954c1d62e29d2a8328bbfa918bae617456aff6645df4bfb72796e0d' - '84a801d904fe308a56a9112af9aa73656eacf36ed7684449363281bfe4108543' - '190795aa778ae4e7bd8a74ce56504c697435129b73d2f0418511a4a230f68bc5' - '3fff6151dcf76bed12864dba51e4d04d39f8b3969c502a71ed547b527b310d7a' - '56240f509157a04ba1f1a23b0e058c2212d66e34aca68a688c15f5d8804bf174' - '02ca3a112f3e35749c141ed9c7e87a1fd0e82aa852541024b85f40a99d24d9fc' - '3b4dcce669d359953603257e621e6ebc30fb88f0f1c48b35ec443c574f2b05e8' - 'ba302124391aea5438e82195dd276edd8942f04cff7c6b85a9f0a5279749566b' - '68b5f9e0535c8d030161e67a0e8ee8bec2a80a9c8f69c09a4ad25fe98eb9dfd2' - 'ab46b53eb6272185a05d11820317db421be6e4440166967911e7d59d4f0a03d4' - 'c11a14a02e48e39e8212097915aed2347825a33022d367f322e34f3aaaf33f90' - '6d7c8fd7a162174355dd12399bd8f47f470557751dc117271c02e2e7b385d424' - '3c28f5658e0f960091c1991586167ee06bcecd8d843123fbf37ab78a1f5f30f0' - 'f9545474bd73be049dbf84fc2ff455e924e6fb29bb807809c384bf56a0227ad6' - '2998069e3a427c940f496d75df4cea05acb10d3e82c333a5c957e37f0543a0e8' - 'a301ddcd46b9b2fb58d592af88ac6acf81b2dbd328fb8c4c3ef49abffe343267' - '3d1257390ff151365d7fa29cde5f9c118310fe727243fb6f50ad30ab117c3384' - '19534087d5fc4b434859d68476ebd0647fdc04bf78f24943b7ab88cccf09b08a' - '5a57c66303d4a898dd5cccd9c639f367b50b508256fdf9c00ba5179bb00d701c' - '84b9e41b7320834a73edf1d192e511801feb51cd2de60ecc28e46982cd572df4' - '85bba2428090518dca878ca117299b065913f125c00cede57b31d37a02d0b787' - 'f0429a442805c2e0181e8b3b7814259586fdcba000bf324c0e367858c351f6b1' - 'c8479468cfb4a70fe65a1317f3fbacd40dcdc7a8bafc88648160509ee8b216e8' - 'a2eb9e683b12efe7fbb365749bdd5373e0fbf6438fe5342effab93f3a262d808' - '4c097460c443ec0ca47a41ea1ad6fdaa08e394b7a883d54da69bf9557ccbea31' - 'e1f2b8bfe9f3cdacceb6d9b73573ad39ea73ac0fce74448c7df0262b34b703bb' - '553c15e8cf230c3d3f3fa4c4a7a5a46d18027a4d6c7493f3eab56ca97bd906d9') + 'b3b49e5580f296f993a0aba0b34bd5ae2399f8d1809456878c1881451b14c27e' + '833b8fc2dd8f0bb4a914fb7f5018b28954752b2d54cec2388332885c929a9266' + 'e49f91d9f8f56afc856a9e143feb4ad9cf54c804f773374e5ccb6d1fc264a7bc' + '944288f57ac8cc9063a75a3a6b421c20a3e8b02a5fd5294f7da7df28c840302b' + 'b421b77303f6f03682c04f1bd1c2c63e07b120dc724de93a9248330d0080ee26' + '595fe18bbefb6f7e271a9daeefbd008d6350ef44b16b4b72c4d3183ba14509ee' + '238900f33394be14378b58445abe28dcd66343ed4f0760c8f944508c02ae831b' + 'bbde0b8ac3a9639a90e2937367deb769ea39ee55b036995a253ec8fdd1d2bd2c' + '859c065f54819266b33bab6b57f76f8c21065a48ff36104b191e218e31f20f9e' + '896c0b0d346f271f90609c6b49490ee86d3076ae620af1127503ee397a7664bb' + '15c69cd06b6e28100ad118ed045abef670acd41609351cd8e2652f1aeec9c8c4' + '499b3a1177e2340b5063553452b0a9a44f232e47839f03087939f52da38d0548' + 'bbe45a397cbc4c0303125937710e305c6dbb0e4a8713b4a520ff820208295ea8' + '3fedd43cccc7000271766f7b4ff85efafc9c65ce3b9f40f4c443a0f352518631' + '2b4854083457f85a82e8f05c23d3983095ff8aa1d1e0ea5cfe1f7e9731b061f8' + '6d4dc98c2b9e0ed743332797e1511262bda3b240e4685c2150a40415650c78f0' + '27b0eb4795713e1c6804dbb446970684c19cc2797f9e371eb2605c852d404b05' + '0fa5c3b49425cfb357e9d04bf993e065174d8b44e450dd134aa24187ed66e0e1' + 'd990f99f04dcf52cae5d7f6dd4394aae778683c2d9ebcb41b485129af8c2cf2f' + '7a395f7e9f26a650e09ad4b35563d5cb46c34dfae1c7de2f4dcf0e86f9dd1927' + 'd38cbc2d4566a3915475fa29ae2982173cd1339abdbff292f5cd520c7c741039' + '2b90d5b001da77692805a8fc9f6ac77ed8d3bfce48f52c89be1b13e915b5ef7c' + '5b973e490c3bbbc3aba7bf2b4fa704c38f92601c7736b483334025e2fc913285' + '73683e5bc8672c09c7c4e86b4787bbb5792570a511768509db6c7a7f45a58109' + 'cc8d458974c5168a7956d4682a63b0c15f9918256820ae908b88e5dd18d95811' + '3cb99ad9d910bad53ad8565d0be2fb6bb4a0d1075dbb73fd85cb2ffbe404d73e' + 'ea31c31ccbd47f6d77a1cf00768a9c247b368d79e3ba19dca4854c29f1a69a69' + 'e6ed01492dacf7367d8f444eb00e2bcdae1fc3b3f1648858e6e379b1565f8943' + 'd4cd03c966a6a1c37ce21f9e6bbd9deaadbb62f31a1a652ac12cd48a651fc47d' + 'd9f55e93cfde4bd6d46744697ae846490912342bdb84ad8c4ba0cf7689b472ab' + 'd5478d6cbcb1067bf1b8e3e52210f1416d734303e387facb165b92f281789436') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-base/mingw-w64-static/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/qt5-base/mingw-w64-static/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch index deb6dcd8..06b812e0 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 14c05838f544ef232c784aa546f2a11b4cf2593e Mon Sep 17 00:00:00 2001 +From ce90790a4f5c2dcf9398d846f63a6c6b50411dcb 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 @@ -161,5 +161,5 @@ index 5de482f23b..3c3d22c699 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.28.0 +2.29.2 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 255b881a..a7ba57b4 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 9fa2f31eb911ab3d64286af43961b7fe0b8afbea Mon Sep 17 00:00:00 2001 +From adbb14a78c0091c81925e5e79644ff8361e7b8e9 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.28.0 +2.29.2 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 e7c5c11f..31b28046 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 f6042da88367558cd294c2593c8cc3a6e8949667 Mon Sep 17 00:00:00 2001 +From 520b519d962852792bd4ac3c2d1206afa329b65e 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.28.0 +2.29.2 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 97d28d1f..7ad86637 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 dcc115680078ce6d4c9682736b9b1fdf09abec63 Mon Sep 17 00:00:00 2001 +From 45491f6d0b4d828f3b4ce6b76ec3c7d68cec6b06 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 @@ -62,5 +62,5 @@ index 5e446bd7e2..183cef2908 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.28.0 +2.29.2 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 cce33fa0..8fe274d0 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 a580a7539f99448391f2b16903f8746d610f131a Mon Sep 17 00:00:00 2001 +From 806b631662ffebfa38085e1f9e708aee2c19f1d9 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 ee9a41838b..8d1dcae85b 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.28.0 +2.29.2 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 8070d2ed..0bc5e996 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 006235cdee71011db441e0ea5265cb9c93937f6c Mon Sep 17 00:00:00 2001 +From 3d816219968cfcaacfd30b6011263c8bb4d975c0 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 e94084381c..8e4d11484f 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.28.0 +2.29.2 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 c777ccaf..040ddbb4 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 7122a1ddd12d8852ed31fc4cc2f6523f09f66363 Mon Sep 17 00:00:00 2001 +From 77037d64693385c1cdcc2814890567e79548b40d 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 @@ -9,7 +9,7 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 1f08795c57..7a5fc6ce7a 100644 +index c8c4864eca..be519a6d39 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -399,8 +399,10 @@ @@ -26,5 +26,5 @@ index 1f08795c57..7a5fc6ce7a 100644 ], "use": [ -- -2.28.0 +2.29.2 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 160eb9c3..82d8973a 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 4898dc76052b6d77f99e56270979a4bb251998c5 Mon Sep 17 00:00:00 2001 +From be0366f6b3d32f5c80038eca7d0c7ddd5375aa85 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,10 +9,10 @@ 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 50d69b740d..2433da3c20 100644 +index c273aeeef1..57c40030d8 100644 --- a/configure.json +++ b/configure.json -@@ -188,18 +188,23 @@ +@@ -190,18 +190,23 @@ "dbus": { "label": "D-Bus >= 1.2", "test": { @@ -54,5 +54,5 @@ index accaa4f5ed..4b11c74caa 100644 # include #else -- -2.28.0 +2.29.2 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 08f2ac7f..2d4c36b9 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 39cac9030befe8b2d490b3397c99fe5bbbd935b6 Mon Sep 17 00:00:00 2001 +From adb495753f647c7b78d923bb512e18003cd309a4 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,10 +12,10 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.json b/configure.json -index 2433da3c20..bde226843b 100644 +index 57c40030d8..2fa3c08440 100644 --- a/configure.json +++ b/configure.json -@@ -201,7 +201,7 @@ +@@ -203,7 +203,7 @@ { "libs": "", "builds": { @@ -25,5 +25,5 @@ index 2433da3c20..bde226843b 100644 }, "condition": "config.win32 && features.shared" -- -2.28.0 +2.29.2 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 682678f7..fc9a35eb 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 788846ebc422894f3e6aa8f39485e0ab88abe81a Mon Sep 17 00:00:00 2001 +From 8a8da9fb5e44acf747985254b8e4a0e663397c15 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 @@ -8,7 +8,7 @@ Subject: [PATCH 10/31] Fix linking against static freetype2 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 7a5fc6ce7a..b117f6fff6 100644 +index be519a6d39..d74fd3bc24 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -238,8 +238,11 @@ @@ -26,5 +26,5 @@ index 7a5fc6ce7a..b117f6fff6 100644 { "libs": "-lfreetype" } ], -- -2.28.0 +2.29.2 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 062c21f4..e03dd7e6 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 0fb1b65cd6c37419e0292b90a47e1d4682cbb042 Mon Sep 17 00:00:00 2001 +From 32692f0bf4ae8f35145d963fe95b82a11a20e6ca 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 @@ -8,7 +8,7 @@ Subject: [PATCH 11/31] Fix linking against static harfbuzz 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index b117f6fff6..2a0207920a 100644 +index d74fd3bc24..d6759ed96a 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -306,7 +306,11 @@ @@ -25,5 +25,5 @@ index b117f6fff6..2a0207920a 100644 }, "imf": { -- -2.28.0 +2.29.2 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 28b23b68..403c1e86 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 f67ffa152627401a4daba9dea452acc4a6cb5621 Mon Sep 17 00:00:00 2001 +From 3bb30ee7403e468705aa03e1d92f797d6ce38332 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 729269d0f4..128baafd56 100644 +index d7e3cc5ee2..e17c19fbae 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp @@ -53,6 +53,10 @@ @@ -24,5 +24,5 @@ index 729269d0f4..128baafd56 100644 #include -- -2.28.0 +2.29.2 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 2347714d..dda69c2f 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 d3170e1695855d72ca9a1e093a20d88ae12372ef Mon Sep 17 00:00:00 2001 +From 5d301704de074aeee8464bf9933296a437353a6f 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 28ccbeadcd..7262914c64 100644 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.28.0 +2.29.2 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 a9f801d1..366913c8 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 997237bc94e9f12d309e55a119002be7496dd280 Mon Sep 17 00:00:00 2001 +From 0f760f0e2b127ca9e765d2bbf4200b047bfa1a5e 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 7262914c64..852ba558be 100644 ] }, -- -2.28.0 +2.29.2 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 42308a30..449698a9 100644 --- a/qt5-base/mingw-w64-static/0015-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64-static/0015-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 7ef86aea3eaffb36605e5d53e8fd6759e0931699 Mon Sep 17 00:00:00 2001 +From 092e86f5dedf3173be832f868b60b1c306c42bfa 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 @@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644 CONFIG += static -- -2.28.0 +2.29.2 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 659a0ac7..c4cf6a4e 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 2b3b220623dd50228e3b47403a7e07fc73804400 Mon Sep 17 00:00:00 2001 +From fc76d4187ab337a5efb96d6b80099f5075df69ee 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.28.0 +2.29.2 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 1caa3e44..6a30f8cd 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 2509527af89dd69120d68c9a6959028a18649996 Mon Sep 17 00:00:00 2001 +From 2e0b11f0f0ba3e756f010b5948b24089be5e3aed 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 @@ -8,7 +8,7 @@ Subject: [PATCH 17/31] Use system zlib for build tools 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro -index c212ccbb6f..1bf9f1e4f9 100644 +index 24862a07db..698e6cfb95 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -158,7 +158,9 @@ macx { @@ -23,5 +23,5 @@ index c212ccbb6f..1bf9f1e4f9 100644 } else { CONFIG += no_core_dep -- -2.28.0 +2.29.2 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 77d47d8f..ae13c161 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 323393dab8e135dbfbba3e82b164765ac1c82a56 Mon Sep 17 00:00:00 2001 +From bd22c9c095f87d358ea2269bfdd19cc31078b0b1 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 @@ -17,10 +17,10 @@ Change-Id: I1de08df42d83d411aae519691cd3cde1fd6f3d1d 7 files changed, 74 insertions(+), 11 deletions(-) diff --git a/configure.pri b/configure.pri -index 3dedffcace..89938dfc32 100644 +index 49755f7abf..53c67f885b 100644 --- a/configure.pri +++ b/configure.pri -@@ -654,7 +654,12 @@ defineTest(qtConfOutput_machineTuple) { +@@ -659,7 +659,12 @@ defineTest(qtConfOutput_machineTuple) { defineTest(qtConfOutput_commitOptions) { # qdevice.pri needs to be written early, because the compile tests require it. @@ -34,7 +34,7 @@ index 3dedffcace..89938dfc32 100644 } # type (empty or 'host'), option name, default value -@@ -1393,3 +1398,12 @@ defineTest(createConfigStatus) { +@@ -1398,3 +1403,12 @@ defineTest(createConfigStatus) { QMAKE_POST_CONFIGURE += \ "createConfigStatus()" @@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.28.0 +2.29.2 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 30de2d56..7ae06611 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 366f840385b1e1f575bfb291806d5d0578e195af Mon Sep 17 00:00:00 2001 +From ae893f34a059c78cf274d1ed05c2d4c4bfb66218 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 @@ -94,5 +94,5 @@ index 183cef2908..03732df4a8 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.28.0 +2.29.2 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 e526054b..4bcd8f46 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 62658e138ba05a9c076cad73c6f007dcf4f7d3a7 Mon Sep 17 00:00:00 2001 +From 1b69d19dd9ef7d00a5eec9a22961c3232e19e5b1 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 @@ -501,5 +501,5 @@ index b550a52c60..acbe1cc33b 100644 +endif() \ No newline at end of file -- -2.28.0 +2.29.2 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 8f3a83e0..17ed0bed 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 ea8cf4e19c1f78d2f50ef20d92e89d32311eac7a Mon Sep 17 00:00:00 2001 +From 494194c5b6b2775e756e911f5befde85e9ce13e4 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 @@ -1091,5 +1091,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.28.0 +2.29.2 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 1931672c..d8d31d0b 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 340f5dd2ffd05d07d7bf66b5092eca5c99cb4737 Mon Sep 17 00:00:00 2001 +From 0f44180723f14ae9861b406238d973e0ca20c405 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 @@ -27,5 +27,5 @@ index 9da1361c95..5e802dea4c 100644 +set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\") +unset(_isExe) -- -2.28.0 +2.29.2 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 e4988af9..873c3996 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 5654cdfaf7565e7410e6a005e9083053aa6882b6 Mon Sep 17 00:00:00 2001 +From 0084c7966f46b5a64cac040a8c50c793ba680930 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 @@ -8,7 +8,7 @@ Subject: [PATCH 23/31] Use correct pkg-config --static flag 1 file changed, 3 insertions(+) diff --git a/configure.pri b/configure.pri -index 89938dfc32..121064e1f8 100644 +index 53c67f885b..8934b72291 100644 --- a/configure.pri +++ b/configure.pri @@ -351,6 +351,9 @@ defineTest(qtConfTest_detectPkgConfig) { @@ -22,5 +22,5 @@ index 89938dfc32..121064e1f8 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.28.0 +2.29.2 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 64053e97..2a0983f1 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 8394e428ad059d5ba5c647969b6f0e66178ddb53 Mon Sep 17 00:00:00 2001 +From e5389013ff78085fdfdfbf1da5b0644e784c916d 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 @@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.28.0 +2.29.2 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 e1fed849..beb723a6 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 ab4f998fa0c472b0f1c3b6ec84e505cfe2b8a94d Mon Sep 17 00:00:00 2001 +From d29a2b44643831e439755d11348b69dc9ed6d60b 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 @@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.28.0 +2.29.2 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 95407e46..f0ac0098 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 6a90a8a3b0d86865419cdd9f6e1a9a581cd8fc9c Mon Sep 17 00:00:00 2001 +From becf49560bdf91b82df7bec0bc06c54d7ab8c948 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 c5e0423273..0b12e22351 100644 }, "icu": { -- -2.28.0 +2.29.2 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 a47da0c5..0eef1044 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 ba1da244bc63546bf22b7f4be8164c8c63917510 Mon Sep 17 00:00:00 2001 +From 2fd3c54980c0be5efa03f64c8998287d683ff54f 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,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best 1 file changed, 1 deletion(-) diff --git a/configure.json b/configure.json -index bde226843b..653ed122d9 100644 +index 2fa3c08440..d96d2a6ecb 100644 --- a/configure.json +++ b/configure.json -@@ -770,7 +770,6 @@ +@@ -772,7 +772,6 @@ "pkg-config": { "label": "Using pkg-config", "autoDetect": "!config.darwin && !config.win32", @@ -21,5 +21,5 @@ index bde226843b..653ed122d9 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.28.0 +2.29.2 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 819fb97a..14e719aa 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 c5a084e56a5c766909c6513e673ec5fbb2fde4c6 Mon Sep 17 00:00:00 2001 +From e6e16f20966d91dd3c0020d4784d04e79b95613f 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 @@ -41,5 +41,5 @@ index 03732df4a8..602f7609f5 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.28.0 +2.29.2 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 54d6ba04..25482a8a 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 29c9cbb846b7c55894d95ceeffea80ce1485f03e Mon Sep 17 00:00:00 2001 +From d7d5e89ed1d5b7ea3962588eb719a85c85356f09 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 @@ -172,5 +172,5 @@ index 50a3bb41a9..53c011642f 100644 include(windows.pri) -- -2.28.0 +2.29.2 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 88595eea..a306ece1 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 ed933add3678150e845c63523cee9c09f02538fd Mon Sep 17 00:00:00 2001 +From cd3c5ceea13a08c8eea88eea90b24a2cacf816a3 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 b79b324b88..6a03b7a74b 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.28.0 +2.29.2 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 6e3084dd..6632e2d1 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 e6dce973da0d16d725107c4c8b78ec3f4134b056 Mon Sep 17 00:00:00 2001 +From 25a9b54ce96ea574fe18bc6df5dc2ee571d22c36 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.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD index ab22e8a9..1e3e3876 100644 --- a/qt5-base/mingw-w64-static/PKGBUILD +++ b/qt5-base/mingw-w64-static/PKGBUILD @@ -17,7 +17,7 @@ _qt_module=qtbase pkgname=mingw-w64-qt5-base-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)' arch=('any') @@ -67,38 +67,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=('33960404d579675b7210de103ed06a72613bfc4305443e278e2d32a3eb1f3d8c' - 'fec4ca039859f9cc9685b34a7bd2da9e0fe24b5b1f85d7cd12665631fa797b44' - 'a0ea35e6eef4fed06360efa05e11b898f6033d893e1f1657a240cc03e43f076e' - 'cda13b2856fafe92b1369d6f2d01bd4d9bbdb0ec96c25e91e48ba25267c74c6c' - 'e13cd18ad781512862b5d288a53ebd09dc0e8bcc6fd3c4e833d0c593f28edd3a' - '273af9db2954c1d62e29d2a8328bbfa918bae617456aff6645df4bfb72796e0d' - '84a801d904fe308a56a9112af9aa73656eacf36ed7684449363281bfe4108543' - '190795aa778ae4e7bd8a74ce56504c697435129b73d2f0418511a4a230f68bc5' - '3fff6151dcf76bed12864dba51e4d04d39f8b3969c502a71ed547b527b310d7a' - '56240f509157a04ba1f1a23b0e058c2212d66e34aca68a688c15f5d8804bf174' - '02ca3a112f3e35749c141ed9c7e87a1fd0e82aa852541024b85f40a99d24d9fc' - '3b4dcce669d359953603257e621e6ebc30fb88f0f1c48b35ec443c574f2b05e8' - 'ba302124391aea5438e82195dd276edd8942f04cff7c6b85a9f0a5279749566b' - '68b5f9e0535c8d030161e67a0e8ee8bec2a80a9c8f69c09a4ad25fe98eb9dfd2' - 'ab46b53eb6272185a05d11820317db421be6e4440166967911e7d59d4f0a03d4' - 'c11a14a02e48e39e8212097915aed2347825a33022d367f322e34f3aaaf33f90' - '6d7c8fd7a162174355dd12399bd8f47f470557751dc117271c02e2e7b385d424' - '3c28f5658e0f960091c1991586167ee06bcecd8d843123fbf37ab78a1f5f30f0' - 'f9545474bd73be049dbf84fc2ff455e924e6fb29bb807809c384bf56a0227ad6' - '2998069e3a427c940f496d75df4cea05acb10d3e82c333a5c957e37f0543a0e8' - 'a301ddcd46b9b2fb58d592af88ac6acf81b2dbd328fb8c4c3ef49abffe343267' - '3d1257390ff151365d7fa29cde5f9c118310fe727243fb6f50ad30ab117c3384' - '19534087d5fc4b434859d68476ebd0647fdc04bf78f24943b7ab88cccf09b08a' - '5a57c66303d4a898dd5cccd9c639f367b50b508256fdf9c00ba5179bb00d701c' - '84b9e41b7320834a73edf1d192e511801feb51cd2de60ecc28e46982cd572df4' - '85bba2428090518dca878ca117299b065913f125c00cede57b31d37a02d0b787' - 'f0429a442805c2e0181e8b3b7814259586fdcba000bf324c0e367858c351f6b1' - 'c8479468cfb4a70fe65a1317f3fbacd40dcdc7a8bafc88648160509ee8b216e8' - 'a2eb9e683b12efe7fbb365749bdd5373e0fbf6438fe5342effab93f3a262d808' - '4c097460c443ec0ca47a41ea1ad6fdaa08e394b7a883d54da69bf9557ccbea31' - 'e1f2b8bfe9f3cdacceb6d9b73573ad39ea73ac0fce74448c7df0262b34b703bb' - '553c15e8cf230c3d3f3fa4c4a7a5a46d18027a4d6c7493f3eab56ca97bd906d9') +sha256sums=('909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8' + 'b3b49e5580f296f993a0aba0b34bd5ae2399f8d1809456878c1881451b14c27e' + '833b8fc2dd8f0bb4a914fb7f5018b28954752b2d54cec2388332885c929a9266' + 'e49f91d9f8f56afc856a9e143feb4ad9cf54c804f773374e5ccb6d1fc264a7bc' + '944288f57ac8cc9063a75a3a6b421c20a3e8b02a5fd5294f7da7df28c840302b' + 'b421b77303f6f03682c04f1bd1c2c63e07b120dc724de93a9248330d0080ee26' + '595fe18bbefb6f7e271a9daeefbd008d6350ef44b16b4b72c4d3183ba14509ee' + '238900f33394be14378b58445abe28dcd66343ed4f0760c8f944508c02ae831b' + 'bbde0b8ac3a9639a90e2937367deb769ea39ee55b036995a253ec8fdd1d2bd2c' + '859c065f54819266b33bab6b57f76f8c21065a48ff36104b191e218e31f20f9e' + '896c0b0d346f271f90609c6b49490ee86d3076ae620af1127503ee397a7664bb' + '15c69cd06b6e28100ad118ed045abef670acd41609351cd8e2652f1aeec9c8c4' + '499b3a1177e2340b5063553452b0a9a44f232e47839f03087939f52da38d0548' + 'bbe45a397cbc4c0303125937710e305c6dbb0e4a8713b4a520ff820208295ea8' + '3fedd43cccc7000271766f7b4ff85efafc9c65ce3b9f40f4c443a0f352518631' + '2b4854083457f85a82e8f05c23d3983095ff8aa1d1e0ea5cfe1f7e9731b061f8' + '6d4dc98c2b9e0ed743332797e1511262bda3b240e4685c2150a40415650c78f0' + '27b0eb4795713e1c6804dbb446970684c19cc2797f9e371eb2605c852d404b05' + '0fa5c3b49425cfb357e9d04bf993e065174d8b44e450dd134aa24187ed66e0e1' + 'd990f99f04dcf52cae5d7f6dd4394aae778683c2d9ebcb41b485129af8c2cf2f' + '7a395f7e9f26a650e09ad4b35563d5cb46c34dfae1c7de2f4dcf0e86f9dd1927' + 'd38cbc2d4566a3915475fa29ae2982173cd1339abdbff292f5cd520c7c741039' + '2b90d5b001da77692805a8fc9f6ac77ed8d3bfce48f52c89be1b13e915b5ef7c' + '5b973e490c3bbbc3aba7bf2b4fa704c38f92601c7736b483334025e2fc913285' + '73683e5bc8672c09c7c4e86b4787bbb5792570a511768509db6c7a7f45a58109' + 'cc8d458974c5168a7956d4682a63b0c15f9918256820ae908b88e5dd18d95811' + '3cb99ad9d910bad53ad8565d0be2fb6bb4a0d1075dbb73fd85cb2ffbe404d73e' + 'ea31c31ccbd47f6d77a1cf00768a9c247b368d79e3ba19dca4854c29f1a69a69' + 'e6ed01492dacf7367d8f444eb00e2bcdae1fc3b3f1648858e6e379b1565f8943' + 'd4cd03c966a6a1c37ce21f9e6bbd9deaadbb62f31a1a652ac12cd48a651fc47d' + 'd9f55e93cfde4bd6d46744697ae846490912342bdb84ad8c4ba0cf7689b472ab' + 'd5478d6cbcb1067bf1b8e3e52210f1416d734303e387facb165b92f281789436') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-base/mingw-w64-static/qtbase-sha256.txt b/qt5-base/mingw-w64-static/qtbase-sha256.txt index aec9cc6e..f34593c4 100644 --- a/qt5-base/mingw-w64-static/qtbase-sha256.txt +++ b/qt5-base/mingw-w64-static/qtbase-sha256.txt @@ -1 +1 @@ -33960404d579675b7210de103ed06a72613bfc4305443e278e2d32a3eb1f3d8c +909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 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 deb6dcd8..06b812e0 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 14c05838f544ef232c784aa546f2a11b4cf2593e Mon Sep 17 00:00:00 2001 +From ce90790a4f5c2dcf9398d846f63a6c6b50411dcb 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 @@ -161,5 +161,5 @@ index 5de482f23b..3c3d22c699 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.28.0 +2.29.2 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 255b881a..a7ba57b4 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 9fa2f31eb911ab3d64286af43961b7fe0b8afbea Mon Sep 17 00:00:00 2001 +From adbb14a78c0091c81925e5e79644ff8361e7b8e9 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.28.0 +2.29.2 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 e7c5c11f..31b28046 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 f6042da88367558cd294c2593c8cc3a6e8949667 Mon Sep 17 00:00:00 2001 +From 520b519d962852792bd4ac3c2d1206afa329b65e 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.28.0 +2.29.2 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 97d28d1f..7ad86637 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 dcc115680078ce6d4c9682736b9b1fdf09abec63 Mon Sep 17 00:00:00 2001 +From 45491f6d0b4d828f3b4ce6b76ec3c7d68cec6b06 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 @@ -62,5 +62,5 @@ index 5e446bd7e2..183cef2908 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.28.0 +2.29.2 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 cce33fa0..8fe274d0 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 a580a7539f99448391f2b16903f8746d610f131a Mon Sep 17 00:00:00 2001 +From 806b631662ffebfa38085e1f9e708aee2c19f1d9 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 ee9a41838b..8d1dcae85b 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.28.0 +2.29.2 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 8070d2ed..0bc5e996 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 006235cdee71011db441e0ea5265cb9c93937f6c Mon Sep 17 00:00:00 2001 +From 3d816219968cfcaacfd30b6011263c8bb4d975c0 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 e94084381c..8e4d11484f 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.28.0 +2.29.2 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 c777ccaf..040ddbb4 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 7122a1ddd12d8852ed31fc4cc2f6523f09f66363 Mon Sep 17 00:00:00 2001 +From 77037d64693385c1cdcc2814890567e79548b40d 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 @@ -9,7 +9,7 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 1f08795c57..7a5fc6ce7a 100644 +index c8c4864eca..be519a6d39 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -399,8 +399,10 @@ @@ -26,5 +26,5 @@ index 1f08795c57..7a5fc6ce7a 100644 ], "use": [ -- -2.28.0 +2.29.2 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 160eb9c3..82d8973a 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 4898dc76052b6d77f99e56270979a4bb251998c5 Mon Sep 17 00:00:00 2001 +From be0366f6b3d32f5c80038eca7d0c7ddd5375aa85 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,10 +9,10 @@ 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 50d69b740d..2433da3c20 100644 +index c273aeeef1..57c40030d8 100644 --- a/configure.json +++ b/configure.json -@@ -188,18 +188,23 @@ +@@ -190,18 +190,23 @@ "dbus": { "label": "D-Bus >= 1.2", "test": { @@ -54,5 +54,5 @@ index accaa4f5ed..4b11c74caa 100644 # include #else -- -2.28.0 +2.29.2 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 08f2ac7f..2d4c36b9 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 39cac9030befe8b2d490b3397c99fe5bbbd935b6 Mon Sep 17 00:00:00 2001 +From adb495753f647c7b78d923bb512e18003cd309a4 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,10 +12,10 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.json b/configure.json -index 2433da3c20..bde226843b 100644 +index 57c40030d8..2fa3c08440 100644 --- a/configure.json +++ b/configure.json -@@ -201,7 +201,7 @@ +@@ -203,7 +203,7 @@ { "libs": "", "builds": { @@ -25,5 +25,5 @@ index 2433da3c20..bde226843b 100644 }, "condition": "config.win32 && features.shared" -- -2.28.0 +2.29.2 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 682678f7..fc9a35eb 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 788846ebc422894f3e6aa8f39485e0ab88abe81a Mon Sep 17 00:00:00 2001 +From 8a8da9fb5e44acf747985254b8e4a0e663397c15 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 @@ -8,7 +8,7 @@ Subject: [PATCH 10/31] Fix linking against static freetype2 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index 7a5fc6ce7a..b117f6fff6 100644 +index be519a6d39..d74fd3bc24 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -238,8 +238,11 @@ @@ -26,5 +26,5 @@ index 7a5fc6ce7a..b117f6fff6 100644 { "libs": "-lfreetype" } ], -- -2.28.0 +2.29.2 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 062c21f4..e03dd7e6 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 0fb1b65cd6c37419e0292b90a47e1d4682cbb042 Mon Sep 17 00:00:00 2001 +From 32692f0bf4ae8f35145d963fe95b82a11a20e6ca 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 @@ -8,7 +8,7 @@ Subject: [PATCH 11/31] Fix linking against static harfbuzz 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/configure.json b/src/gui/configure.json -index b117f6fff6..2a0207920a 100644 +index d74fd3bc24..d6759ed96a 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -306,7 +306,11 @@ @@ -25,5 +25,5 @@ index b117f6fff6..2a0207920a 100644 }, "imf": { -- -2.28.0 +2.29.2 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 28b23b68..403c1e86 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 f67ffa152627401a4daba9dea452acc4a6cb5621 Mon Sep 17 00:00:00 2001 +From 3bb30ee7403e468705aa03e1d92f797d6ce38332 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 729269d0f4..128baafd56 100644 +index d7e3cc5ee2..e17c19fbae 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp @@ -53,6 +53,10 @@ @@ -24,5 +24,5 @@ index 729269d0f4..128baafd56 100644 #include -- -2.28.0 +2.29.2 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 2347714d..dda69c2f 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 d3170e1695855d72ca9a1e093a20d88ae12372ef Mon Sep 17 00:00:00 2001 +From 5d301704de074aeee8464bf9933296a437353a6f 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 28ccbeadcd..7262914c64 100644 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.28.0 +2.29.2 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 a9f801d1..366913c8 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 997237bc94e9f12d309e55a119002be7496dd280 Mon Sep 17 00:00:00 2001 +From 0f760f0e2b127ca9e765d2bbf4200b047bfa1a5e 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 7262914c64..852ba558be 100644 ] }, -- -2.28.0 +2.29.2 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 42308a30..449698a9 100644 --- a/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 7ef86aea3eaffb36605e5d53e8fd6759e0931699 Mon Sep 17 00:00:00 2001 +From 092e86f5dedf3173be832f868b60b1c306c42bfa 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 @@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644 CONFIG += static -- -2.28.0 +2.29.2 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 659a0ac7..c4cf6a4e 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 2b3b220623dd50228e3b47403a7e07fc73804400 Mon Sep 17 00:00:00 2001 +From fc76d4187ab337a5efb96d6b80099f5075df69ee 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.28.0 +2.29.2 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 1caa3e44..6a30f8cd 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 2509527af89dd69120d68c9a6959028a18649996 Mon Sep 17 00:00:00 2001 +From 2e0b11f0f0ba3e756f010b5948b24089be5e3aed 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 @@ -8,7 +8,7 @@ Subject: [PATCH 17/31] Use system zlib for build tools 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro -index c212ccbb6f..1bf9f1e4f9 100644 +index 24862a07db..698e6cfb95 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -158,7 +158,9 @@ macx { @@ -23,5 +23,5 @@ index c212ccbb6f..1bf9f1e4f9 100644 } else { CONFIG += no_core_dep -- -2.28.0 +2.29.2 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 77d47d8f..ae13c161 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 323393dab8e135dbfbba3e82b164765ac1c82a56 Mon Sep 17 00:00:00 2001 +From bd22c9c095f87d358ea2269bfdd19cc31078b0b1 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 @@ -17,10 +17,10 @@ Change-Id: I1de08df42d83d411aae519691cd3cde1fd6f3d1d 7 files changed, 74 insertions(+), 11 deletions(-) diff --git a/configure.pri b/configure.pri -index 3dedffcace..89938dfc32 100644 +index 49755f7abf..53c67f885b 100644 --- a/configure.pri +++ b/configure.pri -@@ -654,7 +654,12 @@ defineTest(qtConfOutput_machineTuple) { +@@ -659,7 +659,12 @@ defineTest(qtConfOutput_machineTuple) { defineTest(qtConfOutput_commitOptions) { # qdevice.pri needs to be written early, because the compile tests require it. @@ -34,7 +34,7 @@ index 3dedffcace..89938dfc32 100644 } # type (empty or 'host'), option name, default value -@@ -1393,3 +1398,12 @@ defineTest(createConfigStatus) { +@@ -1398,3 +1403,12 @@ defineTest(createConfigStatus) { QMAKE_POST_CONFIGURE += \ "createConfigStatus()" @@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst INSTALLS += mkspecs -- -2.28.0 +2.29.2 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 30de2d56..7ae06611 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 366f840385b1e1f575bfb291806d5d0578e195af Mon Sep 17 00:00:00 2001 +From ae893f34a059c78cf274d1ed05c2d4c4bfb66218 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 @@ -94,5 +94,5 @@ index 183cef2908..03732df4a8 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.28.0 +2.29.2 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 e526054b..4bcd8f46 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 62658e138ba05a9c076cad73c6f007dcf4f7d3a7 Mon Sep 17 00:00:00 2001 +From 1b69d19dd9ef7d00a5eec9a22961c3232e19e5b1 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 @@ -501,5 +501,5 @@ index b550a52c60..acbe1cc33b 100644 +endif() \ No newline at end of file -- -2.28.0 +2.29.2 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 8f3a83e0..17ed0bed 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 ea8cf4e19c1f78d2f50ef20d92e89d32311eac7a Mon Sep 17 00:00:00 2001 +From 494194c5b6b2775e756e911f5befde85e9ce13e4 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 @@ -1091,5 +1091,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.28.0 +2.29.2 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 1931672c..d8d31d0b 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 340f5dd2ffd05d07d7bf66b5092eca5c99cb4737 Mon Sep 17 00:00:00 2001 +From 0f44180723f14ae9861b406238d973e0ca20c405 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 @@ -27,5 +27,5 @@ index 9da1361c95..5e802dea4c 100644 +set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\") +unset(_isExe) -- -2.28.0 +2.29.2 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 e4988af9..873c3996 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 5654cdfaf7565e7410e6a005e9083053aa6882b6 Mon Sep 17 00:00:00 2001 +From 0084c7966f46b5a64cac040a8c50c793ba680930 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 @@ -8,7 +8,7 @@ Subject: [PATCH 23/31] Use correct pkg-config --static flag 1 file changed, 3 insertions(+) diff --git a/configure.pri b/configure.pri -index 89938dfc32..121064e1f8 100644 +index 53c67f885b..8934b72291 100644 --- a/configure.pri +++ b/configure.pri @@ -351,6 +351,9 @@ defineTest(qtConfTest_detectPkgConfig) { @@ -22,5 +22,5 @@ index 89938dfc32..121064e1f8 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.28.0 +2.29.2 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 64053e97..2a0983f1 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 8394e428ad059d5ba5c647969b6f0e66178ddb53 Mon Sep 17 00:00:00 2001 +From e5389013ff78085fdfdfbf1da5b0644e784c916d 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 @@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.28.0 +2.29.2 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 e1fed849..beb723a6 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 ab4f998fa0c472b0f1c3b6ec84e505cfe2b8a94d Mon Sep 17 00:00:00 2001 +From d29a2b44643831e439755d11348b69dc9ed6d60b 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 @@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.28.0 +2.29.2 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 95407e46..f0ac0098 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 6a90a8a3b0d86865419cdd9f6e1a9a581cd8fc9c Mon Sep 17 00:00:00 2001 +From becf49560bdf91b82df7bec0bc06c54d7ab8c948 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 c5e0423273..0b12e22351 100644 }, "icu": { -- -2.28.0 +2.29.2 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 a47da0c5..0eef1044 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 ba1da244bc63546bf22b7f4be8164c8c63917510 Mon Sep 17 00:00:00 2001 +From 2fd3c54980c0be5efa03f64c8998287d683ff54f 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,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best 1 file changed, 1 deletion(-) diff --git a/configure.json b/configure.json -index bde226843b..653ed122d9 100644 +index 2fa3c08440..d96d2a6ecb 100644 --- a/configure.json +++ b/configure.json -@@ -770,7 +770,6 @@ +@@ -772,7 +772,6 @@ "pkg-config": { "label": "Using pkg-config", "autoDetect": "!config.darwin && !config.win32", @@ -21,5 +21,5 @@ index bde226843b..653ed122d9 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.28.0 +2.29.2 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 819fb97a..14e719aa 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 c5a084e56a5c766909c6513e673ec5fbb2fde4c6 Mon Sep 17 00:00:00 2001 +From e6e16f20966d91dd3c0020d4784d04e79b95613f 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 @@ -41,5 +41,5 @@ index 03732df4a8..602f7609f5 100644 int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) -- -2.28.0 +2.29.2 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 54d6ba04..25482a8a 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 29c9cbb846b7c55894d95ceeffea80ce1485f03e Mon Sep 17 00:00:00 2001 +From d7d5e89ed1d5b7ea3962588eb719a85c85356f09 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 @@ -172,5 +172,5 @@ index 50a3bb41a9..53c011642f 100644 include(windows.pri) -- -2.28.0 +2.29.2 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 88595eea..a306ece1 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 ed933add3678150e845c63523cee9c09f02538fd Mon Sep 17 00:00:00 2001 +From cd3c5ceea13a08c8eea88eea90b24a2cacf816a3 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 b79b324b88..6a03b7a74b 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.28.0 +2.29.2 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 6e3084dd..6632e2d1 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 e6dce973da0d16d725107c4c8b78ec3f4134b056 Mon Sep 17 00:00:00 2001 +From 25a9b54ce96ea574fe18bc6df5dc2ee571d22c36 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.28.0 +2.29.2 diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD index 97538483..b6221dfa 100644 --- a/qt5-base/mingw-w64/PKGBUILD +++ b/qt5-base/mingw-w64/PKGBUILD @@ -17,7 +17,7 @@ _qt_module=qtbase pkgname=mingw-w64-qt5-base -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)' arch=('i686' 'x86_64') @@ -66,38 +66,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=('33960404d579675b7210de103ed06a72613bfc4305443e278e2d32a3eb1f3d8c' - 'fec4ca039859f9cc9685b34a7bd2da9e0fe24b5b1f85d7cd12665631fa797b44' - 'a0ea35e6eef4fed06360efa05e11b898f6033d893e1f1657a240cc03e43f076e' - 'cda13b2856fafe92b1369d6f2d01bd4d9bbdb0ec96c25e91e48ba25267c74c6c' - 'e13cd18ad781512862b5d288a53ebd09dc0e8bcc6fd3c4e833d0c593f28edd3a' - '273af9db2954c1d62e29d2a8328bbfa918bae617456aff6645df4bfb72796e0d' - '84a801d904fe308a56a9112af9aa73656eacf36ed7684449363281bfe4108543' - '190795aa778ae4e7bd8a74ce56504c697435129b73d2f0418511a4a230f68bc5' - '3fff6151dcf76bed12864dba51e4d04d39f8b3969c502a71ed547b527b310d7a' - '56240f509157a04ba1f1a23b0e058c2212d66e34aca68a688c15f5d8804bf174' - '02ca3a112f3e35749c141ed9c7e87a1fd0e82aa852541024b85f40a99d24d9fc' - '3b4dcce669d359953603257e621e6ebc30fb88f0f1c48b35ec443c574f2b05e8' - 'ba302124391aea5438e82195dd276edd8942f04cff7c6b85a9f0a5279749566b' - '68b5f9e0535c8d030161e67a0e8ee8bec2a80a9c8f69c09a4ad25fe98eb9dfd2' - 'ab46b53eb6272185a05d11820317db421be6e4440166967911e7d59d4f0a03d4' - 'c11a14a02e48e39e8212097915aed2347825a33022d367f322e34f3aaaf33f90' - '6d7c8fd7a162174355dd12399bd8f47f470557751dc117271c02e2e7b385d424' - '3c28f5658e0f960091c1991586167ee06bcecd8d843123fbf37ab78a1f5f30f0' - 'f9545474bd73be049dbf84fc2ff455e924e6fb29bb807809c384bf56a0227ad6' - '2998069e3a427c940f496d75df4cea05acb10d3e82c333a5c957e37f0543a0e8' - 'a301ddcd46b9b2fb58d592af88ac6acf81b2dbd328fb8c4c3ef49abffe343267' - '3d1257390ff151365d7fa29cde5f9c118310fe727243fb6f50ad30ab117c3384' - '19534087d5fc4b434859d68476ebd0647fdc04bf78f24943b7ab88cccf09b08a' - '5a57c66303d4a898dd5cccd9c639f367b50b508256fdf9c00ba5179bb00d701c' - '84b9e41b7320834a73edf1d192e511801feb51cd2de60ecc28e46982cd572df4' - '85bba2428090518dca878ca117299b065913f125c00cede57b31d37a02d0b787' - 'f0429a442805c2e0181e8b3b7814259586fdcba000bf324c0e367858c351f6b1' - 'c8479468cfb4a70fe65a1317f3fbacd40dcdc7a8bafc88648160509ee8b216e8' - 'a2eb9e683b12efe7fbb365749bdd5373e0fbf6438fe5342effab93f3a262d808' - '4c097460c443ec0ca47a41ea1ad6fdaa08e394b7a883d54da69bf9557ccbea31' - 'e1f2b8bfe9f3cdacceb6d9b73573ad39ea73ac0fce74448c7df0262b34b703bb' - '553c15e8cf230c3d3f3fa4c4a7a5a46d18027a4d6c7493f3eab56ca97bd906d9') +sha256sums=('909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8' + 'b3b49e5580f296f993a0aba0b34bd5ae2399f8d1809456878c1881451b14c27e' + '833b8fc2dd8f0bb4a914fb7f5018b28954752b2d54cec2388332885c929a9266' + 'e49f91d9f8f56afc856a9e143feb4ad9cf54c804f773374e5ccb6d1fc264a7bc' + '944288f57ac8cc9063a75a3a6b421c20a3e8b02a5fd5294f7da7df28c840302b' + 'b421b77303f6f03682c04f1bd1c2c63e07b120dc724de93a9248330d0080ee26' + '595fe18bbefb6f7e271a9daeefbd008d6350ef44b16b4b72c4d3183ba14509ee' + '238900f33394be14378b58445abe28dcd66343ed4f0760c8f944508c02ae831b' + 'bbde0b8ac3a9639a90e2937367deb769ea39ee55b036995a253ec8fdd1d2bd2c' + '859c065f54819266b33bab6b57f76f8c21065a48ff36104b191e218e31f20f9e' + '896c0b0d346f271f90609c6b49490ee86d3076ae620af1127503ee397a7664bb' + '15c69cd06b6e28100ad118ed045abef670acd41609351cd8e2652f1aeec9c8c4' + '499b3a1177e2340b5063553452b0a9a44f232e47839f03087939f52da38d0548' + 'bbe45a397cbc4c0303125937710e305c6dbb0e4a8713b4a520ff820208295ea8' + '3fedd43cccc7000271766f7b4ff85efafc9c65ce3b9f40f4c443a0f352518631' + '2b4854083457f85a82e8f05c23d3983095ff8aa1d1e0ea5cfe1f7e9731b061f8' + '6d4dc98c2b9e0ed743332797e1511262bda3b240e4685c2150a40415650c78f0' + '27b0eb4795713e1c6804dbb446970684c19cc2797f9e371eb2605c852d404b05' + '0fa5c3b49425cfb357e9d04bf993e065174d8b44e450dd134aa24187ed66e0e1' + 'd990f99f04dcf52cae5d7f6dd4394aae778683c2d9ebcb41b485129af8c2cf2f' + '7a395f7e9f26a650e09ad4b35563d5cb46c34dfae1c7de2f4dcf0e86f9dd1927' + 'd38cbc2d4566a3915475fa29ae2982173cd1339abdbff292f5cd520c7c741039' + '2b90d5b001da77692805a8fc9f6ac77ed8d3bfce48f52c89be1b13e915b5ef7c' + '5b973e490c3bbbc3aba7bf2b4fa704c38f92601c7736b483334025e2fc913285' + '73683e5bc8672c09c7c4e86b4787bbb5792570a511768509db6c7a7f45a58109' + 'cc8d458974c5168a7956d4682a63b0c15f9918256820ae908b88e5dd18d95811' + '3cb99ad9d910bad53ad8565d0be2fb6bb4a0d1075dbb73fd85cb2ffbe404d73e' + 'ea31c31ccbd47f6d77a1cf00768a9c247b368d79e3ba19dca4854c29f1a69a69' + 'e6ed01492dacf7367d8f444eb00e2bcdae1fc3b3f1648858e6e379b1565f8943' + 'd4cd03c966a6a1c37ce21f9e6bbd9deaadbb62f31a1a652ac12cd48a651fc47d' + 'd9f55e93cfde4bd6d46744697ae846490912342bdb84ad8c4ba0cf7689b472ab' + 'd5478d6cbcb1067bf1b8e3e52210f1416d734303e387facb165b92f281789436') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-base/mingw-w64/qtbase-sha256.txt b/qt5-base/mingw-w64/qtbase-sha256.txt index aec9cc6e..f34593c4 100644 --- a/qt5-base/mingw-w64/qtbase-sha256.txt +++ b/qt5-base/mingw-w64/qtbase-sha256.txt @@ -1 +1 @@ -33960404d579675b7210de103ed06a72613bfc4305443e278e2d32a3eb1f3d8c +909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8 diff --git a/qt5-charts/mingw-w64-static/PKGBUILD b/qt5-charts/mingw-w64-static/PKGBUILD index 3fb4fecb..7b24f0f0 100644 --- a/qt5-charts/mingw-w64-static/PKGBUILD +++ b/qt5-charts/mingw-w64-static/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtcharts pkgname=mingw-w64-qt5-charts-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Provides a set of easy to use chart components (mingw-w64)" @@ -22,7 +22,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=('a59efbf095bf8a62c29f6fe90a3e943bbc7583d1d2fed16681675b923c45ef3b') +sha256sums=('e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-charts/mingw-w64-static/qtcharts-sha256.txt b/qt5-charts/mingw-w64-static/qtcharts-sha256.txt index e95b2f50..69d49ddb 100644 --- a/qt5-charts/mingw-w64-static/qtcharts-sha256.txt +++ b/qt5-charts/mingw-w64-static/qtcharts-sha256.txt @@ -1 +1 @@ -a59efbf095bf8a62c29f6fe90a3e943bbc7583d1d2fed16681675b923c45ef3b +e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 diff --git a/qt5-charts/mingw-w64/PKGBUILD b/qt5-charts/mingw-w64/PKGBUILD index 7409c5c0..ecd85000 100644 --- a/qt5-charts/mingw-w64/PKGBUILD +++ b/qt5-charts/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtcharts pkgname=mingw-w64-qt5-charts -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Provides a set of easy to use chart components (mingw-w64)" @@ -22,7 +22,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=('a59efbf095bf8a62c29f6fe90a3e943bbc7583d1d2fed16681675b923c45ef3b') +sha256sums=('e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11') _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 64eba4a9..c9fbc5a2 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.15.1 +pkgver=5.15.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 e95b2f50..69d49ddb 100644 --- a/qt5-charts/mingw-w64/qtcharts-sha256.txt +++ b/qt5-charts/mingw-w64/qtcharts-sha256.txt @@ -1 +1 @@ -a59efbf095bf8a62c29f6fe90a3e943bbc7583d1d2fed16681675b923c45ef3b +e0750e4195bd8a8b9758ab4d98d437edbe273cd3d289dd6a8f325df6d13f3d11 diff --git a/qt5-connectivity/mingw-w64-static/PKGBUILD b/qt5-connectivity/mingw-w64-static/PKGBUILD index d3ec436b..765473cf 100644 --- a/qt5-connectivity/mingw-w64-static/PKGBUILD +++ b/qt5-connectivity/mingw-w64-static/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtconnectivity pkgname=mingw-w64-qt5-connectivity-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Provides access to Bluetooth hardware (mingw-w64)" @@ -21,7 +21,7 @@ groups=('mingw-w64-qt5') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('53c30039d4f2301a1a66c646690436e1f8cce0a3fd212ca0783f346a115d8016') +sha256sums=('0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-connectivity/mingw-w64-static/qtconnectivity-sha256.txt b/qt5-connectivity/mingw-w64-static/qtconnectivity-sha256.txt index ca88ec12..3ea5b186 100644 --- a/qt5-connectivity/mingw-w64-static/qtconnectivity-sha256.txt +++ b/qt5-connectivity/mingw-w64-static/qtconnectivity-sha256.txt @@ -1 +1 @@ -53c30039d4f2301a1a66c646690436e1f8cce0a3fd212ca0783f346a115d8016 +0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 diff --git a/qt5-connectivity/mingw-w64/PKGBUILD b/qt5-connectivity/mingw-w64/PKGBUILD index 1a701c1c..199c3e7d 100644 --- a/qt5-connectivity/mingw-w64/PKGBUILD +++ b/qt5-connectivity/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtconnectivity pkgname=mingw-w64-qt5-connectivity -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Provides access to Bluetooth hardware (mingw-w64)" @@ -21,7 +21,7 @@ groups=('mingw-w64-qt5') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('53c30039d4f2301a1a66c646690436e1f8cce0a3fd212ca0783f346a115d8016') +sha256sums=('0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-connectivity/mingw-w64/PKGBUILD.sh.ep b/qt5-connectivity/mingw-w64/PKGBUILD.sh.ep index 81ec907e..4676d02f 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.15.1 +pkgver=5.15.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 ca88ec12..3ea5b186 100644 --- a/qt5-connectivity/mingw-w64/qtconnectivity-sha256.txt +++ b/qt5-connectivity/mingw-w64/qtconnectivity-sha256.txt @@ -1 +1 @@ -53c30039d4f2301a1a66c646690436e1f8cce0a3fd212ca0783f346a115d8016 +0380327871f76103e5b8c2a305988d76d352b6a982b3e7b3bc3cdc184c64bfa0 diff --git a/qt5-datavis3d/mingw-w64-static/PKGBUILD b/qt5-datavis3d/mingw-w64-static/PKGBUILD index c1ca870b..d2f68012 100644 --- a/qt5-datavis3d/mingw-w64-static/PKGBUILD +++ b/qt5-datavis3d/mingw-w64-static/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtdatavis3d pkgname=mingw-w64-qt5-datavis3d-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Qt Data Visualization module (mingw-w64)" @@ -22,7 +22,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=('89ed596ea452a8dd8223d094690606bcccc92962776584aceefcc13f56538c06') +sha256sums=('226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-datavis3d/mingw-w64-static/qtdatavis3d-sha256.txt b/qt5-datavis3d/mingw-w64-static/qtdatavis3d-sha256.txt index d105cbe9..d6238ccf 100644 --- a/qt5-datavis3d/mingw-w64-static/qtdatavis3d-sha256.txt +++ b/qt5-datavis3d/mingw-w64-static/qtdatavis3d-sha256.txt @@ -1 +1 @@ -89ed596ea452a8dd8223d094690606bcccc92962776584aceefcc13f56538c06 +226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd diff --git a/qt5-datavis3d/mingw-w64/PKGBUILD b/qt5-datavis3d/mingw-w64/PKGBUILD index e1e9c563..e231dc7d 100644 --- a/qt5-datavis3d/mingw-w64/PKGBUILD +++ b/qt5-datavis3d/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtdatavis3d pkgname=mingw-w64-qt5-datavis3d -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Qt Data Visualization module (mingw-w64)" @@ -22,7 +22,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=('89ed596ea452a8dd8223d094690606bcccc92962776584aceefcc13f56538c06') +sha256sums=('226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd') _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 fea8e427..cbc54a39 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.15.1 +pkgver=5.15.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 d105cbe9..d6238ccf 100644 --- a/qt5-datavis3d/mingw-w64/qtdatavis3d-sha256.txt +++ b/qt5-datavis3d/mingw-w64/qtdatavis3d-sha256.txt @@ -1 +1 @@ -89ed596ea452a8dd8223d094690606bcccc92962776584aceefcc13f56538c06 +226a6575d573ad78aca459709722c496c23aee526aa0c38eb7c93b0bea1eb6fd diff --git a/qt5-declarative/mingw-w64-static/0001-Ensure-static-plugins-are-exported.patch b/qt5-declarative/mingw-w64-static/0001-Ensure-static-plugins-are-exported.patch index 5929d8b9..b9bc384c 100644 --- a/qt5-declarative/mingw-w64-static/0001-Ensure-static-plugins-are-exported.patch +++ b/qt5-declarative/mingw-w64-static/0001-Ensure-static-plugins-are-exported.patch @@ -1,7 +1,7 @@ -From 20cd4da89edeec706cfc4472b0e9a2df58844a7c Mon Sep 17 00:00:00 2001 +From a77306009e96c2dd6d7a3c6eafe9ea39fcf99407 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 23 Oct 2016 01:18:13 +0200 -Subject: [PATCH 1/2] Ensure static plugins are exported +Subject: [PATCH 1/3] Ensure static plugins are exported --- src/qml/Qt5QmlConfigExtras.cmake.in | 2 +- @@ -19,5 +19,5 @@ index 4242143bca..bccb7b3146 100644 foreach(_other_plugin ${_qt5qml_other_plugins}) include(${_other_plugin} OPTIONAL) -- -2.28.0 +2.29.2 diff --git a/qt5-declarative/mingw-w64-static/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch b/qt5-declarative/mingw-w64-static/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch index 2e58a0d8..d0c427e7 100644 --- a/qt5-declarative/mingw-w64-static/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch +++ b/qt5-declarative/mingw-w64-static/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch @@ -1,7 +1,7 @@ -From c7d18dc02b67c3a7db5f2d32759829df27bc9f7d Mon Sep 17 00:00:00 2001 +From b147be462b1b727470243b83722a3f310d6f0876 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 4 Feb 2017 01:59:59 +0100 -Subject: [PATCH 2/2] Prevent exporting QML parser symbols on static build +Subject: [PATCH 2/3] Prevent exporting QML parser symbols on static build --- src/qml/parser/qqmljsglobal_p.h | 6 +++--- @@ -33,5 +33,5 @@ index bf8155c6ec..2bfa230bcc 100644 # define QML_PARSER_EXPORT # elif defined(QT_BUILD_QML_LIB) -- -2.28.0 +2.29.2 diff --git a/qt5-declarative/mingw-w64-static/0003-Disable-d3d12-requiring-fxc.exe.patch b/qt5-declarative/mingw-w64-static/0003-Disable-d3d12-requiring-fxc.exe.patch new file mode 100644 index 00000000..4763e3a2 --- /dev/null +++ b/qt5-declarative/mingw-w64-static/0003-Disable-d3d12-requiring-fxc.exe.patch @@ -0,0 +1,33 @@ +From 2346e6d7028640b03b58bb358d0569917e8c27e7 Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Fri, 20 Nov 2020 18:32:31 +0100 +Subject: [PATCH 3/3] Disable d3d12 requiring fxc.exe + +* fxc.exe is not provided by WINE or mingw-w64 and hence not available + in our build environment +* The version from https://github.com/mozilla/fxc2 builds but it does + not support all CLI options required by Qt's build system +* The build error looks like this: + ``` + make[5]: Entering directory '/build/mingw-w64-qt5-declarative/src/qtdeclarative-everywhere-src-5.15.2/build-i686-w64-mingw32-shared/src/plugins/scenegraph/d3d12' + fxc.exe /nologo /E VS_VertexColor /T vs_5_0 /Fh vs_vertexcolor.hlslh /build/mingw-w64-qt5-declarative/src/qtdeclarative-everywhere-src-5.15.2/src/plugins/scenegraph/d3d12/shaders/vertexcolor.hlsl + make[5]: fxc.exe: No such file or directory + make[5]: *** [Makefile.Release:233: vs_vertexcolor.hlslh] Error 127 + ``` +--- + src/plugins/scenegraph/scenegraph.pro | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/plugins/scenegraph/scenegraph.pro b/src/plugins/scenegraph/scenegraph.pro +index 39c0c0815c..9cc521a191 100644 +--- a/src/plugins/scenegraph/scenegraph.pro ++++ b/src/plugins/scenegraph/scenegraph.pro +@@ -1,5 +1,4 @@ + TEMPLATE = subdirs + QT_FOR_CONFIG += quick +-qtConfig(d3d12): SUBDIRS += d3d12 + qtConfig(openvg): SUBDIRS += openvg + +-- +2.29.2 + diff --git a/qt5-declarative/mingw-w64-static/PKGBUILD b/qt5-declarative/mingw-w64-static/PKGBUILD index 101cccab..89adbcf3 100755 --- a/qt5-declarative/mingw-w64-static/PKGBUILD +++ b/qt5-declarative/mingw-w64-static/PKGBUILD @@ -14,7 +14,7 @@ _qt_module=qtdeclarative pkgname=mingw-w64-qt5-declarative-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc='Classes for QML and JavaScript languages (mingw-w64)' @@ -27,10 +27,12 @@ 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-plugins-are-exported.patch' - '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch') -sha256sums=('7e30f0ccba61f9d71720b91d7f7523c23677f23cd96065cb71df1b0df329d768' - 'accdeab4cb49857442f680a6013a648108ec4f00078e492475794aa6cc98257e' - '7ff5093753aa819c6039de796e6ebffa235b51f57403e827b31a90e8c2ffbf60') + '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch' + '0003-Disable-d3d12-requiring-fxc.exe.patch') +sha256sums=('c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651' + '0ba64350a82e050cf86ab507999ed2d813496cc2ab1c738f3aa8da6cb6502460' + 'e476a3f619163911aab103304e271ad33194f1ddb9ef25d554f89994077ad792' + '83ed9816e4581ffe9c67ab2bd28488c5e3ba04c06e6ff558da8844c4a265c9f5') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-declarative/mingw-w64-static/qtdeclarative-sha256.txt b/qt5-declarative/mingw-w64-static/qtdeclarative-sha256.txt index 57759ad9..d9d8a92d 100644 --- a/qt5-declarative/mingw-w64-static/qtdeclarative-sha256.txt +++ b/qt5-declarative/mingw-w64-static/qtdeclarative-sha256.txt @@ -1 +1 @@ -7e30f0ccba61f9d71720b91d7f7523c23677f23cd96065cb71df1b0df329d768 +c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 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 5929d8b9..b9bc384c 100644 --- a/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch +++ b/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch @@ -1,7 +1,7 @@ -From 20cd4da89edeec706cfc4472b0e9a2df58844a7c Mon Sep 17 00:00:00 2001 +From a77306009e96c2dd6d7a3c6eafe9ea39fcf99407 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 23 Oct 2016 01:18:13 +0200 -Subject: [PATCH 1/2] Ensure static plugins are exported +Subject: [PATCH 1/3] Ensure static plugins are exported --- src/qml/Qt5QmlConfigExtras.cmake.in | 2 +- @@ -19,5 +19,5 @@ index 4242143bca..bccb7b3146 100644 foreach(_other_plugin ${_qt5qml_other_plugins}) include(${_other_plugin} OPTIONAL) -- -2.28.0 +2.29.2 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 2e58a0d8..d0c427e7 100644 --- a/qt5-declarative/mingw-w64/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch +++ b/qt5-declarative/mingw-w64/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch @@ -1,7 +1,7 @@ -From c7d18dc02b67c3a7db5f2d32759829df27bc9f7d Mon Sep 17 00:00:00 2001 +From b147be462b1b727470243b83722a3f310d6f0876 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 4 Feb 2017 01:59:59 +0100 -Subject: [PATCH 2/2] Prevent exporting QML parser symbols on static build +Subject: [PATCH 2/3] Prevent exporting QML parser symbols on static build --- src/qml/parser/qqmljsglobal_p.h | 6 +++--- @@ -33,5 +33,5 @@ index bf8155c6ec..2bfa230bcc 100644 # define QML_PARSER_EXPORT # elif defined(QT_BUILD_QML_LIB) -- -2.28.0 +2.29.2 diff --git a/qt5-declarative/mingw-w64/0003-Disable-d3d12-requiring-fxc.exe.patch b/qt5-declarative/mingw-w64/0003-Disable-d3d12-requiring-fxc.exe.patch new file mode 100644 index 00000000..4763e3a2 --- /dev/null +++ b/qt5-declarative/mingw-w64/0003-Disable-d3d12-requiring-fxc.exe.patch @@ -0,0 +1,33 @@ +From 2346e6d7028640b03b58bb358d0569917e8c27e7 Mon Sep 17 00:00:00 2001 +From: Martchus +Date: Fri, 20 Nov 2020 18:32:31 +0100 +Subject: [PATCH 3/3] Disable d3d12 requiring fxc.exe + +* fxc.exe is not provided by WINE or mingw-w64 and hence not available + in our build environment +* The version from https://github.com/mozilla/fxc2 builds but it does + not support all CLI options required by Qt's build system +* The build error looks like this: + ``` + make[5]: Entering directory '/build/mingw-w64-qt5-declarative/src/qtdeclarative-everywhere-src-5.15.2/build-i686-w64-mingw32-shared/src/plugins/scenegraph/d3d12' + fxc.exe /nologo /E VS_VertexColor /T vs_5_0 /Fh vs_vertexcolor.hlslh /build/mingw-w64-qt5-declarative/src/qtdeclarative-everywhere-src-5.15.2/src/plugins/scenegraph/d3d12/shaders/vertexcolor.hlsl + make[5]: fxc.exe: No such file or directory + make[5]: *** [Makefile.Release:233: vs_vertexcolor.hlslh] Error 127 + ``` +--- + src/plugins/scenegraph/scenegraph.pro | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/plugins/scenegraph/scenegraph.pro b/src/plugins/scenegraph/scenegraph.pro +index 39c0c0815c..9cc521a191 100644 +--- a/src/plugins/scenegraph/scenegraph.pro ++++ b/src/plugins/scenegraph/scenegraph.pro +@@ -1,5 +1,4 @@ + TEMPLATE = subdirs + QT_FOR_CONFIG += quick +-qtConfig(d3d12): SUBDIRS += d3d12 + qtConfig(openvg): SUBDIRS += openvg + +-- +2.29.2 + diff --git a/qt5-declarative/mingw-w64/PKGBUILD b/qt5-declarative/mingw-w64/PKGBUILD index 6cca8762..5156091d 100755 --- a/qt5-declarative/mingw-w64/PKGBUILD +++ b/qt5-declarative/mingw-w64/PKGBUILD @@ -14,7 +14,7 @@ _qt_module=qtdeclarative pkgname=mingw-w64-qt5-declarative -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Classes for QML and JavaScript languages (mingw-w64)' @@ -27,10 +27,12 @@ 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-plugins-are-exported.patch' - '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch') -sha256sums=('7e30f0ccba61f9d71720b91d7f7523c23677f23cd96065cb71df1b0df329d768' - 'accdeab4cb49857442f680a6013a648108ec4f00078e492475794aa6cc98257e' - '7ff5093753aa819c6039de796e6ebffa235b51f57403e827b31a90e8c2ffbf60') + '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch' + '0003-Disable-d3d12-requiring-fxc.exe.patch') +sha256sums=('c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651' + '0ba64350a82e050cf86ab507999ed2d813496cc2ab1c738f3aa8da6cb6502460' + 'e476a3f619163911aab103304e271ad33194f1ddb9ef25d554f89994077ad792' + '83ed9816e4581ffe9c67ab2bd28488c5e3ba04c06e6ff558da8844c4a265c9f5') _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 74230bc4..7ac9ee3f 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.15.1 +pkgver=5.15.2 pkgrel=1 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>) 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 57759ad9..d9d8a92d 100644 --- a/qt5-declarative/mingw-w64/qtdeclarative-sha256.txt +++ b/qt5-declarative/mingw-w64/qtdeclarative-sha256.txt @@ -1 +1 @@ -7e30f0ccba61f9d71720b91d7f7523c23677f23cd96065cb71df1b0df329d768 +c600d09716940f75d684f61c5bdaced797f623a86db1627da599027f6c635651 diff --git a/qt5-gamepad/mingw-w64-static/PKGBUILD b/qt5-gamepad/mingw-w64-static/PKGBUILD index 31507715..526ce095 100644 --- a/qt5-gamepad/mingw-w64-static/PKGBUILD +++ b/qt5-gamepad/mingw-w64-static/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtgamepad pkgname=mingw-w64-qt5-gamepad-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Adds support for getting events from gamepad devices (mingw-w64)" @@ -22,7 +22,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=('87ffcd5cd5588a0114b7ec76d9de5d486154a0833cd11f400c414d07402eb452') +sha256sums=('c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-gamepad/mingw-w64-static/qtgamepad-sha256.txt b/qt5-gamepad/mingw-w64-static/qtgamepad-sha256.txt index 38866fa3..b50ce075 100644 --- a/qt5-gamepad/mingw-w64-static/qtgamepad-sha256.txt +++ b/qt5-gamepad/mingw-w64-static/qtgamepad-sha256.txt @@ -1 +1 @@ -87ffcd5cd5588a0114b7ec76d9de5d486154a0833cd11f400c414d07402eb452 +c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c diff --git a/qt5-gamepad/mingw-w64/PKGBUILD b/qt5-gamepad/mingw-w64/PKGBUILD index c9428a8e..6d976320 100644 --- a/qt5-gamepad/mingw-w64/PKGBUILD +++ b/qt5-gamepad/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtgamepad pkgname=mingw-w64-qt5-gamepad -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Adds support for getting events from gamepad devices (mingw-w64)" @@ -22,7 +22,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=('87ffcd5cd5588a0114b7ec76d9de5d486154a0833cd11f400c414d07402eb452') +sha256sums=('c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c') _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 9d80c162..ec55dde4 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.15.1 +pkgver=5.15.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 38866fa3..b50ce075 100644 --- a/qt5-gamepad/mingw-w64/qtgamepad-sha256.txt +++ b/qt5-gamepad/mingw-w64/qtgamepad-sha256.txt @@ -1 +1 @@ -87ffcd5cd5588a0114b7ec76d9de5d486154a0833cd11f400c414d07402eb452 +c77611f7898326d69176ad67a9b886f617cdedc368ec29f223d63537d25b075c diff --git a/qt5-graphicaleffects/mingw-w64-static/PKGBUILD b/qt5-graphicaleffects/mingw-w64-static/PKGBUILD index be972159..ec451b7c 100644 --- a/qt5-graphicaleffects/mingw-w64-static/PKGBUILD +++ b/qt5-graphicaleffects/mingw-w64-static/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtgraphicaleffects pkgname=mingw-w64-qt5-graphicaleffects-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Graphical effects for use with Qt Quick 2 (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=('f4a4d3e1c6d8b0b200b6759ebb615344275957d56d2ef6a33641f853120466d1') +sha256sums=('ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-graphicaleffects/mingw-w64-static/qtgraphicaleffects-sha256.txt b/qt5-graphicaleffects/mingw-w64-static/qtgraphicaleffects-sha256.txt index 5951ad68..7f1eded4 100644 --- a/qt5-graphicaleffects/mingw-w64-static/qtgraphicaleffects-sha256.txt +++ b/qt5-graphicaleffects/mingw-w64-static/qtgraphicaleffects-sha256.txt @@ -1 +1 @@ -f4a4d3e1c6d8b0b200b6759ebb615344275957d56d2ef6a33641f853120466d1 +ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 diff --git a/qt5-graphicaleffects/mingw-w64/PKGBUILD b/qt5-graphicaleffects/mingw-w64/PKGBUILD index f9aea239..d13ae5f5 100644 --- a/qt5-graphicaleffects/mingw-w64/PKGBUILD +++ b/qt5-graphicaleffects/mingw-w64/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtgraphicaleffects pkgname=mingw-w64-qt5-graphicaleffects -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Graphical effects for use with Qt Quick 2 (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=('f4a4d3e1c6d8b0b200b6759ebb615344275957d56d2ef6a33641f853120466d1') +sha256sums=('ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4') _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 5edde84d..65f5d4a3 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.15.1 +pkgver=5.15.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 5951ad68..7f1eded4 100644 --- a/qt5-graphicaleffects/mingw-w64/qtgraphicaleffects-sha256.txt +++ b/qt5-graphicaleffects/mingw-w64/qtgraphicaleffects-sha256.txt @@ -1 +1 @@ -f4a4d3e1c6d8b0b200b6759ebb615344275957d56d2ef6a33641f853120466d1 +ec8d67f64967d5046410490b549c576f9b9e8b47ec68594ae84aa8870173dfe4 diff --git a/qt5-imageformats/mingw-w64-static/PKGBUILD b/qt5-imageformats/mingw-w64-static/PKGBUILD index 41ef1a61..6e4c8852 100644 --- a/qt5-imageformats/mingw-w64-static/PKGBUILD +++ b/qt5-imageformats/mingw-w64-static/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtimageformats pkgname=mingw-w64-qt5-imageformats-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)" @@ -27,7 +27,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=('75e72b4c11df97af3ff64ed26df16864ce1220a1cc730e49074ab9d72f658568') +sha256sums=('bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-imageformats/mingw-w64-static/qtimageformats-sha256.txt b/qt5-imageformats/mingw-w64-static/qtimageformats-sha256.txt index 66779553..39bf393a 100644 --- a/qt5-imageformats/mingw-w64-static/qtimageformats-sha256.txt +++ b/qt5-imageformats/mingw-w64-static/qtimageformats-sha256.txt @@ -1 +1 @@ -75e72b4c11df97af3ff64ed26df16864ce1220a1cc730e49074ab9d72f658568 +bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 diff --git a/qt5-imageformats/mingw-w64/PKGBUILD b/qt5-imageformats/mingw-w64/PKGBUILD index 08353299..4c855069 100644 --- a/qt5-imageformats/mingw-w64/PKGBUILD +++ b/qt5-imageformats/mingw-w64/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtimageformats pkgname=mingw-w64-qt5-imageformats -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)" @@ -27,7 +27,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=('75e72b4c11df97af3ff64ed26df16864ce1220a1cc730e49074ab9d72f658568') +sha256sums=('bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7') _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 1efa6e07..acbc4157 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.15.1 +pkgver=5.15.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 66779553..39bf393a 100644 --- a/qt5-imageformats/mingw-w64/qtimageformats-sha256.txt +++ b/qt5-imageformats/mingw-w64/qtimageformats-sha256.txt @@ -1 +1 @@ -75e72b4c11df97af3ff64ed26df16864ce1220a1cc730e49074ab9d72f658568 +bf8285c7ce04284527ab823ddc7cf48a1bb79131db3a7127342167f4814253d7 diff --git a/qt5-location/mingw-w64-static/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch b/qt5-location/mingw-w64-static/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch deleted file mode 100644 index 4c019f3f..00000000 --- a/qt5-location/mingw-w64-static/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7e32a0fe5a2c08e1a4e5d14e8d34139ccbd908c9 Mon Sep 17 00:00:00 2001 -From: Martchus -Date: Thu, 22 Dec 2016 22:30:59 +0100 -Subject: [PATCH] Ensure static 3rdparty libs are linked correctly - -Not sure whether this is still required in Qt 5.9.0 ---- - src/imports/location/location.pro | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/imports/location/location.pro b/src/imports/location/location.pro -index 40605806..fa82a012 100644 ---- a/src/imports/location/location.pro -+++ b/src/imports/location/location.pro -@@ -5,6 +5,9 @@ SOURCES += \ - - load(qml_plugin) - -+LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lclip2tri$$qtPlatformTargetSuffix() -lclipper$$qtPlatformTargetSuffix() -lpoly2tri$$qtPlatformTargetSuffix() -+QMAKE_LIBS_PRIVATE += -lclip2tri$$qtPlatformTargetSuffix() -lclipper$$qtPlatformTargetSuffix() -lpoly2tri$$qtPlatformTargetSuffix() -+ - OTHER_FILES += \ - plugin.json \ - qmldir --- -2.28.0 - diff --git a/qt5-location/mingw-w64-static/PKGBUILD b/qt5-location/mingw-w64-static/PKGBUILD index d93aa0f7..e2241bb4 100644 --- a/qt5-location/mingw-w64-static/PKGBUILD +++ b/qt5-location/mingw-w64-static/PKGBUILD @@ -8,8 +8,6 @@ # 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/qtlocation - # 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: @@ -17,7 +15,7 @@ _additional_qmake_args+='-- -no-feature-geoservices_mapbox -no-feature-geoservic _qt_module=qtlocation pkgname=mingw-w64-qt5-location-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc='Provides access to position, satellite and area monitoring classes (mingw-w64)' @@ -28,25 +26,14 @@ 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-Ensure-static-3rdparty-libs-are-linked-correctly.patch') -sha256sums=('093af763a70d126c4b9f6a22ebf8218fe95dc0151e40666b2389fdf55c9f1a2c' - '0f20c005812f031cfb70ac83f370a894819847c6e4447b2229bc50c1708dd2d0') +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +sha256sums=('984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' depends+=(${pkgname%-static}) # the static version relies on the shared version for build tools and headers _configurations+=('CONFIG+=no_smart_library_merge CONFIG+=static') -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-location/mingw-w64-static/qtlocation-sha256.txt b/qt5-location/mingw-w64-static/qtlocation-sha256.txt index 40c9289e..d4c17d76 100644 --- a/qt5-location/mingw-w64-static/qtlocation-sha256.txt +++ b/qt5-location/mingw-w64-static/qtlocation-sha256.txt @@ -1 +1 @@ -093af763a70d126c4b9f6a22ebf8218fe95dc0151e40666b2389fdf55c9f1a2c +984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 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 deleted file mode 100644 index 4c019f3f..00000000 --- a/qt5-location/mingw-w64/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7e32a0fe5a2c08e1a4e5d14e8d34139ccbd908c9 Mon Sep 17 00:00:00 2001 -From: Martchus -Date: Thu, 22 Dec 2016 22:30:59 +0100 -Subject: [PATCH] Ensure static 3rdparty libs are linked correctly - -Not sure whether this is still required in Qt 5.9.0 ---- - src/imports/location/location.pro | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/imports/location/location.pro b/src/imports/location/location.pro -index 40605806..fa82a012 100644 ---- a/src/imports/location/location.pro -+++ b/src/imports/location/location.pro -@@ -5,6 +5,9 @@ SOURCES += \ - - load(qml_plugin) - -+LIBS_PRIVATE += -L$$MODULE_BASE_OUTDIR/lib -lclip2tri$$qtPlatformTargetSuffix() -lclipper$$qtPlatformTargetSuffix() -lpoly2tri$$qtPlatformTargetSuffix() -+QMAKE_LIBS_PRIVATE += -lclip2tri$$qtPlatformTargetSuffix() -lclipper$$qtPlatformTargetSuffix() -lpoly2tri$$qtPlatformTargetSuffix() -+ - OTHER_FILES += \ - plugin.json \ - qmldir --- -2.28.0 - diff --git a/qt5-location/mingw-w64/PKGBUILD b/qt5-location/mingw-w64/PKGBUILD index 2f644443..a4f42686 100644 --- a/qt5-location/mingw-w64/PKGBUILD +++ b/qt5-location/mingw-w64/PKGBUILD @@ -8,8 +8,6 @@ # 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/qtlocation - # 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: @@ -17,7 +15,7 @@ _additional_qmake_args+='-- -no-feature-geoservices_mapbox -no-feature-geoservic _qt_module=qtlocation pkgname=mingw-w64-qt5-location -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc='Provides access to position, satellite and area monitoring classes (mingw-w64)' @@ -28,24 +26,13 @@ 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-Ensure-static-3rdparty-libs-are-linked-correctly.patch') -sha256sums=('093af763a70d126c4b9f6a22ebf8218fe95dc0151e40666b2389fdf55c9f1a2c' - '0f20c005812f031cfb70ac83f370a894819847c6e4447b2229bc50c1708dd2d0') +source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") +sha256sums=('984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' _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-location/mingw-w64/PKGBUILD.sh.ep b/qt5-location/mingw-w64/PKGBUILD.sh.ep index f00fb09c..9115a31d 100644 --- a/qt5-location/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-location/mingw-w64/PKGBUILD.sh.ep @@ -12,7 +12,7 @@ _additional_qmake_args+='-- -no-feature-geoservices_mapbox -no-feature-geoservic % end \ -pkgver=5.15.1 +pkgver=5.15.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 40c9289e..d4c17d76 100644 --- a/qt5-location/mingw-w64/qtlocation-sha256.txt +++ b/qt5-location/mingw-w64/qtlocation-sha256.txt @@ -1 +1 @@ -093af763a70d126c4b9f6a22ebf8218fe95dc0151e40666b2389fdf55c9f1a2c +984fcb09e108df49a8dac35d5ce6dffc49caafd2acb1c2f8a5173a6a21f392a0 diff --git a/qt5-multimedia/mingw-w64-static/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch b/qt5-multimedia/mingw-w64-static/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch index 5d9c1130..4b99a975 100644 --- a/qt5-multimedia/mingw-w64-static/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch +++ b/qt5-multimedia/mingw-w64-static/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch @@ -1,4 +1,4 @@ -From 50c01edfba9e3aaf8c1713e04618de8020cf2a62 Mon Sep 17 00:00:00 2001 +From 7499d7437e923b35e2f8355c1f5bf355ddc81096 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 25 Sep 2016 21:36:56 +0200 Subject: [PATCH 1/3] Recorder includes to prevent conflict with vsnprintf @@ -37,5 +37,5 @@ index 12693e4f..f759a8f2 100644 QT_BEGIN_NAMESPACE -- -2.28.0 +2.29.2 diff --git a/qt5-multimedia/mingw-w64-static/0002-Fix-build-with-ANGLE.patch b/qt5-multimedia/mingw-w64-static/0002-Fix-build-with-ANGLE.patch index d03459ba..0564c063 100644 --- a/qt5-multimedia/mingw-w64-static/0002-Fix-build-with-ANGLE.patch +++ b/qt5-multimedia/mingw-w64-static/0002-Fix-build-with-ANGLE.patch @@ -1,4 +1,4 @@ -From b9604145623a990bb08eb460309e838684a692b1 Mon Sep 17 00:00:00 2001 +From 4bbba7b3a80982ad0f4d3216d949d087ae9dbf00 Mon Sep 17 00:00:00 2001 From: Jose Santiago Date: Thu, 3 Nov 2016 14:36:10 -0500 Subject: [PATCH 2/3] Fix build with ANGLE @@ -25,5 +25,5 @@ index d8e2da6d..41ef4d96 100644 #endif -- -2.28.0 +2.29.2 diff --git a/qt5-multimedia/mingw-w64-static/0003-Workaround-multiple-definition-errors-with-amstrmid-.patch b/qt5-multimedia/mingw-w64-static/0003-Workaround-multiple-definition-errors-with-amstrmid-.patch index 02a2f70c..d6731d63 100644 --- a/qt5-multimedia/mingw-w64-static/0003-Workaround-multiple-definition-errors-with-amstrmid-.patch +++ b/qt5-multimedia/mingw-w64-static/0003-Workaround-multiple-definition-errors-with-amstrmid-.patch @@ -1,4 +1,4 @@ -From b29f98de79aed3c1905423ba6b1ebbb86eca29bb Mon Sep 17 00:00:00 2001 +From 852a1dd131d9000971455eefb6fa252b0c1226e2 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 23 May 2020 15:43:20 +0200 Subject: [PATCH 3/3] Workaround "multiple definition" errors with @@ -26,5 +26,5 @@ index 27bb3abb..0cce6f20 100644 include(common/common.pri) -- -2.28.0 +2.29.2 diff --git a/qt5-multimedia/mingw-w64-static/PKGBUILD b/qt5-multimedia/mingw-w64-static/PKGBUILD index f1075650..0c9bafcd 100644 --- a/qt5-multimedia/mingw-w64-static/PKGBUILD +++ b/qt5-multimedia/mingw-w64-static/PKGBUILD @@ -12,7 +12,7 @@ _qt_module=qtmultimedia pkgname=mingw-w64-qt5-multimedia-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)' @@ -27,10 +27,10 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch' '0002-Fix-build-with-ANGLE.patch' '0003-Workaround-multiple-definition-errors-with-amstrmid-.patch') -sha256sums=('ed6e75bec9c98559c0fbc91ff746185b1e1845139b2c7a5a843e1e8880697d99' - '98d1157f57558204355b94b2f1fba7cbd9bd9bb561a5d66a0a48ffaab2894569' - '8e189a64fd15bf2267cb58f3d3c23d0d2ad9eb8c5f07723546d5a6620c5915c3' - '63860dba39d8c30dad59c0d9b4fc17e4da6e1e212e41520dbb8912e034974a40') +sha256sums=('0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5' + '36bbaf9842fb930b4f17ae7ad2349b5dc9216492caeb7292f54d8fd7c0d66399' + 'b733514a287d915d74ddbbb901b2fae1a0c169becbadaf9bb63738392e383064' + '5ba3a72643af5e16b9f51ac9e5317d2f7e41dcb177f2201ac38ef0d0cd9a66e5') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-multimedia/mingw-w64-static/qtmultimedia-sha256.txt b/qt5-multimedia/mingw-w64-static/qtmultimedia-sha256.txt index 72f3c436..b851f120 100644 --- a/qt5-multimedia/mingw-w64-static/qtmultimedia-sha256.txt +++ b/qt5-multimedia/mingw-w64-static/qtmultimedia-sha256.txt @@ -1 +1 @@ -ed6e75bec9c98559c0fbc91ff746185b1e1845139b2c7a5a843e1e8880697d99 +0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 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 5d9c1130..4b99a975 100644 --- a/qt5-multimedia/mingw-w64/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch +++ b/qt5-multimedia/mingw-w64/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch @@ -1,4 +1,4 @@ -From 50c01edfba9e3aaf8c1713e04618de8020cf2a62 Mon Sep 17 00:00:00 2001 +From 7499d7437e923b35e2f8355c1f5bf355ddc81096 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 25 Sep 2016 21:36:56 +0200 Subject: [PATCH 1/3] Recorder includes to prevent conflict with vsnprintf @@ -37,5 +37,5 @@ index 12693e4f..f759a8f2 100644 QT_BEGIN_NAMESPACE -- -2.28.0 +2.29.2 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 d03459ba..0564c063 100644 --- a/qt5-multimedia/mingw-w64/0002-Fix-build-with-ANGLE.patch +++ b/qt5-multimedia/mingw-w64/0002-Fix-build-with-ANGLE.patch @@ -1,4 +1,4 @@ -From b9604145623a990bb08eb460309e838684a692b1 Mon Sep 17 00:00:00 2001 +From 4bbba7b3a80982ad0f4d3216d949d087ae9dbf00 Mon Sep 17 00:00:00 2001 From: Jose Santiago Date: Thu, 3 Nov 2016 14:36:10 -0500 Subject: [PATCH 2/3] Fix build with ANGLE @@ -25,5 +25,5 @@ index d8e2da6d..41ef4d96 100644 #endif -- -2.28.0 +2.29.2 diff --git a/qt5-multimedia/mingw-w64/0003-Workaround-multiple-definition-errors-with-amstrmid-.patch b/qt5-multimedia/mingw-w64/0003-Workaround-multiple-definition-errors-with-amstrmid-.patch index 02a2f70c..d6731d63 100644 --- a/qt5-multimedia/mingw-w64/0003-Workaround-multiple-definition-errors-with-amstrmid-.patch +++ b/qt5-multimedia/mingw-w64/0003-Workaround-multiple-definition-errors-with-amstrmid-.patch @@ -1,4 +1,4 @@ -From b29f98de79aed3c1905423ba6b1ebbb86eca29bb Mon Sep 17 00:00:00 2001 +From 852a1dd131d9000971455eefb6fa252b0c1226e2 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 23 May 2020 15:43:20 +0200 Subject: [PATCH 3/3] Workaround "multiple definition" errors with @@ -26,5 +26,5 @@ index 27bb3abb..0cce6f20 100644 include(common/common.pri) -- -2.28.0 +2.29.2 diff --git a/qt5-multimedia/mingw-w64/PKGBUILD b/qt5-multimedia/mingw-w64/PKGBUILD index f4632c1a..f082e0db 100644 --- a/qt5-multimedia/mingw-w64/PKGBUILD +++ b/qt5-multimedia/mingw-w64/PKGBUILD @@ -12,7 +12,7 @@ _qt_module=qtmultimedia pkgname=mingw-w64-qt5-multimedia -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)' @@ -27,10 +27,10 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch' '0002-Fix-build-with-ANGLE.patch' '0003-Workaround-multiple-definition-errors-with-amstrmid-.patch') -sha256sums=('ed6e75bec9c98559c0fbc91ff746185b1e1845139b2c7a5a843e1e8880697d99' - '98d1157f57558204355b94b2f1fba7cbd9bd9bb561a5d66a0a48ffaab2894569' - '8e189a64fd15bf2267cb58f3d3c23d0d2ad9eb8c5f07723546d5a6620c5915c3' - '63860dba39d8c30dad59c0d9b4fc17e4da6e1e212e41520dbb8912e034974a40') +sha256sums=('0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5' + '36bbaf9842fb930b4f17ae7ad2349b5dc9216492caeb7292f54d8fd7c0d66399' + 'b733514a287d915d74ddbbb901b2fae1a0c169becbadaf9bb63738392e383064' + '5ba3a72643af5e16b9f51ac9e5317d2f7e41dcb177f2201ac38ef0d0cd9a66e5') _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 7174e9e9..01fa6fdd 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.15.1 +pkgver=5.15.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 72f3c436..b851f120 100644 --- a/qt5-multimedia/mingw-w64/qtmultimedia-sha256.txt +++ b/qt5-multimedia/mingw-w64/qtmultimedia-sha256.txt @@ -1 +1 @@ -ed6e75bec9c98559c0fbc91ff746185b1e1845139b2c7a5a843e1e8880697d99 +0c3758810e5131aabcf76e4965e4c18b8911af54d9edd9305d2a8278d8346df5 diff --git a/qt5-networkauth/mingw-w64-static/PKGBUILD b/qt5-networkauth/mingw-w64-static/PKGBUILD index 5a6b5883..a5462ad8 100644 --- a/qt5-networkauth/mingw-w64-static/PKGBUILD +++ b/qt5-networkauth/mingw-w64-static/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtnetworkauth pkgname=mingw-w64-qt5-networkauth-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Network authentication module (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=('e5e37ae8f842e4bb66f1e719d8585ef71bc13c79545054fcd26072cd58e4d4c2') +sha256sums=('fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-networkauth/mingw-w64-static/qtnetworkauth-sha256.txt b/qt5-networkauth/mingw-w64-static/qtnetworkauth-sha256.txt index d95a93f0..abeb60a1 100644 --- a/qt5-networkauth/mingw-w64-static/qtnetworkauth-sha256.txt +++ b/qt5-networkauth/mingw-w64-static/qtnetworkauth-sha256.txt @@ -1 +1 @@ -e5e37ae8f842e4bb66f1e719d8585ef71bc13c79545054fcd26072cd58e4d4c2 +fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85 diff --git a/qt5-networkauth/mingw-w64/PKGBUILD b/qt5-networkauth/mingw-w64/PKGBUILD index ba949c0d..4aa28c48 100644 --- a/qt5-networkauth/mingw-w64/PKGBUILD +++ b/qt5-networkauth/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtnetworkauth pkgname=mingw-w64-qt5-networkauth -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Network authentication module (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=('e5e37ae8f842e4bb66f1e719d8585ef71bc13c79545054fcd26072cd58e4d4c2') +sha256sums=('fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85') _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 ea25bd90..8024842a 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.15.1 +pkgver=5.15.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 d95a93f0..abeb60a1 100644 --- a/qt5-networkauth/mingw-w64/qtnetworkauth-sha256.txt +++ b/qt5-networkauth/mingw-w64/qtnetworkauth-sha256.txt @@ -1 +1 @@ -e5e37ae8f842e4bb66f1e719d8585ef71bc13c79545054fcd26072cd58e4d4c2 +fcc2ec42faa68561efa8f00cd72e662fbc06563ebc6de1dc42d96bb2997acd85 diff --git a/qt5-quickcontrols/mingw-w64-static/PKGBUILD b/qt5-quickcontrols/mingw-w64-static/PKGBUILD index 172c1da6..0886c932 100644 --- a/qt5-quickcontrols/mingw-w64-static/PKGBUILD +++ b/qt5-quickcontrols/mingw-w64-static/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtquickcontrols pkgname=mingw-w64-qt5-quickcontrols-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (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=('0172f88779305aae57f3842538e91361ae9bc5ca2275ee5ce9d455309f0f2c7e') +sha256sums=('c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-quickcontrols/mingw-w64-static/qtquickcontrols-sha256.txt b/qt5-quickcontrols/mingw-w64-static/qtquickcontrols-sha256.txt index f6058894..aea02637 100644 --- a/qt5-quickcontrols/mingw-w64-static/qtquickcontrols-sha256.txt +++ b/qt5-quickcontrols/mingw-w64-static/qtquickcontrols-sha256.txt @@ -1 +1 @@ -0172f88779305aae57f3842538e91361ae9bc5ca2275ee5ce9d455309f0f2c7e +c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 diff --git a/qt5-quickcontrols/mingw-w64/PKGBUILD b/qt5-quickcontrols/mingw-w64/PKGBUILD index ac5d1b38..da51f66a 100644 --- a/qt5-quickcontrols/mingw-w64/PKGBUILD +++ b/qt5-quickcontrols/mingw-w64/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtquickcontrols pkgname=mingw-w64-qt5-quickcontrols -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (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=('0172f88779305aae57f3842538e91361ae9bc5ca2275ee5ce9d455309f0f2c7e') +sha256sums=('c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5') _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 cc7f8ccc..c82e831d 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.15.1 +pkgver=5.15.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 f6058894..aea02637 100644 --- a/qt5-quickcontrols/mingw-w64/qtquickcontrols-sha256.txt +++ b/qt5-quickcontrols/mingw-w64/qtquickcontrols-sha256.txt @@ -1 +1 @@ -0172f88779305aae57f3842538e91361ae9bc5ca2275ee5ce9d455309f0f2c7e +c393fb7384b1f047f10e91a6832cf3e6a4c2a41408b8cb2d05af2283e8549fb5 diff --git a/qt5-quickcontrols2/mingw-w64-static/PKGBUILD b/qt5-quickcontrols2/mingw-w64-static/PKGBUILD index 52d4efd6..775532db 100644 --- a/qt5-quickcontrols2/mingw-w64-static/PKGBUILD +++ b/qt5-quickcontrols2/mingw-w64-static/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtquickcontrols2 pkgname=mingw-w64-qt5-quickcontrols2-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (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=('e902b3baf9fe02a5bd675fc71118e282bb6a128c94f45be6f65d7d6db991f2af') +sha256sums=('671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-quickcontrols2/mingw-w64-static/qtquickcontrols2-sha256.txt b/qt5-quickcontrols2/mingw-w64-static/qtquickcontrols2-sha256.txt index c1323abb..8941e24e 100644 --- a/qt5-quickcontrols2/mingw-w64-static/qtquickcontrols2-sha256.txt +++ b/qt5-quickcontrols2/mingw-w64-static/qtquickcontrols2-sha256.txt @@ -1 +1 @@ -e902b3baf9fe02a5bd675fc71118e282bb6a128c94f45be6f65d7d6db991f2af +671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 diff --git a/qt5-quickcontrols2/mingw-w64/PKGBUILD b/qt5-quickcontrols2/mingw-w64/PKGBUILD index c3fb733b..1c3f79c9 100644 --- a/qt5-quickcontrols2/mingw-w64/PKGBUILD +++ b/qt5-quickcontrols2/mingw-w64/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtquickcontrols2 pkgname=mingw-w64-qt5-quickcontrols2 -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (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=('e902b3baf9fe02a5bd675fc71118e282bb6a128c94f45be6f65d7d6db991f2af') +sha256sums=('671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919') _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 cc7f8ccc..c82e831d 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.15.1 +pkgver=5.15.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 c1323abb..8941e24e 100644 --- a/qt5-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt +++ b/qt5-quickcontrols2/mingw-w64/qtquickcontrols2-sha256.txt @@ -1 +1 @@ -e902b3baf9fe02a5bd675fc71118e282bb6a128c94f45be6f65d7d6db991f2af +671b6ce5f4b8ecc94db622d5d5fb29ef4ff92819be08e5ea55bfcab579de8919 diff --git a/qt5-remoteobjects/mingw-w64-static/PKGBUILD b/qt5-remoteobjects/mingw-w64-static/PKGBUILD index 88a1f551..6188a7ec 100644 --- a/qt5-remoteobjects/mingw-w64-static/PKGBUILD +++ b/qt5-remoteobjects/mingw-w64-static/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtremoteobjects pkgname=mingw-w64-qt5-remoteobjects-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Inter-process communication (IPC) module developed for Qt (mingw-w64)" @@ -22,7 +22,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=('71b58fdac717645fa6f8b6ecb79b86841c540838877d100fabe2381175c4154e') +sha256sums=('6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-remoteobjects/mingw-w64-static/qtremoteobjects-sha256.txt b/qt5-remoteobjects/mingw-w64-static/qtremoteobjects-sha256.txt index 495ff2de..7394cbe4 100644 --- a/qt5-remoteobjects/mingw-w64-static/qtremoteobjects-sha256.txt +++ b/qt5-remoteobjects/mingw-w64-static/qtremoteobjects-sha256.txt @@ -1 +1 @@ -71b58fdac717645fa6f8b6ecb79b86841c540838877d100fabe2381175c4154e +6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 diff --git a/qt5-remoteobjects/mingw-w64/PKGBUILD b/qt5-remoteobjects/mingw-w64/PKGBUILD index 4bc3da30..14f52a5b 100644 --- a/qt5-remoteobjects/mingw-w64/PKGBUILD +++ b/qt5-remoteobjects/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtremoteobjects pkgname=mingw-w64-qt5-remoteobjects -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Inter-process communication (IPC) module developed for Qt (mingw-w64)" @@ -22,7 +22,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=('71b58fdac717645fa6f8b6ecb79b86841c540838877d100fabe2381175c4154e') +sha256sums=('6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2') _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 d0b6ae89..c3c087ac 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.15.1 +pkgver=5.15.2 pkgrel=1 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>) 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 495ff2de..7394cbe4 100644 --- a/qt5-remoteobjects/mingw-w64/qtremoteobjects-sha256.txt +++ b/qt5-remoteobjects/mingw-w64/qtremoteobjects-sha256.txt @@ -1 +1 @@ -71b58fdac717645fa6f8b6ecb79b86841c540838877d100fabe2381175c4154e +6781b6bc90888254ea77ce812736dac00c67fa4eeb3095f5cd65e4b9c15dcfc2 diff --git a/qt5-script/mingw-w64-static/PKGBUILD b/qt5-script/mingw-w64-static/PKGBUILD index 7c761d7c..317b6b92 100644 --- a/qt5-script/mingw-w64-static/PKGBUILD +++ b/qt5-script/mingw-w64-static/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtscript pkgname=mingw-w64-qt5-script-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility (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=('0a62152835363a9cc20558d0c2953ec03426324138578baa18fc2cc4d62b18ca') +sha256sums=('a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-script/mingw-w64-static/qtscript-sha256.txt b/qt5-script/mingw-w64-static/qtscript-sha256.txt index 84e1002e..716c55e5 100644 --- a/qt5-script/mingw-w64-static/qtscript-sha256.txt +++ b/qt5-script/mingw-w64-static/qtscript-sha256.txt @@ -1 +1 @@ -0a62152835363a9cc20558d0c2953ec03426324138578baa18fc2cc4d62b18ca +a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e diff --git a/qt5-script/mingw-w64/PKGBUILD b/qt5-script/mingw-w64/PKGBUILD index f846fb52..7cc80e21 100644 --- a/qt5-script/mingw-w64/PKGBUILD +++ b/qt5-script/mingw-w64/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtscript pkgname=mingw-w64-qt5-script -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility (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=('0a62152835363a9cc20558d0c2953ec03426324138578baa18fc2cc4d62b18ca') +sha256sums=('a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e') _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 81266464..4c505655 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.15.1 +pkgver=5.15.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 84e1002e..716c55e5 100644 --- a/qt5-script/mingw-w64/qtscript-sha256.txt +++ b/qt5-script/mingw-w64/qtscript-sha256.txt @@ -1 +1 @@ -0a62152835363a9cc20558d0c2953ec03426324138578baa18fc2cc4d62b18ca +a299715369afbd1caa4d7fa2875d442eab91adcaacafce54a36922442624673e diff --git a/qt5-scxml/mingw-w64-static/PKGBUILD b/qt5-scxml/mingw-w64-static/PKGBUILD index 191e78c5..a9f4a562 100644 --- a/qt5-scxml/mingw-w64-static/PKGBUILD +++ b/qt5-scxml/mingw-w64-static/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtscxml pkgname=mingw-w64-qt5-scxml-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Static and runtime integration of SCXML models into Qt code (mingw-w64)" @@ -21,7 +21,7 @@ groups=('mingw-w64-qt5') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('2289f8c1b51ac368cc0ba8a6a987b44d2c97b43697b00e64582e43afedffcd2b') +sha256sums=('60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-scxml/mingw-w64-static/qtscxml-sha256.txt b/qt5-scxml/mingw-w64-static/qtscxml-sha256.txt index 58af012e..4cbaf8bb 100644 --- a/qt5-scxml/mingw-w64-static/qtscxml-sha256.txt +++ b/qt5-scxml/mingw-w64-static/qtscxml-sha256.txt @@ -1 +1 @@ -2289f8c1b51ac368cc0ba8a6a987b44d2c97b43697b00e64582e43afedffcd2b +60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc diff --git a/qt5-scxml/mingw-w64/PKGBUILD b/qt5-scxml/mingw-w64/PKGBUILD index af621594..378a2306 100644 --- a/qt5-scxml/mingw-w64/PKGBUILD +++ b/qt5-scxml/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtscxml pkgname=mingw-w64-qt5-scxml -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Static and runtime integration of SCXML models into Qt code (mingw-w64)" @@ -21,7 +21,7 @@ groups=('mingw-w64-qt5') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('2289f8c1b51ac368cc0ba8a6a987b44d2c97b43697b00e64582e43afedffcd2b') +sha256sums=('60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc') _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 59f77c11..99ec356d 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.15.1 +pkgver=5.15.2 pkgrel=1 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>) 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 58af012e..4cbaf8bb 100644 --- a/qt5-scxml/mingw-w64/qtscxml-sha256.txt +++ b/qt5-scxml/mingw-w64/qtscxml-sha256.txt @@ -1 +1 @@ -2289f8c1b51ac368cc0ba8a6a987b44d2c97b43697b00e64582e43afedffcd2b +60b9590b9a41c60cee7b8a8c8410ee4625f0389c1ff8d79883ec5a985638a7dc diff --git a/qt5-sensors/mingw-w64-static/PKGBUILD b/qt5-sensors/mingw-w64-static/PKGBUILD index fbba1f84..6c7b68ef 100644 --- a/qt5-sensors/mingw-w64-static/PKGBUILD +++ b/qt5-sensors/mingw-w64-static/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtsensors pkgname=mingw-w64-qt5-sensors-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Provides access to sensor hardware and motion gesture recognition (mingw-w64)" @@ -23,7 +23,7 @@ groups=('mingw-w64-qt5') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('8096b9ffe737434f9564432048f622f6be795619da4e1ed362ce26dddb2cea00') +sha256sums=('3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-sensors/mingw-w64-static/qtsensors-sha256.txt b/qt5-sensors/mingw-w64-static/qtsensors-sha256.txt index b95ab689..9f695c3d 100644 --- a/qt5-sensors/mingw-w64-static/qtsensors-sha256.txt +++ b/qt5-sensors/mingw-w64-static/qtsensors-sha256.txt @@ -1 +1 @@ -8096b9ffe737434f9564432048f622f6be795619da4e1ed362ce26dddb2cea00 +3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 diff --git a/qt5-sensors/mingw-w64/PKGBUILD b/qt5-sensors/mingw-w64/PKGBUILD index f4e62bfa..c9a238fc 100644 --- a/qt5-sensors/mingw-w64/PKGBUILD +++ b/qt5-sensors/mingw-w64/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtsensors pkgname=mingw-w64-qt5-sensors -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Provides access to sensor hardware and motion gesture recognition (mingw-w64)" @@ -23,7 +23,7 @@ groups=('mingw-w64-qt5') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('8096b9ffe737434f9564432048f622f6be795619da4e1ed362ce26dddb2cea00') +sha256sums=('3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839') _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 bec7d73c..c87def16 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.15.1 +pkgver=5.15.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 b95ab689..9f695c3d 100644 --- a/qt5-sensors/mingw-w64/qtsensors-sha256.txt +++ b/qt5-sensors/mingw-w64/qtsensors-sha256.txt @@ -1 +1 @@ -8096b9ffe737434f9564432048f622f6be795619da4e1ed362ce26dddb2cea00 +3f0011f9e9942cad119146b54d960438f4568a22a274cdad4fae06bb4e0e4839 diff --git a/qt5-serialport/mingw-w64-static/PKGBUILD b/qt5-serialport/mingw-w64-static/PKGBUILD index 1052a6bd..96531bb9 100644 --- a/qt5-serialport/mingw-w64-static/PKGBUILD +++ b/qt5-serialport/mingw-w64-static/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtserialport pkgname=mingw-w64-qt5-serialport-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Provides access to hardware and virtual serial ports (mingw-w64)" @@ -22,7 +22,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=('3605130148936ec3fd632bc13c70873d74ef9a8a0b28b17f3be917d848cfb8d9') +sha256sums=('59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-serialport/mingw-w64-static/qtserialport-sha256.txt b/qt5-serialport/mingw-w64-static/qtserialport-sha256.txt index ebc5edc4..a44e895f 100644 --- a/qt5-serialport/mingw-w64-static/qtserialport-sha256.txt +++ b/qt5-serialport/mingw-w64-static/qtserialport-sha256.txt @@ -1 +1 @@ -3605130148936ec3fd632bc13c70873d74ef9a8a0b28b17f3be917d848cfb8d9 +59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d diff --git a/qt5-serialport/mingw-w64/PKGBUILD b/qt5-serialport/mingw-w64/PKGBUILD index 2f516422..006dc8a0 100644 --- a/qt5-serialport/mingw-w64/PKGBUILD +++ b/qt5-serialport/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtserialport pkgname=mingw-w64-qt5-serialport -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Provides access to hardware and virtual serial ports (mingw-w64)" @@ -22,7 +22,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=('3605130148936ec3fd632bc13c70873d74ef9a8a0b28b17f3be917d848cfb8d9') +sha256sums=('59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d') _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 f782ff72..c96bfd6b 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.15.1 +pkgver=5.15.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 ebc5edc4..a44e895f 100644 --- a/qt5-serialport/mingw-w64/qtserialport-sha256.txt +++ b/qt5-serialport/mingw-w64/qtserialport-sha256.txt @@ -1 +1 @@ -3605130148936ec3fd632bc13c70873d74ef9a8a0b28b17f3be917d848cfb8d9 +59c559d748417306bc1b2cf2315c1e63eed011ace38ad92946af71f23e2ef79d diff --git a/qt5-speech/mingw-w64-static/PKGBUILD b/qt5-speech/mingw-w64-static/PKGBUILD index 030dc3a0..15d23fdc 100644 --- a/qt5-speech/mingw-w64-static/PKGBUILD +++ b/qt5-speech/mingw-w64-static/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtspeech pkgname=mingw-w64-qt5-speech-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Qt module to make text to speech and speech recognition easy (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=('7d2a5f7cf653d711de249ce4689959866d2381c625ced7ed4db7c8baaa140edc') +sha256sums=('c810fb9eecb08026434422a32e79269627f3bc2941be199e86ec410bdfe883f5') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-speech/mingw-w64-static/qtspeech-sha256.txt b/qt5-speech/mingw-w64-static/qtspeech-sha256.txt index 8a507538..e46c22f0 100644 --- a/qt5-speech/mingw-w64-static/qtspeech-sha256.txt +++ b/qt5-speech/mingw-w64-static/qtspeech-sha256.txt @@ -1 +1 @@ -7d2a5f7cf653d711de249ce4689959866d2381c625ced7ed4db7c8baaa140edc +c810fb9eecb08026434422a32e79269627f3bc2941be199e86ec410bdfe883f5 diff --git a/qt5-speech/mingw-w64/PKGBUILD b/qt5-speech/mingw-w64/PKGBUILD index 87fce751..69875345 100644 --- a/qt5-speech/mingw-w64/PKGBUILD +++ b/qt5-speech/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtspeech pkgname=mingw-w64-qt5-speech -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Qt module to make text to speech and speech recognition easy (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=('7d2a5f7cf653d711de249ce4689959866d2381c625ced7ed4db7c8baaa140edc') +sha256sums=('c810fb9eecb08026434422a32e79269627f3bc2941be199e86ec410bdfe883f5') _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 08a64f3b..bdbc72a1 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.15.1 +pkgver=5.15.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 8a507538..e46c22f0 100644 --- a/qt5-speech/mingw-w64/qtspeech-sha256.txt +++ b/qt5-speech/mingw-w64/qtspeech-sha256.txt @@ -1 +1 @@ -7d2a5f7cf653d711de249ce4689959866d2381c625ced7ed4db7c8baaa140edc +c810fb9eecb08026434422a32e79269627f3bc2941be199e86ec410bdfe883f5 diff --git a/qt5-svg/mingw-w64-static/PKGBUILD b/qt5-svg/mingw-w64-static/PKGBUILD index d44cb380..c452946f 100644 --- a/qt5-svg/mingw-w64-static/PKGBUILD +++ b/qt5-svg/mingw-w64-static/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtsvg pkgname=mingw-w64-qt5-svg-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)" @@ -22,7 +22,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=('308160223c0bd7492d56fb5d7b7f705bfb130947ac065bf39280ec6d7cbe4f6a') +sha256sums=('8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-svg/mingw-w64-static/qtsvg-sha256.txt b/qt5-svg/mingw-w64-static/qtsvg-sha256.txt index 1b36838a..07f801f0 100644 --- a/qt5-svg/mingw-w64-static/qtsvg-sha256.txt +++ b/qt5-svg/mingw-w64-static/qtsvg-sha256.txt @@ -1 +1 @@ -308160223c0bd7492d56fb5d7b7f705bfb130947ac065bf39280ec6d7cbe4f6a +8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e diff --git a/qt5-svg/mingw-w64/PKGBUILD b/qt5-svg/mingw-w64/PKGBUILD index a1195cd5..91d1d3f8 100644 --- a/qt5-svg/mingw-w64/PKGBUILD +++ b/qt5-svg/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtsvg pkgname=mingw-w64-qt5-svg -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)" @@ -22,7 +22,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=('308160223c0bd7492d56fb5d7b7f705bfb130947ac065bf39280ec6d7cbe4f6a') +sha256sums=('8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e') _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 6c930297..09406c99 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.15.1 +pkgver=5.15.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 1b36838a..07f801f0 100644 --- a/qt5-svg/mingw-w64/qtsvg-sha256.txt +++ b/qt5-svg/mingw-w64/qtsvg-sha256.txt @@ -1 +1 @@ -308160223c0bd7492d56fb5d7b7f705bfb130947ac065bf39280ec6d7cbe4f6a +8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e diff --git a/qt5-tools/mingw-w64-static/0001-Fix-linguist-macro.patch b/qt5-tools/mingw-w64-static/0001-Fix-linguist-macro.patch index 429a07f6..44200a93 100644 --- a/qt5-tools/mingw-w64-static/0001-Fix-linguist-macro.patch +++ b/qt5-tools/mingw-w64-static/0001-Fix-linguist-macro.patch @@ -1,4 +1,4 @@ -From 4b848e15c429260e3c78d897b30dc03adcf23fad Mon Sep 17 00:00:00 2001 +From 43c51a28149ae923fedbf215a64a5456dc44a664 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 25 Sep 2016 21:44:42 +0200 Subject: [PATCH] Fix linguist macro @@ -38,5 +38,5 @@ index ab271d56..f54c99c4 100644 DEPENDS ${_abs_FILE} VERBATIM ) -- -2.28.0 +2.29.2 diff --git a/qt5-tools/mingw-w64-static/PKGBUILD b/qt5-tools/mingw-w64-static/PKGBUILD old mode 100644 new mode 100755 index 0864234b..bcb8cf1b --- a/qt5-tools/mingw-w64-static/PKGBUILD +++ b/qt5-tools/mingw-w64-static/PKGBUILD @@ -23,8 +23,8 @@ _qt_module=qttools pkgname=mingw-w64-qt5-tools-static -pkgver=5.15.1 -pkgrel=2 +pkgver=5.15.2 +pkgrel=1 arch=('any') pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)" depends=('mingw-w64-qt5-declarative-static') @@ -36,8 +36,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=('c98ee5f0f980bf68cbf0c94d62434816a92441733de50bd9adbe9b9055f03498' - '23243c0326d63474a293cec35cb0b64795e46b90ddc631d240b128274c030421') +sha256sums=('c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc' + 'e2ce8a553c78fd0dc6934be7d58a9bb90fe465619ac20a567d579c4c90bc01ab') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-tools/mingw-w64-static/qttools-sha256.txt b/qt5-tools/mingw-w64-static/qttools-sha256.txt index 882e1472..73691a3f 100644 --- a/qt5-tools/mingw-w64-static/qttools-sha256.txt +++ b/qt5-tools/mingw-w64-static/qttools-sha256.txt @@ -1 +1 @@ -c98ee5f0f980bf68cbf0c94d62434816a92441733de50bd9adbe9b9055f03498 +c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc diff --git a/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch b/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch index 429a07f6..44200a93 100644 --- a/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch +++ b/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch @@ -1,4 +1,4 @@ -From 4b848e15c429260e3c78d897b30dc03adcf23fad Mon Sep 17 00:00:00 2001 +From 43c51a28149ae923fedbf215a64a5456dc44a664 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 25 Sep 2016 21:44:42 +0200 Subject: [PATCH] Fix linguist macro @@ -38,5 +38,5 @@ index ab271d56..f54c99c4 100644 DEPENDS ${_abs_FILE} VERBATIM ) -- -2.28.0 +2.29.2 diff --git a/qt5-tools/mingw-w64/PKGBUILD b/qt5-tools/mingw-w64/PKGBUILD old mode 100644 new mode 100755 index 9e57525b..9b985ddd --- a/qt5-tools/mingw-w64/PKGBUILD +++ b/qt5-tools/mingw-w64/PKGBUILD @@ -23,7 +23,7 @@ _qt_module=qttools pkgname=mingw-w64-qt5-tools -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)" @@ -36,8 +36,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=('c98ee5f0f980bf68cbf0c94d62434816a92441733de50bd9adbe9b9055f03498' - '23243c0326d63474a293cec35cb0b64795e46b90ddc631d240b128274c030421') +sha256sums=('c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc' + 'e2ce8a553c78fd0dc6934be7d58a9bb90fe465619ac20a567d579c4c90bc01ab') _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 96d05e65..ce10c783 100644 --- a/qt5-tools/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-tools/mingw-w64/PKGBUILD.sh.ep @@ -18,8 +18,8 @@ % end \ -pkgver=5.15.1 -pkgrel=<%== stash('pkgrel') // '1' %> +pkgver=5.15.2 +pkgrel=1 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>) pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)" depends=(<%== qt5deps qw(declarative) %>) diff --git a/qt5-tools/mingw-w64/qttools-sha256.txt b/qt5-tools/mingw-w64/qttools-sha256.txt index 882e1472..73691a3f 100644 --- a/qt5-tools/mingw-w64/qttools-sha256.txt +++ b/qt5-tools/mingw-w64/qttools-sha256.txt @@ -1 +1 @@ -c98ee5f0f980bf68cbf0c94d62434816a92441733de50bd9adbe9b9055f03498 +c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc diff --git a/qt5-translations/mingw-w64/PKGBUILD b/qt5-translations/mingw-w64/PKGBUILD index 4a684173..0d5aab50 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.15.1 +pkgver=5.15.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=('46e0c0e3a511fbcc803a4146204062e47f6ed43b34d98a3c27372a03b8746bd8') +sha256sums=('d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8') _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 9a879329..e64f1a66 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.15.1 +pkgver=5.15.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 f94c4711..046c3b08 100644 --- a/qt5-translations/mingw-w64/qttranslations-sha256.txt +++ b/qt5-translations/mingw-w64/qttranslations-sha256.txt @@ -1 +1 @@ -46e0c0e3a511fbcc803a4146204062e47f6ed43b34d98a3c27372a03b8746bd8 +d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8 diff --git a/qt5-virtualkeyboard/mingw-w64-static/PKGBUILD b/qt5-virtualkeyboard/mingw-w64-static/PKGBUILD index d2e6e954..d8891e99 100644 --- a/qt5-virtualkeyboard/mingw-w64-static/PKGBUILD +++ b/qt5-virtualkeyboard/mingw-w64-static/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtvirtualkeyboard pkgname=mingw-w64-qt5-virtualkeyboard-static #_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.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Virtual keyboard 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=('8cf62c4f0662f3f4b52b32f9d2cf1845a636d3df663869a98d47dfe748eb1c3d') +sha256sums=('9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-virtualkeyboard/mingw-w64-static/qtvirtualkeyboard-sha256.txt b/qt5-virtualkeyboard/mingw-w64-static/qtvirtualkeyboard-sha256.txt index 2f7946f7..b43972e5 100644 --- a/qt5-virtualkeyboard/mingw-w64-static/qtvirtualkeyboard-sha256.txt +++ b/qt5-virtualkeyboard/mingw-w64-static/qtvirtualkeyboard-sha256.txt @@ -1 +1 @@ -8cf62c4f0662f3f4b52b32f9d2cf1845a636d3df663869a98d47dfe748eb1c3d +9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 diff --git a/qt5-virtualkeyboard/mingw-w64/PKGBUILD b/qt5-virtualkeyboard/mingw-w64/PKGBUILD index 62fa2e12..00e861ca 100644 --- a/qt5-virtualkeyboard/mingw-w64/PKGBUILD +++ b/qt5-virtualkeyboard/mingw-w64/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtvirtualkeyboard pkgname=mingw-w64-qt5-virtualkeyboard #_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.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Virtual keyboard 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=('8cf62c4f0662f3f4b52b32f9d2cf1845a636d3df663869a98d47dfe748eb1c3d') +sha256sums=('9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55') _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 a86ba307..3a9313c3 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.15.1 +pkgver=5.15.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 2f7946f7..b43972e5 100644 --- a/qt5-virtualkeyboard/mingw-w64/qtvirtualkeyboard-sha256.txt +++ b/qt5-virtualkeyboard/mingw-w64/qtvirtualkeyboard-sha256.txt @@ -1 +1 @@ -8cf62c4f0662f3f4b52b32f9d2cf1845a636d3df663869a98d47dfe748eb1c3d +9a3193913be30f09a896e3b8c2f9696d2e9b3f88a63ae9ca8c97a2786b68cf55 diff --git a/qt5-webchannel/mingw-w64-static/PKGBUILD b/qt5-webchannel/mingw-w64-static/PKGBUILD index 0cf7ba6a..ccae5e9d 100644 --- a/qt5-webchannel/mingw-w64-static/PKGBUILD +++ b/qt5-webchannel/mingw-w64-static/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtwebchannel pkgname=mingw-w64-qt5-webchannel-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc='Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients (mingw-w64)' @@ -21,7 +21,7 @@ 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=('7f3ef8e626d932bbc121810661a62ece3955ab982340676a19001417e2faf9fc') +sha256sums=('127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-webchannel/mingw-w64-static/qtwebchannel-sha256.txt b/qt5-webchannel/mingw-w64-static/qtwebchannel-sha256.txt index 1ef500ad..0a409a54 100644 --- a/qt5-webchannel/mingw-w64-static/qtwebchannel-sha256.txt +++ b/qt5-webchannel/mingw-w64-static/qtwebchannel-sha256.txt @@ -1 +1 @@ -7f3ef8e626d932bbc121810661a62ece3955ab982340676a19001417e2faf9fc +127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 diff --git a/qt5-webchannel/mingw-w64/PKGBUILD b/qt5-webchannel/mingw-w64/PKGBUILD index c17b5844..c4fa30a6 100644 --- a/qt5-webchannel/mingw-w64/PKGBUILD +++ b/qt5-webchannel/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtwebchannel pkgname=mingw-w64-qt5-webchannel -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc='Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients (mingw-w64)' @@ -21,7 +21,7 @@ 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=('7f3ef8e626d932bbc121810661a62ece3955ab982340676a19001417e2faf9fc') +sha256sums=('127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1') _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 e154c9da..2b4f5a33 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.15.1 +pkgver=5.15.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 1ef500ad..0a409a54 100644 --- a/qt5-webchannel/mingw-w64/qtwebchannel-sha256.txt +++ b/qt5-webchannel/mingw-w64/qtwebchannel-sha256.txt @@ -1 +1 @@ -7f3ef8e626d932bbc121810661a62ece3955ab982340676a19001417e2faf9fc +127fe79c43b386713f151ed7d411cd81e45e29f9c955584f29736f78c9303ec1 diff --git a/qt5-webengine/mingw-w64-static/PKGBUILD b/qt5-webengine/mingw-w64-static/PKGBUILD index 79ce7e26..ad8084bb 100644 --- a/qt5-webengine/mingw-w64-static/PKGBUILD +++ b/qt5-webengine/mingw-w64-static/PKGBUILD @@ -13,7 +13,7 @@ _qt_module=qtwebengine pkgname=mingw-w64-qt5-webengine-static -pkgver=5.15.1 +pkgver=5.15.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 b/qt5-webengine/mingw-w64/PKGBUILD index 9628cd14..56ac85aa 100644 --- a/qt5-webengine/mingw-w64/PKGBUILD +++ b/qt5-webengine/mingw-w64/PKGBUILD @@ -13,7 +13,7 @@ _qt_module=qtwebengine pkgname=mingw-w64-qt5-webengine -pkgver=5.15.1 +pkgver=5.15.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 41b022be..ef192a9b 100644 --- a/qt5-webengine/mingw-w64/PKGBUILD.sh.ep +++ b/qt5-webengine/mingw-w64/PKGBUILD.sh.ep @@ -5,7 +5,7 @@ % end \ -pkgver=5.15.1 +pkgver=5.15.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-static/0001-Hardcode-linker-flags-for-platform-plugin.patch b/qt5-webglplugin/mingw-w64-static/0001-Hardcode-linker-flags-for-platform-plugin.patch index 4b55b647..f2db5397 100644 --- a/qt5-webglplugin/mingw-w64-static/0001-Hardcode-linker-flags-for-platform-plugin.patch +++ b/qt5-webglplugin/mingw-w64-static/0001-Hardcode-linker-flags-for-platform-plugin.patch @@ -1,4 +1,4 @@ -From 69d6b19fd448404c752ce6aa0b60991e22e77e7b Mon Sep 17 00:00:00 2001 +From 88c83f30d5627f36e85302737d037a04065abb3f Mon Sep 17 00:00:00 2001 From: Marius Kittler Date: Wed, 12 Dec 2018 18:16:54 +0100 Subject: [PATCH] Hardcode linker flags for platform plugin @@ -42,5 +42,5 @@ index 7f7227c..45f8f66 100644 qtHaveModule(quick) { QT += quick -- -2.28.0 +2.29.2 diff --git a/qt5-webglplugin/mingw-w64-static/PKGBUILD b/qt5-webglplugin/mingw-w64-static/PKGBUILD index d39555be..bf4be3a1 100644 --- a/qt5-webglplugin/mingw-w64-static/PKGBUILD +++ b/qt5-webglplugin/mingw-w64-static/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtwebglplugin pkgname=mingw-w64-qt5-webglplugin-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="QPA plugin for running an application via a browser using streamed WebGL commands (mingw-w64)" @@ -24,8 +24,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=('63c76f384252090694a8a2a8a18441d4fc4502d688cc4ac798a0d27b2221733c' - 'c6af011c8517f0874b5b5593b1248061e863add2009ed66a31c84783acf1a360') +sha256sums=('81e782b517ed29e10bea1aa90c9f59274c98a910f2c8b105fa78368a36b41446' + 'c855d5b15171ed0f8d730898a62621462a71dbdb0b296d1e0ba2d3cfa87a8bcb') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-webglplugin/mingw-w64-static/qtwebglplugin-sha256.txt b/qt5-webglplugin/mingw-w64-static/qtwebglplugin-sha256.txt index 0e3d4755..aeb0b8d3 100644 --- a/qt5-webglplugin/mingw-w64-static/qtwebglplugin-sha256.txt +++ b/qt5-webglplugin/mingw-w64-static/qtwebglplugin-sha256.txt @@ -1 +1 @@ -63c76f384252090694a8a2a8a18441d4fc4502d688cc4ac798a0d27b2221733c +81e782b517ed29e10bea1aa90c9f59274c98a910f2c8b105fa78368a36b41446 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 4b55b647..f2db5397 100644 --- a/qt5-webglplugin/mingw-w64/0001-Hardcode-linker-flags-for-platform-plugin.patch +++ b/qt5-webglplugin/mingw-w64/0001-Hardcode-linker-flags-for-platform-plugin.patch @@ -1,4 +1,4 @@ -From 69d6b19fd448404c752ce6aa0b60991e22e77e7b Mon Sep 17 00:00:00 2001 +From 88c83f30d5627f36e85302737d037a04065abb3f Mon Sep 17 00:00:00 2001 From: Marius Kittler Date: Wed, 12 Dec 2018 18:16:54 +0100 Subject: [PATCH] Hardcode linker flags for platform plugin @@ -42,5 +42,5 @@ index 7f7227c..45f8f66 100644 qtHaveModule(quick) { QT += quick -- -2.28.0 +2.29.2 diff --git a/qt5-webglplugin/mingw-w64/PKGBUILD b/qt5-webglplugin/mingw-w64/PKGBUILD index 59e9af78..1cfce71b 100644 --- a/qt5-webglplugin/mingw-w64/PKGBUILD +++ b/qt5-webglplugin/mingw-w64/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtwebglplugin pkgname=mingw-w64-qt5-webglplugin -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="QPA plugin for running an application via a browser using streamed WebGL commands (mingw-w64)" @@ -24,8 +24,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=('63c76f384252090694a8a2a8a18441d4fc4502d688cc4ac798a0d27b2221733c' - 'c6af011c8517f0874b5b5593b1248061e863add2009ed66a31c84783acf1a360') +sha256sums=('81e782b517ed29e10bea1aa90c9f59274c98a910f2c8b105fa78368a36b41446' + 'c855d5b15171ed0f8d730898a62621462a71dbdb0b296d1e0ba2d3cfa87a8bcb') _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 9b02cc75..b81ebccb 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.15.1 +pkgver=5.15.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 0e3d4755..aeb0b8d3 100644 --- a/qt5-webglplugin/mingw-w64/qtwebglplugin-sha256.txt +++ b/qt5-webglplugin/mingw-w64/qtwebglplugin-sha256.txt @@ -1 +1 @@ -63c76f384252090694a8a2a8a18441d4fc4502d688cc4ac798a0d27b2221733c +81e782b517ed29e10bea1aa90c9f59274c98a910f2c8b105fa78368a36b41446 diff --git a/qt5-websockets/mingw-w64-static/PKGBUILD b/qt5-websockets/mingw-w64-static/PKGBUILD index 8d2dccd2..8e6c4c6d 100644 --- a/qt5-websockets/mingw-w64-static/PKGBUILD +++ b/qt5-websockets/mingw-w64-static/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtwebsockets pkgname=mingw-w64-qt5-websockets-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Provides WebSocket communication compliant with RFC 6455 (mingw-w64)" @@ -22,7 +22,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=('5f30053a0a794676ce7d7521f6b789409cc449a7e90cab547d871fc07a61dd7e') +sha256sums=('a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-websockets/mingw-w64-static/qtwebsockets-sha256.txt b/qt5-websockets/mingw-w64-static/qtwebsockets-sha256.txt index c4ceebb8..488a9d96 100644 --- a/qt5-websockets/mingw-w64-static/qtwebsockets-sha256.txt +++ b/qt5-websockets/mingw-w64-static/qtwebsockets-sha256.txt @@ -1 +1 @@ -5f30053a0a794676ce7d7521f6b789409cc449a7e90cab547d871fc07a61dd7e +a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f diff --git a/qt5-websockets/mingw-w64/PKGBUILD b/qt5-websockets/mingw-w64/PKGBUILD index 5d1b7986..3b3e407a 100644 --- a/qt5-websockets/mingw-w64/PKGBUILD +++ b/qt5-websockets/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtwebsockets pkgname=mingw-w64-qt5-websockets -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Provides WebSocket communication compliant with RFC 6455 (mingw-w64)" @@ -22,7 +22,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=('5f30053a0a794676ce7d7521f6b789409cc449a7e90cab547d871fc07a61dd7e') +sha256sums=('a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f') _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 0b00a1df..3a07e606 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.15.1 +pkgver=5.15.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 c4ceebb8..488a9d96 100644 --- a/qt5-websockets/mingw-w64/qtwebsockets-sha256.txt +++ b/qt5-websockets/mingw-w64/qtwebsockets-sha256.txt @@ -1 +1 @@ -5f30053a0a794676ce7d7521f6b789409cc449a7e90cab547d871fc07a61dd7e +a0b42d85dd34ff6e2d23400e02f83d8b85bcd80e60efd1521d12d9625d4a233f diff --git a/qt5-winextras/mingw-w64-static/PKGBUILD b/qt5-winextras/mingw-w64-static/PKGBUILD index 96a8a89c..d165da44 100644 --- a/qt5-winextras/mingw-w64-static/PKGBUILD +++ b/qt5-winextras/mingw-w64-static/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtwinextras pkgname=mingw-w64-qt5-winextras-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Classes and functions that enable you to use Windows-specific functions (mingw-w64)" @@ -22,7 +22,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=('c378b112de1b54dbd39b07b7e181250b99ea2ec4d1d710909bb3384665528e8b') +sha256sums=('65b8272005dec00791ab7d81ab266d1e3313a3bbd8e54e546d984cf4c4ab550e') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-winextras/mingw-w64-static/qtwinextras-sha256.txt b/qt5-winextras/mingw-w64-static/qtwinextras-sha256.txt index e41767d3..94c5b735 100644 --- a/qt5-winextras/mingw-w64-static/qtwinextras-sha256.txt +++ b/qt5-winextras/mingw-w64-static/qtwinextras-sha256.txt @@ -1 +1 @@ -c378b112de1b54dbd39b07b7e181250b99ea2ec4d1d710909bb3384665528e8b +65b8272005dec00791ab7d81ab266d1e3313a3bbd8e54e546d984cf4c4ab550e diff --git a/qt5-winextras/mingw-w64/PKGBUILD b/qt5-winextras/mingw-w64/PKGBUILD index 9416bb54..2267bda9 100644 --- a/qt5-winextras/mingw-w64/PKGBUILD +++ b/qt5-winextras/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtwinextras pkgname=mingw-w64-qt5-winextras -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Classes and functions that enable you to use Windows-specific functions (mingw-w64)" @@ -22,7 +22,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=('c378b112de1b54dbd39b07b7e181250b99ea2ec4d1d710909bb3384665528e8b') +sha256sums=('65b8272005dec00791ab7d81ab266d1e3313a3bbd8e54e546d984cf4c4ab550e') _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 5febc2b4..d5834510 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.15.1 +pkgver=5.15.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 e41767d3..94c5b735 100644 --- a/qt5-winextras/mingw-w64/qtwinextras-sha256.txt +++ b/qt5-winextras/mingw-w64/qtwinextras-sha256.txt @@ -1 +1 @@ -c378b112de1b54dbd39b07b7e181250b99ea2ec4d1d710909bb3384665528e8b +65b8272005dec00791ab7d81ab266d1e3313a3bbd8e54e546d984cf4c4ab550e diff --git a/qt5-xmlpatterns/mingw-w64-static/PKGBUILD b/qt5-xmlpatterns/mingw-w64-static/PKGBUILD index 18a06420..8f12ff12 100644 --- a/qt5-xmlpatterns/mingw-w64-static/PKGBUILD +++ b/qt5-xmlpatterns/mingw-w64-static/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtxmlpatterns pkgname=mingw-w64-qt5-xmlpatterns-static -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Support for XPath, XQuery, XSLT and XML schema validation (mingw-w64)" @@ -22,7 +22,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=('6859d440ce662f3679ce483ebb5a552b619a32517cb1a52a38f967b377857745') +sha256sums=('76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-xmlpatterns/mingw-w64-static/qtxmlpatterns-sha256.txt b/qt5-xmlpatterns/mingw-w64-static/qtxmlpatterns-sha256.txt index b2dab4e8..6305acee 100644 --- a/qt5-xmlpatterns/mingw-w64-static/qtxmlpatterns-sha256.txt +++ b/qt5-xmlpatterns/mingw-w64-static/qtxmlpatterns-sha256.txt @@ -1 +1 @@ -6859d440ce662f3679ce483ebb5a552b619a32517cb1a52a38f967b377857745 +76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa diff --git a/qt5-xmlpatterns/mingw-w64/PKGBUILD b/qt5-xmlpatterns/mingw-w64/PKGBUILD index 1d182c13..b7db1a4d 100644 --- a/qt5-xmlpatterns/mingw-w64/PKGBUILD +++ b/qt5-xmlpatterns/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtxmlpatterns pkgname=mingw-w64-qt5-xmlpatterns -pkgver=5.15.1 +pkgver=5.15.2 pkgrel=1 arch=('any') pkgdesc="Support for XPath, XQuery, XSLT and XML schema validation (mingw-w64)" @@ -22,7 +22,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=('6859d440ce662f3679ce483ebb5a552b619a32517cb1a52a38f967b377857745') +sha256sums=('76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa') _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 2c2614fe..3aca17f6 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.15.1 +pkgver=5.15.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 b2dab4e8..6305acee 100644 --- a/qt5-xmlpatterns/mingw-w64/qtxmlpatterns-sha256.txt +++ b/qt5-xmlpatterns/mingw-w64/qtxmlpatterns-sha256.txt @@ -1 +1 @@ -6859d440ce662f3679ce483ebb5a552b619a32517cb1a52a38f967b377857745 +76ea2162a7c349188d7e7e4f6c77b78e8a205494c90fee3cea3487a1ae2cf2fa