From fba9dc70ca55d4156b75c2c284cbef47de434076 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 20 Jun 2018 16:57:14 +0200 Subject: [PATCH] Update mingw-w64-qt5-* packages to 5.11.1 --- devel/own-projects/versions.sh | 2 +- devel/qt5/update-all-patches.sh | 2 +- qt5-3d/mingw-w64/PKGBUILD | 4 +- ...indows.h-when-using-native-Linux-gcc.patch | 4 +- ...dumpcpp-and-MetaObjectGenerator-read.patch | 8 +-- qt5-activeqt/mingw-w64/PKGBUILD | 8 +-- qt5-base/apple-darwin/PKGBUILD | 2 +- ...rofile-for-cross-compilation-with-mi.patch | 23 +++--- ...is-defined-when-using-dynamic-OpenGL.patch | 4 +- .../0003-Use-external-ANGLE-library.patch | 4 +- ...tions-assemler-error-in-OpenGL-facto.patch | 4 +- ...re-.pc-files-are-installed-correctly.patch | 10 +-- ...add-resource-files-to-LIBS-parameter.patch | 4 +- ...ug-library-names-in-pkg-config-files.patch | 8 +-- ...linking-against-shared-static-libpng.patch | 4 +- ...009-Fix-linking-against-static-D-Bus.patch | 6 +- ...o-use-debug-version-of-D-Bus-library.patch | 6 +- ...Fix-linking-against-static-freetype2.patch | 4 +- ...-Fix-linking-against-static-harfbuzz.patch | 4 +- ...0013-Fix-linking-against-static-pcre.patch | 4 +- ...inking-against-shared-static-MariaDB.patch | 4 +- ...ing-against-shared-static-PostgreSQL.patch | 4 +- .../0016-Rename-qtmain-to-qt5main.patch | 10 +-- .../0017-Build-dynamic-host-libraries.patch | 4 +- .../0018-Enable-rpath-for-build-tools.patch | 4 +- ...0019-Use-system-zlib-for-build-tools.patch | 4 +- ...0-Use-.dll.a-as-import-lib-extension.patch | 6 +- ...erge-shared-and-static-library-trees.patch | 10 +-- ...s-of-static-libraries-in-CMake-modul.patch | 6 +- ...w-usage-of-static-version-with-CMake.patch | 8 +-- ...ags-for-static-build-with-cmake-ming.patch | 4 +- ...5-Use-correct-pkg-config-static-flag.patch | 4 +- ...6-Fix-macro-invoking-moc-rcc-and-uic.patch | 6 +- ...-errors-about-missing-feature-static.patch | 4 +- .../0028-Enable-and-fix-use-of-iconv.patch | 6 +- .../0029-Ignore-failing-pkg-config-test.patch | 6 +- ...from-messing-static-lib-dependencies.patch | 6 +- ...de-linker-flags-for-platform-plugins.patch | 4 +- ...ng-against-static-plugins-with-qmake.patch | 4 +- ...sable-hardware-randomizer-for-32-bit.patch | 4 +- qt5-base/mingw-w64-angle/PKGBUILD | 70 +++++++++---------- ...rofile-for-cross-compilation-with-mi.patch | 23 +++--- ...is-defined-when-using-dynamic-OpenGL.patch | 4 +- .../0003-Use-external-ANGLE-library.patch | 4 +- ...tions-assemler-error-in-OpenGL-facto.patch | 4 +- ...re-.pc-files-are-installed-correctly.patch | 10 +-- ...add-resource-files-to-LIBS-parameter.patch | 4 +- ...ug-library-names-in-pkg-config-files.patch | 8 +-- ...linking-against-shared-static-libpng.patch | 4 +- ...009-Fix-linking-against-static-D-Bus.patch | 6 +- ...o-use-debug-version-of-D-Bus-library.patch | 6 +- ...Fix-linking-against-static-freetype2.patch | 4 +- ...-Fix-linking-against-static-harfbuzz.patch | 4 +- ...0013-Fix-linking-against-static-pcre.patch | 4 +- ...inking-against-shared-static-MariaDB.patch | 4 +- ...ing-against-shared-static-PostgreSQL.patch | 4 +- .../0016-Rename-qtmain-to-qt5main.patch | 10 +-- .../0017-Build-dynamic-host-libraries.patch | 4 +- .../0018-Enable-rpath-for-build-tools.patch | 4 +- ...0019-Use-system-zlib-for-build-tools.patch | 4 +- ...0-Use-.dll.a-as-import-lib-extension.patch | 6 +- ...erge-shared-and-static-library-trees.patch | 10 +-- ...s-of-static-libraries-in-CMake-modul.patch | 6 +- ...w-usage-of-static-version-with-CMake.patch | 8 +-- ...ags-for-static-build-with-cmake-ming.patch | 4 +- ...5-Use-correct-pkg-config-static-flag.patch | 4 +- ...6-Fix-macro-invoking-moc-rcc-and-uic.patch | 6 +- ...-errors-about-missing-feature-static.patch | 4 +- .../0028-Enable-and-fix-use-of-iconv.patch | 6 +- .../0029-Ignore-failing-pkg-config-test.patch | 6 +- ...from-messing-static-lib-dependencies.patch | 6 +- ...de-linker-flags-for-platform-plugins.patch | 4 +- ...ng-against-static-plugins-with-qmake.patch | 4 +- ...sable-hardware-randomizer-for-32-bit.patch | 4 +- qt5-base/mingw-w64-dynamic/PKGBUILD | 70 +++++++++---------- ...rofile-for-cross-compilation-with-mi.patch | 23 +++--- ...is-defined-when-using-dynamic-OpenGL.patch | 4 +- .../0003-Use-external-ANGLE-library.patch | 4 +- ...tions-assemler-error-in-OpenGL-facto.patch | 4 +- ...re-.pc-files-are-installed-correctly.patch | 10 +-- ...add-resource-files-to-LIBS-parameter.patch | 4 +- ...ug-library-names-in-pkg-config-files.patch | 8 +-- ...linking-against-shared-static-libpng.patch | 4 +- ...009-Fix-linking-against-static-D-Bus.patch | 6 +- ...o-use-debug-version-of-D-Bus-library.patch | 6 +- ...Fix-linking-against-static-freetype2.patch | 4 +- ...-Fix-linking-against-static-harfbuzz.patch | 4 +- ...0013-Fix-linking-against-static-pcre.patch | 4 +- ...inking-against-shared-static-MariaDB.patch | 4 +- ...ing-against-shared-static-PostgreSQL.patch | 4 +- .../0016-Rename-qtmain-to-qt5main.patch | 10 +-- .../0017-Build-dynamic-host-libraries.patch | 4 +- .../0018-Enable-rpath-for-build-tools.patch | 4 +- ...0019-Use-system-zlib-for-build-tools.patch | 4 +- ...0-Use-.dll.a-as-import-lib-extension.patch | 6 +- ...erge-shared-and-static-library-trees.patch | 10 +-- ...s-of-static-libraries-in-CMake-modul.patch | 6 +- ...w-usage-of-static-version-with-CMake.patch | 8 +-- ...ags-for-static-build-with-cmake-ming.patch | 4 +- ...5-Use-correct-pkg-config-static-flag.patch | 4 +- ...6-Fix-macro-invoking-moc-rcc-and-uic.patch | 6 +- ...-errors-about-missing-feature-static.patch | 4 +- .../0028-Enable-and-fix-use-of-iconv.patch | 6 +- .../0029-Ignore-failing-pkg-config-test.patch | 6 +- ...from-messing-static-lib-dependencies.patch | 6 +- ...de-linker-flags-for-platform-plugins.patch | 4 +- ...ng-against-static-plugins-with-qmake.patch | 4 +- ...sable-hardware-randomizer-for-32-bit.patch | 4 +- qt5-base/mingw-w64-static/PKGBUILD | 70 +++++++++---------- ...rofile-for-cross-compilation-with-mi.patch | 23 +++--- ...is-defined-when-using-dynamic-OpenGL.patch | 4 +- .../0003-Use-external-ANGLE-library.patch | 4 +- ...tions-assemler-error-in-OpenGL-facto.patch | 4 +- ...re-.pc-files-are-installed-correctly.patch | 10 +-- ...add-resource-files-to-LIBS-parameter.patch | 4 +- ...ug-library-names-in-pkg-config-files.patch | 8 +-- ...linking-against-shared-static-libpng.patch | 4 +- ...009-Fix-linking-against-static-D-Bus.patch | 6 +- ...o-use-debug-version-of-D-Bus-library.patch | 6 +- ...Fix-linking-against-static-freetype2.patch | 4 +- ...-Fix-linking-against-static-harfbuzz.patch | 4 +- ...0013-Fix-linking-against-static-pcre.patch | 4 +- ...inking-against-shared-static-MariaDB.patch | 4 +- ...ing-against-shared-static-PostgreSQL.patch | 4 +- .../0016-Rename-qtmain-to-qt5main.patch | 10 +-- .../0017-Build-dynamic-host-libraries.patch | 4 +- .../0018-Enable-rpath-for-build-tools.patch | 4 +- ...0019-Use-system-zlib-for-build-tools.patch | 4 +- ...0-Use-.dll.a-as-import-lib-extension.patch | 6 +- ...erge-shared-and-static-library-trees.patch | 10 +-- ...s-of-static-libraries-in-CMake-modul.patch | 6 +- ...w-usage-of-static-version-with-CMake.patch | 8 +-- ...ags-for-static-build-with-cmake-ming.patch | 4 +- ...5-Use-correct-pkg-config-static-flag.patch | 4 +- ...6-Fix-macro-invoking-moc-rcc-and-uic.patch | 6 +- ...-errors-about-missing-feature-static.patch | 4 +- .../0028-Enable-and-fix-use-of-iconv.patch | 6 +- .../0029-Ignore-failing-pkg-config-test.patch | 6 +- ...from-messing-static-lib-dependencies.patch | 6 +- ...de-linker-flags-for-platform-plugins.patch | 4 +- ...ng-against-static-plugins-with-qmake.patch | 4 +- ...sable-hardware-randomizer-for-32-bit.patch | 4 +- qt5-base/mingw-w64/PKGBUILD | 70 +++++++++---------- qt5-canvas3d/mingw-w64/PKGBUILD | 4 +- qt5-charts/mingw-w64/PKGBUILD | 4 +- qt5-connectivity/mingw-w64/PKGBUILD | 4 +- qt5-datavis3d/mingw-w64/PKGBUILD | 4 +- qt5-declarative/apple-darwin/PKGBUILD | 4 +- ...dev-tools-is-built-as-static-library.patch | 4 +- ...2-Ensure-static-plugins-are-exported.patch | 4 +- ...g-QML-parser-symbols-on-static-build.patch | 4 +- qt5-declarative/mingw-w64/PKGBUILD | 10 +-- qt5-gamepad/mingw-w64/PKGBUILD | 4 +- qt5-graphicaleffects/mingw-w64/PKGBUILD | 4 +- qt5-imageformats/apple-darwin/PKGBUILD | 2 +- qt5-imageformats/mingw-w64/PKGBUILD | 4 +- ...c-3rdparty-libs-are-linked-correctly.patch | 4 +- qt5-location/mingw-w64/PKGBUILD | 6 +- ...s-to-prevent-conflict-with-vsnprintf.patch | 4 +- .../mingw-w64/0002-Fix-build-with-ANGLE.patch | 4 +- qt5-multimedia/mingw-w64/PKGBUILD | 8 +-- qt5-networkauth/mingw-w64/PKGBUILD | 4 +- qt5-quickcontrols/mingw-w64/PKGBUILD | 4 +- qt5-quickcontrols2/mingw-w64/PKGBUILD | 4 +- qt5-remoteobjects/mingw-w64/PKGBUILD | 4 +- qt5-script/mingw-w64/PKGBUILD | 4 +- qt5-scxml/mingw-w64/PKGBUILD | 4 +- qt5-sensors/mingw-w64/PKGBUILD | 4 +- qt5-serialport/mingw-w64/PKGBUILD | 4 +- qt5-speech/mingw-w64/PKGBUILD | 4 +- qt5-svg/apple-darwin/PKGBUILD | 2 +- qt5-svg/mingw-w64/PKGBUILD | 4 +- qt5-tools/apple-darwin/PKGBUILD | 2 +- .../mingw-w64/0001-Fix-linguist-macro.patch | 4 +- ...qhelpconverter-against-static-bearer.patch | 4 +- qt5-tools/mingw-w64/PKGBUILD | 10 +-- qt5-translations/apple-darwin/PKGBUILD | 2 +- qt5-translations/mingw-w64/PKGBUILD | 4 +- qt5-virtualkeyboard/mingw-w64/PKGBUILD | 4 +- qt5-webchannel/mingw-w64/PKGBUILD | 4 +- qt5-webengine/mingw-w64/PKGBUILD | 2 +- qt5-webglplugin/mingw-w64/PKGBUILD | 4 +- qt5-websockets/mingw-w64/PKGBUILD | 4 +- ...link-to-functions-available-from-Win.patch | 4 +- qt5-winextras/mingw-w64/PKGBUILD | 6 +- qt5-xmlpatterns/mingw-w64/PKGBUILD | 4 +- 186 files changed, 618 insertions(+), 646 deletions(-) mode change 100644 => 100755 qt5-declarative/mingw-w64/PKGBUILD mode change 100755 => 100644 qt5-tools/mingw-w64/PKGBUILD diff --git a/devel/own-projects/versions.sh b/devel/own-projects/versions.sh index 378aa8e5..d97986a9 100755 --- a/devel/own-projects/versions.sh +++ b/devel/own-projects/versions.sh @@ -11,7 +11,7 @@ declare -A versions=( [reflective-rapidjson]=0.0.5 [blackwidowcontrol]=1.0.1 [dbus-soundrecorder]=1.2.2 - [qt5]=5.11.0 + [qt5]=5.11.1 ) declare -A github_names=( [c++utilities]=cpp-utilities diff --git a/devel/qt5/update-all-patches.sh b/devel/qt5/update-all-patches.sh index 8a875072..192c6afa 100755 --- a/devel/qt5/update-all-patches.sh +++ b/devel/qt5/update-all-patches.sh @@ -12,5 +12,5 @@ for r in "$QT_GIT_REPOS_DIR/qt"*; do repo="${r##*/qt}" [[ $repo == '5ct' || $repo == '5ct-code' || $repo == 'repotools' || $repo == 'webkit' ]] && continue echo "Updating repository $repo ..." - "$scriptdir/update-patches.sh" "$repo" + "$scriptdir/update-patches.sh" "$repo" "$@" done diff --git a/qt5-3d/mingw-w64/PKGBUILD b/qt5-3d/mingw-w64/PKGBUILD index e9fd7ce3..e85f242b 100644 --- a/qt5-3d/mingw-w64/PKGBUILD +++ b/qt5-3d/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qt3d pkgname="mingw-w64-qt5-3d" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('4d541516abb31a831a668d2be984e3af7cc6bffaa3af6223a76bdd5dd25870c0') +sha256sums=('cb8659e1e5541bea4c3684ac76a496f8e0cd6e3aa9e4e22eba1910095f5ed30d') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-activeqt/mingw-w64/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch b/qt5-activeqt/mingw-w64/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch index 2525d7b2..9e5df6e8 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 500380bde90450867eca41d8c3337c949f99b6fa Mon Sep 17 00:00:00 2001 +From 3f886183a4369fe55ba4b0e872b733fbc17d0d41 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.17.0 +2.18.0 diff --git a/qt5-activeqt/mingw-w64/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch b/qt5-activeqt/mingw-w64/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch index bcf0946f..87c6c1e0 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 27154b3c619f5ffeb9925ed7cfcea8bda99bbe12 Mon Sep 17 00:00:00 2001 +From 293a6fe9c3986a96d3dc129a4b5316f4211eb883 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 fa3eacf..8dcd345 100644 +index 883f1e9..2680baf 100644 --- a/src/activeqt/container/qaxbase.cpp +++ b/src/activeqt/container/qaxbase.cpp @@ -2180,6 +2180,10 @@ void MetaObjectGenerator::readClassInfo() @@ -26,7 +26,7 @@ index fa3eacf..8dcd345 100644 break; } diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp -index 8a37f33..66fb3a8 100644 +index 60a1d56..5e9f56d 100644 --- a/tools/dumpcpp/main.cpp +++ b/tools/dumpcpp/main.cpp @@ -1539,6 +1539,10 @@ int main(int argc, char **argv) @@ -52,5 +52,5 @@ index 8a37f33..66fb3a8 100644 } -- -2.17.0 +2.18.0 diff --git a/qt5-activeqt/mingw-w64/PKGBUILD b/qt5-activeqt/mingw-w64/PKGBUILD index 3a80435d..7a23650d 100644 --- a/qt5-activeqt/mingw-w64/PKGBUILD +++ b/qt5-activeqt/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtactiveqt pkgname=mingw-w64-qt5-activeqt -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="ActiveX integration framework (mingw-w64)" @@ -23,9 +23,9 @@ _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" '0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch' '0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch') -sha256sums=('69aabe0dd5985bd5491b0ce165470b637087b14e2fd2d8a51eed4f14f1bc3705' - 'c9c225647eedd1a2211b5d1123b09070f43135c1cae84049cbecf9ac3ad45157' - 'd615831bd87dda340ebc9e8a7c6652202c62e97e1df9072273742ecbfc6a9032') +sha256sums=('c6ee6c4def84c6a990b7025d8d73374cb08940ba62e90cf13d1f6e2e581b3cb9' + '4c5d70a5beec0a81759f9c7374b292c09db482f50011b88c1a53f824e2c52107' + '3898d01671d4a926ca6f40a547cc43e7aa8974c984c35069644aaccf5d061b29') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-base/apple-darwin/PKGBUILD b/qt5-base/apple-darwin/PKGBUILD index 281faa2c..ff1563f9 100644 --- a/qt5-base/apple-darwin/PKGBUILD +++ b/qt5-base/apple-darwin/PKGBUILD @@ -5,7 +5,7 @@ # All patches are managed at https://github.com/Martchus/qtbase pkgname=apple-darwin-qt5-base -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 pkgdesc='A cross-platform application and UI framework (apple-darwin)' arch=('i686' 'x86_64') diff --git a/qt5-base/mingw-w64-angle/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/qt5-base/mingw-w64-angle/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch index 013d327f..dd47ebc2 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 bd010d1fb00f61dd6cca52c93a4285c5d967029b Mon Sep 17 00:00:00 2001 +From 955c44726565654efbf8099a66b1e3b23e2d41df Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with @@ -13,16 +13,16 @@ Also see the following issues: * https://github.com/Martchus/PKGBUILDs/issues/59 * https://github.com/Martchus/PKGBUILDs/issues/60 --- - mkspecs/common/g++-win32.conf | 56 +++++++++++++++++++++--------- + mkspecs/common/g++-win32.conf | 53 ++++++++++++++++++++---------- mkspecs/win32-clang-g++/qmake.conf | 4 +-- mkspecs/win32-g++/qmake.conf | 4 +-- - 3 files changed, 43 insertions(+), 21 deletions(-) + 3 files changed, 40 insertions(+), 21 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index 610503379d..f099380cca 100644 +index 610503379d..e747ef16af 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf -@@ -8,22 +8,31 @@ +@@ -8,18 +8,24 @@ # Compiler-specific settings go into win32-g++/qmake.conf and # win32-clang-g++/qmake.conf # @@ -50,14 +50,7 @@ index 610503379d..f099380cca 100644 # can't add 'DEFINES += WIN64' and 'QMAKE_COMPILER_DEFINES += _WIN64' defines for # x86_64 platform similar to 'msvc-desktop.conf' toolchain, because, unlike for MSVC, # 'QMAKE_TARGET.arch' is inherently unavailable. - -+# prevent definition of _xgetbv() in psdk_inc/intrin-impl.h (already defined in xsaveintrin.h) -+DEFINES += __INTRINSIC_DEFINED__xgetbv -+ - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = bison -y -@@ -34,6 +43,7 @@ QMAKE_CFLAGS_SSE2 += -mstackrealign +@@ -34,6 +40,7 @@ QMAKE_CFLAGS_SSE2 += -mstackrealign QMAKE_CXXFLAGS_RTTI_ON = -frtti QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads @@ -65,7 +58,7 @@ index 610503379d..f099380cca 100644 QMAKE_INCDIR = -@@ -42,41 +52,53 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< +@@ -42,41 +49,53 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< @@ -170,5 +163,5 @@ index ed131c6823..b77d86cd6b 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index c26ef5b8..6050478b 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 2cf971ff3e2c1a6f736d6b23f843f00456e3949b Mon Sep 17 00:00:00 2001 +From 190efab0758fdd9055145491f6c788996fa6b7ce Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL @@ -23,5 +23,5 @@ index 1a43f13d9b..a4c954a453 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch index b22e59f7..a6af034b 100644 --- a/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch +++ b/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch @@ -1,4 +1,4 @@ -From cb3fe1244a3c10139b4019d3378e644d41b6db6c Mon Sep 17 00:00:00 2001 +From f17fa5afa2f24bc569eda2bbe35b77a4ab268608 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:41:38 +0200 Subject: [PATCH 03/33] Use external ANGLE library @@ -93,5 +93,5 @@ index 1f7c5d99c1..24e24ef7f1 100644 SUBDIRS += src_3rdparty_libpng src_3rdparty_freetype.depends += src_3rdparty_libpng -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 7cb589f5..3c4a639d 100644 --- a/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From ad81c1479122de4d4468cabf26c9f19b5703d9c1 Mon Sep 17 00:00:00 2001 +From 1ec5d5ee305fd993022c404ad00e5c3f4524d007 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 04/33] Fix too many sections assemler error in OpenGL factory @@ -25,5 +25,5 @@ index 4c778b184e..1dd1755d7f 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch index 6968e393..793cde11 100644 --- a/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 5bd6c26b352fe5bdf4d62ace615ccdd411c39002 Mon Sep 17 00:00:00 2001 +From ddc22a123829a1d50a82ea62e6b9f1df3496b253 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 05/33] Make sure *.pc files are installed correctly @@ -10,10 +10,10 @@ Subject: [PATCH 05/33] Make sure *.pc files are installed correctly 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 82573347b6..b9871ff49c 100644 +index 99aecdd8ce..6c614fd868 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3146,7 +3146,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3150,7 +3150,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index 82573347b6..b9871ff49c 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3171,7 +3171,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3175,7 +3175,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) if(fixify) { if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR").toQString()); @@ -62,5 +62,5 @@ index 75bb5d236d..737f3abc3a 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch index 45d79c88..45dc92b0 100644 --- a/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From 9b80c0d4cabad01097173fd73693417f9461f4e9 Mon Sep 17 00:00:00 2001 +From 1eb6c3cccc09e51f68f30ab2fc6d8bbf04085031 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 06/33] Don't add resource files to LIBS parameter @@ -24,5 +24,5 @@ index d6d6b04148..7bb616302f 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch index 8cd33a82..d15f39fb 100644 --- a/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 4beab05117f21513f0e400c94c9b3d31db25fec0 Mon Sep 17 00:00:00 2001 +From 31cca3a47eea50156a5549574d934dd0264cb0f3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 07/33] Prevent debug library names in pkg-config files @@ -15,10 +15,10 @@ files for the debug build an unique file name. 1 file changed, 3 insertions(+) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index b9871ff49c..0d07d6c333 100644 +index 6c614fd868..bd87c5bd6d 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3160,6 +3160,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3164,6 +3164,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (dot != -1) ret = ret.left(dot); } @@ -29,5 +29,5 @@ index b9871ff49c..0d07d6c333 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch index ff974a9c..0d22e8c1 100644 --- a/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From d4effcacb4dcb9e2cdd33162d7da3dd53e79a9aa Mon Sep 17 00:00:00 2001 +From c8ebd475383209c46510769731be7f7598e6feee Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 08/33] Fix linking against shared/static libpng @@ -23,5 +23,5 @@ index 219385a108..d629a45b92 100644 "use": [ { "lib": "zlib", "condition": "features.system-zlib" } -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch index 385522d8..85ac9f40 100644 --- a/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From 3f683a34bafb1cc19636c017febdc92a450be9e2 Mon Sep 17 00:00:00 2001 +From d79b593a0d432b88521ec58ed6e7411a85347bb8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 09/33] Fix linking against static D-Bus @@ -9,7 +9,7 @@ Subject: [PATCH 09/33] Fix linking against static D-Bus 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.json b/configure.json -index ae2aa22070..baa99a3da9 100644 +index b4a87f5505..c404fd7066 100644 --- a/configure.json +++ b/configure.json @@ -172,18 +172,23 @@ @@ -54,5 +54,5 @@ index 9eaebe6d7e..ac1b1d977b 100644 # include #else -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64-angle/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index a0ee8314..f2672212 100644 --- a/qt5-base/mingw-w64-angle/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/qt5-base/mingw-w64-angle/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 990f59202b9e39903d43ada99fd4f6b58e046c55 Mon Sep 17 00:00:00 2001 +From 6032fdbbd2df9576e7509b80c2e4d6c87d744470 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 10/33] Don't try to use debug version of D-Bus library @@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.json b/configure.json -index baa99a3da9..dfb8835ecb 100644 +index c404fd7066..1488cde728 100644 --- a/configure.json +++ b/configure.json @@ -185,7 +185,7 @@ @@ -25,5 +25,5 @@ index baa99a3da9..dfb8835ecb 100644 }, "condition": "config.win32 && features.shared" -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-freetype2.patch index afeb1252..c9fbd7f6 100644 --- a/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From 7c357a7a1a8e7b5ab4eb2bf4dfce9a5aee5c444d Mon Sep 17 00:00:00 2001 +From a1ce36f86105230865fd6fb5eb4f0bbe09d7221b Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 11/33] Fix linking against static freetype2 @@ -26,5 +26,5 @@ index d629a45b92..afa3d95f39 100644 }, "fontconfig": { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-harfbuzz.patch index 33e27261..16e00a6b 100644 --- a/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From e7137841052bacf081a9d8c33486ffc86403acd5 Mon Sep 17 00:00:00 2001 +From ab966035502f0b14f4e9b037223c9d84646f0bf2 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 12/33] Fix linking against static harfbuzz @@ -25,5 +25,5 @@ index afa3d95f39..a2b0a00d09 100644 }, "imf": { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0013-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-angle/0013-Fix-linking-against-static-pcre.patch index 4c94c36c..9d242b10 100644 --- a/qt5-base/mingw-w64-angle/0013-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64-angle/0013-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From d0bc7fd8109d53c80976e00f89af33a2b841a595 Mon Sep 17 00:00:00 2001 +From 313ee18fb5ba456880fbcfcb5f5d991235094da4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 13/33] Fix linking against static pcre @@ -24,5 +24,5 @@ index 13eff07c04..ea747244da 100644 #include -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-MariaDB.patch index 913a0837..22a251ae 100644 --- a/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From a2831789ce79bcff73a2cdb2378626f593499fd2 Mon Sep 17 00:00:00 2001 +From 267961ff9c908b5c02828b0c2842c8f320fa7f1b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 14/33] Fix linking against shared/static MariaDB @@ -23,5 +23,5 @@ index 234f880579..4619db4a54 100644 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64-angle/0015-Fix-linking-against-shared-static-PostgreSQL.patch index 38d22d9d..54b11a41 100644 --- a/qt5-base/mingw-w64-angle/0015-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64-angle/0015-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From 2097d5ad594a291ecf8ca098566681fa52731183 Mon Sep 17 00:00:00 2001 +From 00fc4018caca88c40fb216917ae0066aa3dd2ed3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL @@ -25,5 +25,5 @@ index 4619db4a54..ef0d45f6cc 100644 ] }, -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch index d95196cb..4208b789 100644 --- a/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 594acda6ca575369ca13cc4a14ba7bd392de4aee Mon Sep 17 00:00:00 2001 +From ef21b8b44d8c71e927a93bd24cdca38ec2c37391 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 16/33] Rename qtmain to qt5main @@ -12,10 +12,10 @@ Prevents conflict with mingw-w64-qt4 package 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index f099380cca..44c211d176 100644 +index e747ef16af..8b8a4ad240 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf -@@ -90,7 +90,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 +@@ -87,7 +87,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32 QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32 QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 @@ -25,7 +25,7 @@ index f099380cca..44c211d176 100644 QMAKE_IDL = $${CROSS_COMPILE}widl QMAKE_LIB = $${CROSS_COMPILE}ar -rc diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 66acedef55..5d553d9ca6 100644 +index 2ed708e085..e67917cc96 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -227,8 +227,8 @@ mac { @@ -66,5 +66,5 @@ index 4140ae48de..9ae73db74b 100644 CONFIG += static -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch index 0b364109..bee22db0 100644 --- a/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch +++ b/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch @@ -1,4 +1,4 @@ -From 2cfb089ea3b0155758be97c7ea8724d77f63a704 Mon Sep 17 00:00:00 2001 +From c79c2a4f048484d235574a69e6f6ba3dcff23abe Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:27:28 +0200 Subject: [PATCH 17/33] Build dynamic host libraries @@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644 -INSTALLS = lib +INSTALLS += lib -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0018-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64-angle/0018-Enable-rpath-for-build-tools.patch index 9a9bcbc0..4b5af4bf 100644 --- a/qt5-base/mingw-w64-angle/0018-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64-angle/0018-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From c2c76f23ead7aa39ab076de58fb52da7dd79d7eb Mon Sep 17 00:00:00 2001 +From 9a506994e00aa0fb257bfe80458b0543c0e9f8b0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 18/33] Enable rpath for build tools @@ -33,5 +33,5 @@ index 883f8ca215..786f2e660c 100644 INSTALLS += target -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0019-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64-angle/0019-Use-system-zlib-for-build-tools.patch index c41e5725..bfa04928 100644 --- a/qt5-base/mingw-w64-angle/0019-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64-angle/0019-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From e21b3f56efc786c0dd5dc75957fc6f3ba198d600 Mon Sep 17 00:00:00 2001 +From 92e7155e22bfe514a20d6ebf39b6bdfbf45f194c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 19/33] Use system zlib for build tools @@ -21,5 +21,5 @@ index a45382106a..17b9828581 100644 } else { CONFIG += no_core_dep -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch index c1473f53..8dca1167 100644 --- a/qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From b2f4400da1fce797a2a939f731ef2f5689a300c5 Mon Sep 17 00:00:00 2001 +From d3a0f355335aa086e2663d634f2f41766f1bcdd6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 20/33] Use *.dll.a as import lib extension @@ -11,7 +11,7 @@ mingw-w64 specific mkspec 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 5d553d9ca6..3e5ec55dae 100644 +index e67917cc96..2a94964b49 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -238,8 +238,9 @@ mac { @@ -64,5 +64,5 @@ index 737f3abc3a..2e6d5d94a9 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch index c532a95d..ad50940b 100644 --- a/qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 10b1ab0ecf79787af8906a6186088d7e81a05b8a Mon Sep 17 00:00:00 2001 +From 91d94eadf25139197ce3cf74bb75692e9c77db07 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 21/33] Merge shared and static library trees @@ -101,10 +101,10 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 0d07d6c333..5e84628e72 100644 +index bd87c5bd6d..736af1c843 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3163,6 +3163,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3167,6 +3167,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -114,7 +114,7 @@ index 0d07d6c333..5e84628e72 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3336,9 +3339,9 @@ MakefileGenerator::writePkgConfigFile() +@@ -3340,9 +3343,9 @@ MakefileGenerator::writePkgConfigFile() t << endl; // requires @@ -128,5 +128,5 @@ index 0d07d6c333..5e84628e72 100644 t << endl; -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64-angle/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index d894cf8e..59d65864 100644 --- a/qt5-base/mingw-w64-angle/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/qt5-base/mingw-w64-angle/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From a9a2bb15ac7ae34e43ff146c8dad6f15e3877dd7 Mon Sep 17 00:00:00 2001 +From 86e3c50a96608acab006e9e525c23e4f420d8b4d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 22/33] Pull dependencies of static libraries in CMake modules @@ -251,7 +251,7 @@ index 5baf0fdb10..ec5f3cc437 100644 + +endif() diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 5e84628e72..43f570fb2c 100644 +index 736af1c843..a1972b7eb0 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -994,10 +994,18 @@ MakefileGenerator::writePrlFile(QTextStream &t) @@ -278,5 +278,5 @@ index 5e84628e72..43f570fb2c 100644 } -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0023-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-angle/0023-Allow-usage-of-static-version-with-CMake.patch index 31bf85a1..cde35882 100644 --- a/qt5-base/mingw-w64-angle/0023-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64-angle/0023-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From 4e2e5f7c439f46101f59525af6f271912df5b133 Mon Sep 17 00:00:00 2001 +From 244565bea2e8c84287b0a5dbbacea3db7e186f6d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 23/33] Allow usage of static version with CMake @@ -22,10 +22,10 @@ installed in the same prefix create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 3e5ec55dae..b6c47124cc 100644 +index 2a94964b49..839a51f377 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -38,7 +38,7 @@ split_incpath { +@@ -42,7 +42,7 @@ split_incpath { $$QT_MODULE_INCLUDE_BASE/Qt$${CMAKE_MODULE_NAME}/$$eval(QT.$${MODULE}.VERSION)/Qt$${CMAKE_MODULE_NAME}) cmake_extra_source_includes.input = $$PWD/data/cmake/ExtraSourceIncludes.cmake.in @@ -992,5 +992,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64-angle/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index c0d4180c..2b5958cc 100644 --- a/qt5-base/mingw-w64-angle/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/qt5-base/mingw-w64-angle/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From c34e48c2f0ce088b746e2d8bdc646db929339454 Mon Sep 17 00:00:00 2001 +From dad3f2977824ca10f03f28486f10780fa2f615e3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 24/33] Adjust linker flags for static build with @@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644 +unset(_isExe) +!!ENDIF -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0025-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-angle/0025-Use-correct-pkg-config-static-flag.patch index b770cfd8..53944187 100644 --- a/qt5-base/mingw-w64-angle/0025-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64-angle/0025-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From f7284cc26542c8d760e0d348be44f1bf947296cb Mon Sep 17 00:00:00 2001 +From 2c846ab2a45c159905715e98338246f86e98e5a8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 25/33] Use correct pkg-config --static flag @@ -22,5 +22,5 @@ index c3ce522e4f..59a9b1e88a 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0026-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-angle/0026-Fix-macro-invoking-moc-rcc-and-uic.patch index 23e7c6f9..46fba5b4 100644 --- a/qt5-base/mingw-w64-angle/0026-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/qt5-base/mingw-w64-angle/0026-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From 9204f18623db15d10cadbd4c659f47550584984a Mon Sep 17 00:00:00 2001 +From 400f992fa24ed2b62be4258d5d26bff3846d95ce Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 26/33] Fix macro invoking moc, rcc and uic @@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake -index 1627de4002..ed0f6555a7 100644 +index 819b48f973..f11a61be6b 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target @@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0027-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-angle/0027-Ignore-errors-about-missing-feature-static.patch index e7d0f24d..a685f598 100644 --- a/qt5-base/mingw-w64-angle/0027-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64-angle/0027-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From c1a0fe77f6528695728fc35d7057da66939d39e0 Mon Sep 17 00:00:00 2001 +From 3872dc79e2e8c530ee73003c6c7f4b08e4697f7f Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 27/33] Ignore errors about missing feature static @@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0028-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-angle/0028-Enable-and-fix-use-of-iconv.patch index 72ac5516..6dbec1ec 100644 --- a/qt5-base/mingw-w64-angle/0028-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64-angle/0028-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 075aed08de151f6fc1c8dad91214c66ce4e614d5 Mon Sep 17 00:00:00 2001 +From c7eb8dbf86904eab61b3bb53f52563d861372f65 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 28/33] Enable and fix use of iconv @@ -63,7 +63,7 @@ index 330eb7c038..88a782b863 100644 #else char **inBytesPtr = &inBytes; diff --git a/src/corelib/configure.json b/src/corelib/configure.json -index 5e48024def..15e7372dcb 100644 +index dfb575da0d..a630d7abf3 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -539,9 +539,9 @@ @@ -79,5 +79,5 @@ index 5e48024def..15e7372dcb 100644 }, "icu": { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0029-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-angle/0029-Ignore-failing-pkg-config-test.patch index 61caf681..cd156a3a 100644 --- a/qt5-base/mingw-w64-angle/0029-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64-angle/0029-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From ef184cf89b14e092051a2644b5fefa0e2bfaf7fe Mon Sep 17 00:00:00 2001 +From 558b86ad0cbaa5fb318d729c3768bc51f385e7cd Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 29/33] Ignore failing pkg-config test @@ -9,7 +9,7 @@ Didn't investigate why it fails, let's hope for the best 1 file changed, 1 deletion(-) diff --git a/configure.json b/configure.json -index dfb8835ecb..f9735f59cd 100644 +index 1488cde728..a52c1c9c95 100644 --- a/configure.json +++ b/configure.json @@ -597,7 +597,6 @@ @@ -21,5 +21,5 @@ index dfb8835ecb..f9735f59cd 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-angle/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch index 38f184df..6b9077cc 100644 --- a/qt5-base/mingw-w64-angle/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64-angle/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From a401f6740c459cc21909ec406814852ff3ec233d Mon Sep 17 00:00:00 2001 +From cfdde9962386c34c3f2bfe902aa2a522b0530dba Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies @@ -11,7 +11,7 @@ static freetype2 and harfbuzz 2 files changed, 6 insertions(+) diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp -index 30f99174f8..154edd67d4 100644 +index 894020d2bd..5f57d6f5cb 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -414,6 +414,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) @@ -39,5 +39,5 @@ index 2e6d5d94a9..a8320bae09 100644 static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 }; for (int i = 0; lflags[i]; i++) { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0031-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64-angle/0031-Hardcode-linker-flags-for-platform-plugins.patch index 6f873f40..ad6fa90b 100644 --- a/qt5-base/mingw-w64-angle/0031-Hardcode-linker-flags-for-platform-plugins.patch +++ b/qt5-base/mingw-w64-angle/0031-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From 1c4ecb65d3f7a060f499cad169a7252b550f6769 Mon Sep 17 00:00:00 2001 +From 0e3e71c77f1bf23ab20c2c4b3219c371ba94825f Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 31/33] Hardcode linker flags for platform plugins @@ -106,5 +106,5 @@ index 174bc7b609..e66488e364 100644 include(windows.pri) -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0032-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64-angle/0032-Fix-linking-against-static-plugins-with-qmake.patch index 92b0abe8..d437395d 100644 --- a/qt5-base/mingw-w64-angle/0032-Fix-linking-against-static-plugins-with-qmake.patch +++ b/qt5-base/mingw-w64-angle/0032-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From af66aa78320b37f4c5100e2822eceb3ecd0a703a Mon Sep 17 00:00:00 2001 +From 8741a4b4d6c3bc569dc6452c777a7692266e6a91 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 32/33] Fix linking against static plugins with qmake @@ -33,5 +33,5 @@ index 6eebd068f1..310b8713f0 100644 # Check if the plugin is known to Qt. We can use this to determine # the plugin path. Unknown plugins must rely on the default link path. -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/0033-Disable-hardware-randomizer-for-32-bit.patch b/qt5-base/mingw-w64-angle/0033-Disable-hardware-randomizer-for-32-bit.patch index d7cf9b4b..c3b291a1 100644 --- a/qt5-base/mingw-w64-angle/0033-Disable-hardware-randomizer-for-32-bit.patch +++ b/qt5-base/mingw-w64-angle/0033-Disable-hardware-randomizer-for-32-bit.patch @@ -1,4 +1,4 @@ -From 3758ea380174eaf89f31b68d5b7e4e2bf02e50be Mon Sep 17 00:00:00 2001 +From 4c9b1ccd23a3d0b63e57f5dff781ae8650b5d85c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 26 May 2018 03:47:14 +0200 Subject: [PATCH 33/33] Disable hardware randomizer for 32-bit @@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644 #else return false; -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-angle/PKGBUILD b/qt5-base/mingw-w64-angle/PKGBUILD index 21682889..cb7d031c 100644 --- a/qt5-base/mingw-w64-angle/PKGBUILD +++ b/qt5-base/mingw-w64-angle/PKGBUILD @@ -36,7 +36,7 @@ isNoOpenGL() { } pkgname=mingw-w64-qt5-base-angle -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 pkgdesc='A cross-platform application and UI framework (mingw-w64)' # The static variant doesn't contain any executables which need to be executed on the build machine @@ -85,40 +85,40 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0031-Hardcode-linker-flags-for-platform-plugins.patch' '0032-Fix-linking-against-static-plugins-with-qmake.patch' '0033-Disable-hardware-randomizer-for-32-bit.patch') -sha256sums=('ed6e46db84f7d34923ab4eae165c63e05ab3cfa9d19a73d3f57b4e7bfd41de66' - 'd01df5be5f96578f65c0343b1ae6eaac31e0c7608fb9b69e745865a5dfc8a1a3' - '29621ba67b026c9fb61ba865ba9d6198d3b8914623609b97bbc375feb33415b2' - '58435fde3af1478450c49637581884c217bd9080704dc80d035eb38df4706a6e' - '3b4dff095110e60257f794c31e5c3b7f73c91d690c7acb3182b489d04988dd27' - '2b62c549626e76da5c36779fe7dd18bddb8041fdb1b983cd29651cf5b0a2b905' - '5c94228d93b7a6340098968738477f9720908a360358f51cd1bc6590e83679c0' - '164b09da056113e19b859a151f93803f19e0c9ea5130db916722f5f0bcb7a8cd' - '351e61261c87d700f4076c6d3f19e81a60d1bfcc0e64f2164cb2696c47a0fafc' - 'a1ed220ddba56656fdbc37163e794f3b43e9a5dae6099b2b23967e870cd9214e' - '844d136f65d498dc1eea11e1882cf2645320d249c82fdcec5d25875e9158cb39' - 'a4a4f5ea9bc79b474ea3c5d86903054d6e9242a22b84589c210b3b8c2f797447' - '7d1d1d57bff00ae77d5480955b85737bd4f30185f5b99f8b34d89f90976f53fb' - '1937bb971912fa7021295174aee8c250a7be9c2d3e3ad76f700d9f7d80fd1117' - '504fd54855d13a326cb65cffc006d1c67d9e6236830df9f581106ae8fe319fff' - 'b732bca79bced6595e278e9e7ceec79306f51be121e78db0a9faa461344c918d' - 'f86242c7e013971812c9a17d667db362ac10d19a63b51cda23d1f306bc8f3242' - 'da007b133f51f27342854e0fb251a1784096f24dab454def99c8496c143f38e5' - 'e6e8f2290a019071ded71c090c3cb8b24e0e33a37dcabdc6f676b886c18dd06a' - '83645b01666aae48121ea9a952c6cfce9ba2aedb3edb9e1b11a893a5d8882831' - 'bb7e54a090ceb6cddac43acee2f34d888a15df2ae0e99808ef6aad9ff6e9ebcf' - '7166f4ab8b7c5a60c4a6e3ac86411719fab67ef6a6c5a16463c6541e9955ce17' - 'bf1defbedd5c0d26aa000178092ac2c87ecb70b992184dc8ffff4502351e70c2' - '29289ac6b2380c4a5d551d3c9b331f9b13190f4dafabdc203dcbfabcb4075c4d' - '0494a41d31ff097cd59117557a6869c5e0e7670eef33267f93974c15e4445e76' - 'bc53b50f4055170fea15b669366b8961e896d2705f91382ee3beea013979408e' - '08d299eb938edc1d535bbb68b5b720203e2dffbc49129218bb1368791e6fb384' - '20d945b374b0e73501013fcf6ba9fd7e8732b76060c948faeb42c605f2f9dd1f' - 'd9eeaceb89efd143918a1bfed6b60d33e004e8421a613036647f318320b25d6a' - 'fb54191f4479ed66446d9c6b9066be11c5d2d580ff4aa0910a3ad29183329e75' - 'df8bfa7901b6af9de447a4f4d0983419f7c1fe5882cc97614d0e5b0759c67dec' - '65d4a1aedc465dd9f5284cd1e2a352bc3c21e8e8e697e58ff9e89f54e5fcb173' - '178144d85cf4c69ae5cea694959a555c4a8eb3a0a5ad5116a2c979beac0e36c0' - '704c95d7fc157e58cc7d4436eb74bdcc0453ba29bb3326a3fe511ee35273e4c3') +sha256sums=('a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46' + 'e1973bda25994e3dc3d6c1b4d9b78fbbb540490d2da43db166df14f776a39039' + '46da072fdffff5edee7c23a024f4a28ca55b5ae57890145fb59ebe00bbeb897e' + '48a9629a9f26b7e828d6021e7db0149421ad05c3927cb9b60147c90caa487f9b' + 'b8d97a80c547e90e1348fa722b26dbda3d1f07ddfa4a00a0a268a5dbb3de489d' + '765501ce588fe5ebaccc8e54f3a588a08abceae304a19988358dd118fead847c' + '80181dda780b44bc24d3d7f0eb6b7c496170ef0db5955dd2d7e4214a24b48169' + '22974a0a1f902f812a655e86fb0bb18a7931be89240aef3a5b5eebadf085cbce' + '1eeeaf5b710df4846c94ad3e06802cd204ebfaf481905fe2644421efd557ff0f' + 'd26c120c12eddc18f1a424117e38c27c8171dfccb7d5ba1fcf3991d57328b9d7' + 'a8e27ad9ef209661ba42112a49f0fbf29fdb9bc94d6ad51f715e59b031d3230d' + 'dacf9cbed1f0f309b8394d4a1a27d60b641f3d19e70352827b1ef123dcf194a8' + '7e919946802ba7b3d666b69c661dff396abfc24b046edb439b684d4b3cc7f42f' + '03003c3a2a16d6f7b36436d8b63496fb5eb97c5da9770eb3f0d0bc3090b5d4e4' + '910f6198069a5d72b88bab70bfef2de50cf44f253a61a37e24c10d3d2d1f2590' + 'a262866828f5fd77c49d4dd62aa49447ab2e59eb7031a3bc09304ef100837ce5' + '613246baff8474c33314c6320fbf163835d36e9aae3221ab1c3ad87a55bcab9a' + '3e08a5af6515821049d611143782bfe1bea7b75c46b25a1a8cdd5b5d66f01cde' + '9ab6cd425c778cded2575d22a4577d5ae220f7a031e3ebc9581fe871f5bbda98' + '90bd7cfdb2a8e890db775293b498008264ccb5571247c77a1dbca21ef96f0e3f' + '37fa408528ff94f4f41e27097a619acc7dd97e66a9f2584178517079e3c5232c' + '4b293b11424efabcf25fc634fd7eec058351297474fcaaad6bbbf3b7be94e39f' + '3878d33beb40fc2907ccfaf7f656e983e30399bd0f6afa78658d802715e2e91d' + 'f96bea78b8a04a5d278cd01fdc6478a79beea6bba8f922a7ba91b14acd7998b3' + 'c0dc173b900ea5edc45ab2695406b1ca11c08113d8c402672208bee95deff4c7' + 'feb8bf1ee858b8c499c3644c95454880835adc85a5039f6d2027b06caa552be1' + 'e463ff31d6bc218a3724d95463b405f63ee66fb270ac1bbc0f3fc3d1e81c6444' + 'faeac0d51bc8ddda40fd02fdf8aff5f35187d9a3bcfa9c0a02d6d19a7314f91c' + '241790c3788449d71ef38c84c15fa158408057730b782fb7976e93ba26df4876' + 'e2983e47533094c5add54bdc4d565f7107b5508a2b23c3de8e0e92bf93627505' + '5a8f2561eb06951b5923f115cdcb7df863169c4db01207dc216ede107e9fca7c' + 'e907fb9111c9a54ac91a538a40b420088d54f86f047c129b0b6e4ff4423ae982' + '60cdf773863423f33207526b343cf72c76ee1680af27fb3c494f63ce9a58f9e8' + '7e353383fbd5ce8368089b5ec4ced6f19674c4490a46d4e0db81e1ea6800b180') _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 013d327f..dd47ebc2 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 bd010d1fb00f61dd6cca52c93a4285c5d967029b Mon Sep 17 00:00:00 2001 +From 955c44726565654efbf8099a66b1e3b23e2d41df Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with @@ -13,16 +13,16 @@ Also see the following issues: * https://github.com/Martchus/PKGBUILDs/issues/59 * https://github.com/Martchus/PKGBUILDs/issues/60 --- - mkspecs/common/g++-win32.conf | 56 +++++++++++++++++++++--------- + mkspecs/common/g++-win32.conf | 53 ++++++++++++++++++++---------- mkspecs/win32-clang-g++/qmake.conf | 4 +-- mkspecs/win32-g++/qmake.conf | 4 +-- - 3 files changed, 43 insertions(+), 21 deletions(-) + 3 files changed, 40 insertions(+), 21 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index 610503379d..f099380cca 100644 +index 610503379d..e747ef16af 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf -@@ -8,22 +8,31 @@ +@@ -8,18 +8,24 @@ # Compiler-specific settings go into win32-g++/qmake.conf and # win32-clang-g++/qmake.conf # @@ -50,14 +50,7 @@ index 610503379d..f099380cca 100644 # can't add 'DEFINES += WIN64' and 'QMAKE_COMPILER_DEFINES += _WIN64' defines for # x86_64 platform similar to 'msvc-desktop.conf' toolchain, because, unlike for MSVC, # 'QMAKE_TARGET.arch' is inherently unavailable. - -+# prevent definition of _xgetbv() in psdk_inc/intrin-impl.h (already defined in xsaveintrin.h) -+DEFINES += __INTRINSIC_DEFINED__xgetbv -+ - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = bison -y -@@ -34,6 +43,7 @@ QMAKE_CFLAGS_SSE2 += -mstackrealign +@@ -34,6 +40,7 @@ QMAKE_CFLAGS_SSE2 += -mstackrealign QMAKE_CXXFLAGS_RTTI_ON = -frtti QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads @@ -65,7 +58,7 @@ index 610503379d..f099380cca 100644 QMAKE_INCDIR = -@@ -42,41 +52,53 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< +@@ -42,41 +49,53 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< @@ -170,5 +163,5 @@ index ed131c6823..b77d86cd6b 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index c26ef5b8..6050478b 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 2cf971ff3e2c1a6f736d6b23f843f00456e3949b Mon Sep 17 00:00:00 2001 +From 190efab0758fdd9055145491f6c788996fa6b7ce Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL @@ -23,5 +23,5 @@ index 1a43f13d9b..a4c954a453 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch index b22e59f7..a6af034b 100644 --- a/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch +++ b/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch @@ -1,4 +1,4 @@ -From cb3fe1244a3c10139b4019d3378e644d41b6db6c Mon Sep 17 00:00:00 2001 +From f17fa5afa2f24bc569eda2bbe35b77a4ab268608 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:41:38 +0200 Subject: [PATCH 03/33] Use external ANGLE library @@ -93,5 +93,5 @@ index 1f7c5d99c1..24e24ef7f1 100644 SUBDIRS += src_3rdparty_libpng src_3rdparty_freetype.depends += src_3rdparty_libpng -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 7cb589f5..3c4a639d 100644 --- a/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From ad81c1479122de4d4468cabf26c9f19b5703d9c1 Mon Sep 17 00:00:00 2001 +From 1ec5d5ee305fd993022c404ad00e5c3f4524d007 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 04/33] Fix too many sections assemler error in OpenGL factory @@ -25,5 +25,5 @@ index 4c778b184e..1dd1755d7f 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch index 6968e393..793cde11 100644 --- a/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 5bd6c26b352fe5bdf4d62ace615ccdd411c39002 Mon Sep 17 00:00:00 2001 +From ddc22a123829a1d50a82ea62e6b9f1df3496b253 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 05/33] Make sure *.pc files are installed correctly @@ -10,10 +10,10 @@ Subject: [PATCH 05/33] Make sure *.pc files are installed correctly 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 82573347b6..b9871ff49c 100644 +index 99aecdd8ce..6c614fd868 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3146,7 +3146,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3150,7 +3150,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index 82573347b6..b9871ff49c 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3171,7 +3171,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3175,7 +3175,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) if(fixify) { if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR").toQString()); @@ -62,5 +62,5 @@ index 75bb5d236d..737f3abc3a 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch index 45d79c88..45dc92b0 100644 --- a/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From 9b80c0d4cabad01097173fd73693417f9461f4e9 Mon Sep 17 00:00:00 2001 +From 1eb6c3cccc09e51f68f30ab2fc6d8bbf04085031 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 06/33] Don't add resource files to LIBS parameter @@ -24,5 +24,5 @@ index d6d6b04148..7bb616302f 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch index 8cd33a82..d15f39fb 100644 --- a/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 4beab05117f21513f0e400c94c9b3d31db25fec0 Mon Sep 17 00:00:00 2001 +From 31cca3a47eea50156a5549574d934dd0264cb0f3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 07/33] Prevent debug library names in pkg-config files @@ -15,10 +15,10 @@ files for the debug build an unique file name. 1 file changed, 3 insertions(+) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index b9871ff49c..0d07d6c333 100644 +index 6c614fd868..bd87c5bd6d 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3160,6 +3160,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3164,6 +3164,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (dot != -1) ret = ret.left(dot); } @@ -29,5 +29,5 @@ index b9871ff49c..0d07d6c333 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch index ff974a9c..0d22e8c1 100644 --- a/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From d4effcacb4dcb9e2cdd33162d7da3dd53e79a9aa Mon Sep 17 00:00:00 2001 +From c8ebd475383209c46510769731be7f7598e6feee Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 08/33] Fix linking against shared/static libpng @@ -23,5 +23,5 @@ index 219385a108..d629a45b92 100644 "use": [ { "lib": "zlib", "condition": "features.system-zlib" } -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch index 385522d8..85ac9f40 100644 --- a/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From 3f683a34bafb1cc19636c017febdc92a450be9e2 Mon Sep 17 00:00:00 2001 +From d79b593a0d432b88521ec58ed6e7411a85347bb8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 09/33] Fix linking against static D-Bus @@ -9,7 +9,7 @@ Subject: [PATCH 09/33] Fix linking against static D-Bus 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.json b/configure.json -index ae2aa22070..baa99a3da9 100644 +index b4a87f5505..c404fd7066 100644 --- a/configure.json +++ b/configure.json @@ -172,18 +172,23 @@ @@ -54,5 +54,5 @@ index 9eaebe6d7e..ac1b1d977b 100644 # include #else -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64-dynamic/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index a0ee8314..f2672212 100644 --- a/qt5-base/mingw-w64-dynamic/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/qt5-base/mingw-w64-dynamic/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 990f59202b9e39903d43ada99fd4f6b58e046c55 Mon Sep 17 00:00:00 2001 +From 6032fdbbd2df9576e7509b80c2e4d6c87d744470 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 10/33] Don't try to use debug version of D-Bus library @@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.json b/configure.json -index baa99a3da9..dfb8835ecb 100644 +index c404fd7066..1488cde728 100644 --- a/configure.json +++ b/configure.json @@ -185,7 +185,7 @@ @@ -25,5 +25,5 @@ index baa99a3da9..dfb8835ecb 100644 }, "condition": "config.win32 && features.shared" -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-freetype2.patch index afeb1252..c9fbd7f6 100644 --- a/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From 7c357a7a1a8e7b5ab4eb2bf4dfce9a5aee5c444d Mon Sep 17 00:00:00 2001 +From a1ce36f86105230865fd6fb5eb4f0bbe09d7221b Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 11/33] Fix linking against static freetype2 @@ -26,5 +26,5 @@ index d629a45b92..afa3d95f39 100644 }, "fontconfig": { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-harfbuzz.patch index 33e27261..16e00a6b 100644 --- a/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From e7137841052bacf081a9d8c33486ffc86403acd5 Mon Sep 17 00:00:00 2001 +From ab966035502f0b14f4e9b037223c9d84646f0bf2 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 12/33] Fix linking against static harfbuzz @@ -25,5 +25,5 @@ index afa3d95f39..a2b0a00d09 100644 }, "imf": { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-static-pcre.patch index 4c94c36c..9d242b10 100644 --- a/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From d0bc7fd8109d53c80976e00f89af33a2b841a595 Mon Sep 17 00:00:00 2001 +From 313ee18fb5ba456880fbcfcb5f5d991235094da4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 13/33] Fix linking against static pcre @@ -24,5 +24,5 @@ index 13eff07c04..ea747244da 100644 #include -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-MariaDB.patch index 913a0837..22a251ae 100644 --- a/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From a2831789ce79bcff73a2cdb2378626f593499fd2 Mon Sep 17 00:00:00 2001 +From 267961ff9c908b5c02828b0c2842c8f320fa7f1b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 14/33] Fix linking against shared/static MariaDB @@ -23,5 +23,5 @@ index 234f880579..4619db4a54 100644 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64-dynamic/0015-Fix-linking-against-shared-static-PostgreSQL.patch index 38d22d9d..54b11a41 100644 --- a/qt5-base/mingw-w64-dynamic/0015-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64-dynamic/0015-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From 2097d5ad594a291ecf8ca098566681fa52731183 Mon Sep 17 00:00:00 2001 +From 00fc4018caca88c40fb216917ae0066aa3dd2ed3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL @@ -25,5 +25,5 @@ index 4619db4a54..ef0d45f6cc 100644 ] }, -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch index d95196cb..4208b789 100644 --- a/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 594acda6ca575369ca13cc4a14ba7bd392de4aee Mon Sep 17 00:00:00 2001 +From ef21b8b44d8c71e927a93bd24cdca38ec2c37391 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 16/33] Rename qtmain to qt5main @@ -12,10 +12,10 @@ Prevents conflict with mingw-w64-qt4 package 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index f099380cca..44c211d176 100644 +index e747ef16af..8b8a4ad240 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf -@@ -90,7 +90,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 +@@ -87,7 +87,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32 QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32 QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 @@ -25,7 +25,7 @@ index f099380cca..44c211d176 100644 QMAKE_IDL = $${CROSS_COMPILE}widl QMAKE_LIB = $${CROSS_COMPILE}ar -rc diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 66acedef55..5d553d9ca6 100644 +index 2ed708e085..e67917cc96 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -227,8 +227,8 @@ mac { @@ -66,5 +66,5 @@ index 4140ae48de..9ae73db74b 100644 CONFIG += static -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch index 0b364109..bee22db0 100644 --- a/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch +++ b/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch @@ -1,4 +1,4 @@ -From 2cfb089ea3b0155758be97c7ea8724d77f63a704 Mon Sep 17 00:00:00 2001 +From c79c2a4f048484d235574a69e6f6ba3dcff23abe Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:27:28 +0200 Subject: [PATCH 17/33] Build dynamic host libraries @@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644 -INSTALLS = lib +INSTALLS += lib -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0018-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64-dynamic/0018-Enable-rpath-for-build-tools.patch index 9a9bcbc0..4b5af4bf 100644 --- a/qt5-base/mingw-w64-dynamic/0018-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64-dynamic/0018-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From c2c76f23ead7aa39ab076de58fb52da7dd79d7eb Mon Sep 17 00:00:00 2001 +From 9a506994e00aa0fb257bfe80458b0543c0e9f8b0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 18/33] Enable rpath for build tools @@ -33,5 +33,5 @@ index 883f8ca215..786f2e660c 100644 INSTALLS += target -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0019-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64-dynamic/0019-Use-system-zlib-for-build-tools.patch index c41e5725..bfa04928 100644 --- a/qt5-base/mingw-w64-dynamic/0019-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64-dynamic/0019-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From e21b3f56efc786c0dd5dc75957fc6f3ba198d600 Mon Sep 17 00:00:00 2001 +From 92e7155e22bfe514a20d6ebf39b6bdfbf45f194c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 19/33] Use system zlib for build tools @@ -21,5 +21,5 @@ index a45382106a..17b9828581 100644 } else { CONFIG += no_core_dep -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch index c1473f53..8dca1167 100644 --- a/qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From b2f4400da1fce797a2a939f731ef2f5689a300c5 Mon Sep 17 00:00:00 2001 +From d3a0f355335aa086e2663d634f2f41766f1bcdd6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 20/33] Use *.dll.a as import lib extension @@ -11,7 +11,7 @@ mingw-w64 specific mkspec 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 5d553d9ca6..3e5ec55dae 100644 +index e67917cc96..2a94964b49 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -238,8 +238,9 @@ mac { @@ -64,5 +64,5 @@ index 737f3abc3a..2e6d5d94a9 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch index c532a95d..ad50940b 100644 --- a/qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 10b1ab0ecf79787af8906a6186088d7e81a05b8a Mon Sep 17 00:00:00 2001 +From 91d94eadf25139197ce3cf74bb75692e9c77db07 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 21/33] Merge shared and static library trees @@ -101,10 +101,10 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 0d07d6c333..5e84628e72 100644 +index bd87c5bd6d..736af1c843 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3163,6 +3163,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3167,6 +3167,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -114,7 +114,7 @@ index 0d07d6c333..5e84628e72 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3336,9 +3339,9 @@ MakefileGenerator::writePkgConfigFile() +@@ -3340,9 +3343,9 @@ MakefileGenerator::writePkgConfigFile() t << endl; // requires @@ -128,5 +128,5 @@ index 0d07d6c333..5e84628e72 100644 t << endl; -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64-dynamic/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index d894cf8e..59d65864 100644 --- a/qt5-base/mingw-w64-dynamic/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/qt5-base/mingw-w64-dynamic/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From a9a2bb15ac7ae34e43ff146c8dad6f15e3877dd7 Mon Sep 17 00:00:00 2001 +From 86e3c50a96608acab006e9e525c23e4f420d8b4d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 22/33] Pull dependencies of static libraries in CMake modules @@ -251,7 +251,7 @@ index 5baf0fdb10..ec5f3cc437 100644 + +endif() diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 5e84628e72..43f570fb2c 100644 +index 736af1c843..a1972b7eb0 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -994,10 +994,18 @@ MakefileGenerator::writePrlFile(QTextStream &t) @@ -278,5 +278,5 @@ index 5e84628e72..43f570fb2c 100644 } -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0023-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-dynamic/0023-Allow-usage-of-static-version-with-CMake.patch index 31bf85a1..cde35882 100644 --- a/qt5-base/mingw-w64-dynamic/0023-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64-dynamic/0023-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From 4e2e5f7c439f46101f59525af6f271912df5b133 Mon Sep 17 00:00:00 2001 +From 244565bea2e8c84287b0a5dbbacea3db7e186f6d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 23/33] Allow usage of static version with CMake @@ -22,10 +22,10 @@ installed in the same prefix create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 3e5ec55dae..b6c47124cc 100644 +index 2a94964b49..839a51f377 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -38,7 +38,7 @@ split_incpath { +@@ -42,7 +42,7 @@ split_incpath { $$QT_MODULE_INCLUDE_BASE/Qt$${CMAKE_MODULE_NAME}/$$eval(QT.$${MODULE}.VERSION)/Qt$${CMAKE_MODULE_NAME}) cmake_extra_source_includes.input = $$PWD/data/cmake/ExtraSourceIncludes.cmake.in @@ -992,5 +992,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64-dynamic/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index c0d4180c..2b5958cc 100644 --- a/qt5-base/mingw-w64-dynamic/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/qt5-base/mingw-w64-dynamic/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From c34e48c2f0ce088b746e2d8bdc646db929339454 Mon Sep 17 00:00:00 2001 +From dad3f2977824ca10f03f28486f10780fa2f615e3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 24/33] Adjust linker flags for static build with @@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644 +unset(_isExe) +!!ENDIF -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0025-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-dynamic/0025-Use-correct-pkg-config-static-flag.patch index b770cfd8..53944187 100644 --- a/qt5-base/mingw-w64-dynamic/0025-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64-dynamic/0025-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From f7284cc26542c8d760e0d348be44f1bf947296cb Mon Sep 17 00:00:00 2001 +From 2c846ab2a45c159905715e98338246f86e98e5a8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 25/33] Use correct pkg-config --static flag @@ -22,5 +22,5 @@ index c3ce522e4f..59a9b1e88a 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0026-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-dynamic/0026-Fix-macro-invoking-moc-rcc-and-uic.patch index 23e7c6f9..46fba5b4 100644 --- a/qt5-base/mingw-w64-dynamic/0026-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/qt5-base/mingw-w64-dynamic/0026-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From 9204f18623db15d10cadbd4c659f47550584984a Mon Sep 17 00:00:00 2001 +From 400f992fa24ed2b62be4258d5d26bff3846d95ce Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 26/33] Fix macro invoking moc, rcc and uic @@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake -index 1627de4002..ed0f6555a7 100644 +index 819b48f973..f11a61be6b 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target @@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0027-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-dynamic/0027-Ignore-errors-about-missing-feature-static.patch index e7d0f24d..a685f598 100644 --- a/qt5-base/mingw-w64-dynamic/0027-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64-dynamic/0027-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From c1a0fe77f6528695728fc35d7057da66939d39e0 Mon Sep 17 00:00:00 2001 +From 3872dc79e2e8c530ee73003c6c7f4b08e4697f7f Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 27/33] Ignore errors about missing feature static @@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0028-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-dynamic/0028-Enable-and-fix-use-of-iconv.patch index 72ac5516..6dbec1ec 100644 --- a/qt5-base/mingw-w64-dynamic/0028-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64-dynamic/0028-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 075aed08de151f6fc1c8dad91214c66ce4e614d5 Mon Sep 17 00:00:00 2001 +From c7eb8dbf86904eab61b3bb53f52563d861372f65 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 28/33] Enable and fix use of iconv @@ -63,7 +63,7 @@ index 330eb7c038..88a782b863 100644 #else char **inBytesPtr = &inBytes; diff --git a/src/corelib/configure.json b/src/corelib/configure.json -index 5e48024def..15e7372dcb 100644 +index dfb575da0d..a630d7abf3 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -539,9 +539,9 @@ @@ -79,5 +79,5 @@ index 5e48024def..15e7372dcb 100644 }, "icu": { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0029-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-dynamic/0029-Ignore-failing-pkg-config-test.patch index 61caf681..cd156a3a 100644 --- a/qt5-base/mingw-w64-dynamic/0029-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64-dynamic/0029-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From ef184cf89b14e092051a2644b5fefa0e2bfaf7fe Mon Sep 17 00:00:00 2001 +From 558b86ad0cbaa5fb318d729c3768bc51f385e7cd Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 29/33] Ignore failing pkg-config test @@ -9,7 +9,7 @@ Didn't investigate why it fails, let's hope for the best 1 file changed, 1 deletion(-) diff --git a/configure.json b/configure.json -index dfb8835ecb..f9735f59cd 100644 +index 1488cde728..a52c1c9c95 100644 --- a/configure.json +++ b/configure.json @@ -597,7 +597,6 @@ @@ -21,5 +21,5 @@ index dfb8835ecb..f9735f59cd 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-dynamic/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch index 38f184df..6b9077cc 100644 --- a/qt5-base/mingw-w64-dynamic/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64-dynamic/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From a401f6740c459cc21909ec406814852ff3ec233d Mon Sep 17 00:00:00 2001 +From cfdde9962386c34c3f2bfe902aa2a522b0530dba Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies @@ -11,7 +11,7 @@ static freetype2 and harfbuzz 2 files changed, 6 insertions(+) diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp -index 30f99174f8..154edd67d4 100644 +index 894020d2bd..5f57d6f5cb 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -414,6 +414,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) @@ -39,5 +39,5 @@ index 2e6d5d94a9..a8320bae09 100644 static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 }; for (int i = 0; lflags[i]; i++) { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0031-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64-dynamic/0031-Hardcode-linker-flags-for-platform-plugins.patch index 6f873f40..ad6fa90b 100644 --- a/qt5-base/mingw-w64-dynamic/0031-Hardcode-linker-flags-for-platform-plugins.patch +++ b/qt5-base/mingw-w64-dynamic/0031-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From 1c4ecb65d3f7a060f499cad169a7252b550f6769 Mon Sep 17 00:00:00 2001 +From 0e3e71c77f1bf23ab20c2c4b3219c371ba94825f Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 31/33] Hardcode linker flags for platform plugins @@ -106,5 +106,5 @@ index 174bc7b609..e66488e364 100644 include(windows.pri) -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0032-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64-dynamic/0032-Fix-linking-against-static-plugins-with-qmake.patch index 92b0abe8..d437395d 100644 --- a/qt5-base/mingw-w64-dynamic/0032-Fix-linking-against-static-plugins-with-qmake.patch +++ b/qt5-base/mingw-w64-dynamic/0032-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From af66aa78320b37f4c5100e2822eceb3ecd0a703a Mon Sep 17 00:00:00 2001 +From 8741a4b4d6c3bc569dc6452c777a7692266e6a91 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 32/33] Fix linking against static plugins with qmake @@ -33,5 +33,5 @@ index 6eebd068f1..310b8713f0 100644 # Check if the plugin is known to Qt. We can use this to determine # the plugin path. Unknown plugins must rely on the default link path. -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/0033-Disable-hardware-randomizer-for-32-bit.patch b/qt5-base/mingw-w64-dynamic/0033-Disable-hardware-randomizer-for-32-bit.patch index d7cf9b4b..c3b291a1 100644 --- a/qt5-base/mingw-w64-dynamic/0033-Disable-hardware-randomizer-for-32-bit.patch +++ b/qt5-base/mingw-w64-dynamic/0033-Disable-hardware-randomizer-for-32-bit.patch @@ -1,4 +1,4 @@ -From 3758ea380174eaf89f31b68d5b7e4e2bf02e50be Mon Sep 17 00:00:00 2001 +From 4c9b1ccd23a3d0b63e57f5dff781ae8650b5d85c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 26 May 2018 03:47:14 +0200 Subject: [PATCH 33/33] Disable hardware randomizer for 32-bit @@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644 #else return false; -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-dynamic/PKGBUILD b/qt5-base/mingw-w64-dynamic/PKGBUILD index 376d373a..0103b255 100644 --- a/qt5-base/mingw-w64-dynamic/PKGBUILD +++ b/qt5-base/mingw-w64-dynamic/PKGBUILD @@ -36,7 +36,7 @@ isNoOpenGL() { } pkgname=mingw-w64-qt5-base-dynamic -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 pkgdesc='A cross-platform application and UI framework (mingw-w64)' # The static variant doesn't contain any executables which need to be executed on the build machine @@ -85,40 +85,40 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0031-Hardcode-linker-flags-for-platform-plugins.patch' '0032-Fix-linking-against-static-plugins-with-qmake.patch' '0033-Disable-hardware-randomizer-for-32-bit.patch') -sha256sums=('ed6e46db84f7d34923ab4eae165c63e05ab3cfa9d19a73d3f57b4e7bfd41de66' - 'd01df5be5f96578f65c0343b1ae6eaac31e0c7608fb9b69e745865a5dfc8a1a3' - '29621ba67b026c9fb61ba865ba9d6198d3b8914623609b97bbc375feb33415b2' - '58435fde3af1478450c49637581884c217bd9080704dc80d035eb38df4706a6e' - '3b4dff095110e60257f794c31e5c3b7f73c91d690c7acb3182b489d04988dd27' - '2b62c549626e76da5c36779fe7dd18bddb8041fdb1b983cd29651cf5b0a2b905' - '5c94228d93b7a6340098968738477f9720908a360358f51cd1bc6590e83679c0' - '164b09da056113e19b859a151f93803f19e0c9ea5130db916722f5f0bcb7a8cd' - '351e61261c87d700f4076c6d3f19e81a60d1bfcc0e64f2164cb2696c47a0fafc' - 'a1ed220ddba56656fdbc37163e794f3b43e9a5dae6099b2b23967e870cd9214e' - '844d136f65d498dc1eea11e1882cf2645320d249c82fdcec5d25875e9158cb39' - 'a4a4f5ea9bc79b474ea3c5d86903054d6e9242a22b84589c210b3b8c2f797447' - '7d1d1d57bff00ae77d5480955b85737bd4f30185f5b99f8b34d89f90976f53fb' - '1937bb971912fa7021295174aee8c250a7be9c2d3e3ad76f700d9f7d80fd1117' - '504fd54855d13a326cb65cffc006d1c67d9e6236830df9f581106ae8fe319fff' - 'b732bca79bced6595e278e9e7ceec79306f51be121e78db0a9faa461344c918d' - 'f86242c7e013971812c9a17d667db362ac10d19a63b51cda23d1f306bc8f3242' - 'da007b133f51f27342854e0fb251a1784096f24dab454def99c8496c143f38e5' - 'e6e8f2290a019071ded71c090c3cb8b24e0e33a37dcabdc6f676b886c18dd06a' - '83645b01666aae48121ea9a952c6cfce9ba2aedb3edb9e1b11a893a5d8882831' - 'bb7e54a090ceb6cddac43acee2f34d888a15df2ae0e99808ef6aad9ff6e9ebcf' - '7166f4ab8b7c5a60c4a6e3ac86411719fab67ef6a6c5a16463c6541e9955ce17' - 'bf1defbedd5c0d26aa000178092ac2c87ecb70b992184dc8ffff4502351e70c2' - '29289ac6b2380c4a5d551d3c9b331f9b13190f4dafabdc203dcbfabcb4075c4d' - '0494a41d31ff097cd59117557a6869c5e0e7670eef33267f93974c15e4445e76' - 'bc53b50f4055170fea15b669366b8961e896d2705f91382ee3beea013979408e' - '08d299eb938edc1d535bbb68b5b720203e2dffbc49129218bb1368791e6fb384' - '20d945b374b0e73501013fcf6ba9fd7e8732b76060c948faeb42c605f2f9dd1f' - 'd9eeaceb89efd143918a1bfed6b60d33e004e8421a613036647f318320b25d6a' - 'fb54191f4479ed66446d9c6b9066be11c5d2d580ff4aa0910a3ad29183329e75' - 'df8bfa7901b6af9de447a4f4d0983419f7c1fe5882cc97614d0e5b0759c67dec' - '65d4a1aedc465dd9f5284cd1e2a352bc3c21e8e8e697e58ff9e89f54e5fcb173' - '178144d85cf4c69ae5cea694959a555c4a8eb3a0a5ad5116a2c979beac0e36c0' - '704c95d7fc157e58cc7d4436eb74bdcc0453ba29bb3326a3fe511ee35273e4c3') +sha256sums=('a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46' + 'e1973bda25994e3dc3d6c1b4d9b78fbbb540490d2da43db166df14f776a39039' + '46da072fdffff5edee7c23a024f4a28ca55b5ae57890145fb59ebe00bbeb897e' + '48a9629a9f26b7e828d6021e7db0149421ad05c3927cb9b60147c90caa487f9b' + 'b8d97a80c547e90e1348fa722b26dbda3d1f07ddfa4a00a0a268a5dbb3de489d' + '765501ce588fe5ebaccc8e54f3a588a08abceae304a19988358dd118fead847c' + '80181dda780b44bc24d3d7f0eb6b7c496170ef0db5955dd2d7e4214a24b48169' + '22974a0a1f902f812a655e86fb0bb18a7931be89240aef3a5b5eebadf085cbce' + '1eeeaf5b710df4846c94ad3e06802cd204ebfaf481905fe2644421efd557ff0f' + 'd26c120c12eddc18f1a424117e38c27c8171dfccb7d5ba1fcf3991d57328b9d7' + 'a8e27ad9ef209661ba42112a49f0fbf29fdb9bc94d6ad51f715e59b031d3230d' + 'dacf9cbed1f0f309b8394d4a1a27d60b641f3d19e70352827b1ef123dcf194a8' + '7e919946802ba7b3d666b69c661dff396abfc24b046edb439b684d4b3cc7f42f' + '03003c3a2a16d6f7b36436d8b63496fb5eb97c5da9770eb3f0d0bc3090b5d4e4' + '910f6198069a5d72b88bab70bfef2de50cf44f253a61a37e24c10d3d2d1f2590' + 'a262866828f5fd77c49d4dd62aa49447ab2e59eb7031a3bc09304ef100837ce5' + '613246baff8474c33314c6320fbf163835d36e9aae3221ab1c3ad87a55bcab9a' + '3e08a5af6515821049d611143782bfe1bea7b75c46b25a1a8cdd5b5d66f01cde' + '9ab6cd425c778cded2575d22a4577d5ae220f7a031e3ebc9581fe871f5bbda98' + '90bd7cfdb2a8e890db775293b498008264ccb5571247c77a1dbca21ef96f0e3f' + '37fa408528ff94f4f41e27097a619acc7dd97e66a9f2584178517079e3c5232c' + '4b293b11424efabcf25fc634fd7eec058351297474fcaaad6bbbf3b7be94e39f' + '3878d33beb40fc2907ccfaf7f656e983e30399bd0f6afa78658d802715e2e91d' + 'f96bea78b8a04a5d278cd01fdc6478a79beea6bba8f922a7ba91b14acd7998b3' + 'c0dc173b900ea5edc45ab2695406b1ca11c08113d8c402672208bee95deff4c7' + 'feb8bf1ee858b8c499c3644c95454880835adc85a5039f6d2027b06caa552be1' + 'e463ff31d6bc218a3724d95463b405f63ee66fb270ac1bbc0f3fc3d1e81c6444' + 'faeac0d51bc8ddda40fd02fdf8aff5f35187d9a3bcfa9c0a02d6d19a7314f91c' + '241790c3788449d71ef38c84c15fa158408057730b782fb7976e93ba26df4876' + 'e2983e47533094c5add54bdc4d565f7107b5508a2b23c3de8e0e92bf93627505' + '5a8f2561eb06951b5923f115cdcb7df863169c4db01207dc216ede107e9fca7c' + 'e907fb9111c9a54ac91a538a40b420088d54f86f047c129b0b6e4ff4423ae982' + '60cdf773863423f33207526b343cf72c76ee1680af27fb3c494f63ce9a58f9e8' + '7e353383fbd5ce8368089b5ec4ced6f19674c4490a46d4e0db81e1ea6800b180') _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 013d327f..dd47ebc2 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 bd010d1fb00f61dd6cca52c93a4285c5d967029b Mon Sep 17 00:00:00 2001 +From 955c44726565654efbf8099a66b1e3b23e2d41df Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with @@ -13,16 +13,16 @@ Also see the following issues: * https://github.com/Martchus/PKGBUILDs/issues/59 * https://github.com/Martchus/PKGBUILDs/issues/60 --- - mkspecs/common/g++-win32.conf | 56 +++++++++++++++++++++--------- + mkspecs/common/g++-win32.conf | 53 ++++++++++++++++++++---------- mkspecs/win32-clang-g++/qmake.conf | 4 +-- mkspecs/win32-g++/qmake.conf | 4 +-- - 3 files changed, 43 insertions(+), 21 deletions(-) + 3 files changed, 40 insertions(+), 21 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index 610503379d..f099380cca 100644 +index 610503379d..e747ef16af 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf -@@ -8,22 +8,31 @@ +@@ -8,18 +8,24 @@ # Compiler-specific settings go into win32-g++/qmake.conf and # win32-clang-g++/qmake.conf # @@ -50,14 +50,7 @@ index 610503379d..f099380cca 100644 # can't add 'DEFINES += WIN64' and 'QMAKE_COMPILER_DEFINES += _WIN64' defines for # x86_64 platform similar to 'msvc-desktop.conf' toolchain, because, unlike for MSVC, # 'QMAKE_TARGET.arch' is inherently unavailable. - -+# prevent definition of _xgetbv() in psdk_inc/intrin-impl.h (already defined in xsaveintrin.h) -+DEFINES += __INTRINSIC_DEFINED__xgetbv -+ - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = bison -y -@@ -34,6 +43,7 @@ QMAKE_CFLAGS_SSE2 += -mstackrealign +@@ -34,6 +40,7 @@ QMAKE_CFLAGS_SSE2 += -mstackrealign QMAKE_CXXFLAGS_RTTI_ON = -frtti QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads @@ -65,7 +58,7 @@ index 610503379d..f099380cca 100644 QMAKE_INCDIR = -@@ -42,41 +52,53 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< +@@ -42,41 +49,53 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< @@ -170,5 +163,5 @@ index ed131c6823..b77d86cd6b 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index c26ef5b8..6050478b 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 2cf971ff3e2c1a6f736d6b23f843f00456e3949b Mon Sep 17 00:00:00 2001 +From 190efab0758fdd9055145491f6c788996fa6b7ce Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL @@ -23,5 +23,5 @@ index 1a43f13d9b..a4c954a453 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch index b22e59f7..a6af034b 100644 --- a/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch +++ b/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch @@ -1,4 +1,4 @@ -From cb3fe1244a3c10139b4019d3378e644d41b6db6c Mon Sep 17 00:00:00 2001 +From f17fa5afa2f24bc569eda2bbe35b77a4ab268608 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:41:38 +0200 Subject: [PATCH 03/33] Use external ANGLE library @@ -93,5 +93,5 @@ index 1f7c5d99c1..24e24ef7f1 100644 SUBDIRS += src_3rdparty_libpng src_3rdparty_freetype.depends += src_3rdparty_libpng -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 7cb589f5..3c4a639d 100644 --- a/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From ad81c1479122de4d4468cabf26c9f19b5703d9c1 Mon Sep 17 00:00:00 2001 +From 1ec5d5ee305fd993022c404ad00e5c3f4524d007 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 04/33] Fix too many sections assemler error in OpenGL factory @@ -25,5 +25,5 @@ index 4c778b184e..1dd1755d7f 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch index 6968e393..793cde11 100644 --- a/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 5bd6c26b352fe5bdf4d62ace615ccdd411c39002 Mon Sep 17 00:00:00 2001 +From ddc22a123829a1d50a82ea62e6b9f1df3496b253 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 05/33] Make sure *.pc files are installed correctly @@ -10,10 +10,10 @@ Subject: [PATCH 05/33] Make sure *.pc files are installed correctly 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 82573347b6..b9871ff49c 100644 +index 99aecdd8ce..6c614fd868 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3146,7 +3146,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3150,7 +3150,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index 82573347b6..b9871ff49c 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3171,7 +3171,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3175,7 +3175,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) if(fixify) { if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR").toQString()); @@ -62,5 +62,5 @@ index 75bb5d236d..737f3abc3a 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch index 45d79c88..45dc92b0 100644 --- a/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From 9b80c0d4cabad01097173fd73693417f9461f4e9 Mon Sep 17 00:00:00 2001 +From 1eb6c3cccc09e51f68f30ab2fc6d8bbf04085031 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 06/33] Don't add resource files to LIBS parameter @@ -24,5 +24,5 @@ index d6d6b04148..7bb616302f 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch index 8cd33a82..d15f39fb 100644 --- a/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 4beab05117f21513f0e400c94c9b3d31db25fec0 Mon Sep 17 00:00:00 2001 +From 31cca3a47eea50156a5549574d934dd0264cb0f3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 07/33] Prevent debug library names in pkg-config files @@ -15,10 +15,10 @@ files for the debug build an unique file name. 1 file changed, 3 insertions(+) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index b9871ff49c..0d07d6c333 100644 +index 6c614fd868..bd87c5bd6d 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3160,6 +3160,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3164,6 +3164,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (dot != -1) ret = ret.left(dot); } @@ -29,5 +29,5 @@ index b9871ff49c..0d07d6c333 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch index ff974a9c..0d22e8c1 100644 --- a/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From d4effcacb4dcb9e2cdd33162d7da3dd53e79a9aa Mon Sep 17 00:00:00 2001 +From c8ebd475383209c46510769731be7f7598e6feee Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 08/33] Fix linking against shared/static libpng @@ -23,5 +23,5 @@ index 219385a108..d629a45b92 100644 "use": [ { "lib": "zlib", "condition": "features.system-zlib" } -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch index 385522d8..85ac9f40 100644 --- a/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From 3f683a34bafb1cc19636c017febdc92a450be9e2 Mon Sep 17 00:00:00 2001 +From d79b593a0d432b88521ec58ed6e7411a85347bb8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 09/33] Fix linking against static D-Bus @@ -9,7 +9,7 @@ Subject: [PATCH 09/33] Fix linking against static D-Bus 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.json b/configure.json -index ae2aa22070..baa99a3da9 100644 +index b4a87f5505..c404fd7066 100644 --- a/configure.json +++ b/configure.json @@ -172,18 +172,23 @@ @@ -54,5 +54,5 @@ index 9eaebe6d7e..ac1b1d977b 100644 # include #else -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64-static/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index a0ee8314..f2672212 100644 --- a/qt5-base/mingw-w64-static/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/qt5-base/mingw-w64-static/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 990f59202b9e39903d43ada99fd4f6b58e046c55 Mon Sep 17 00:00:00 2001 +From 6032fdbbd2df9576e7509b80c2e4d6c87d744470 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 10/33] Don't try to use debug version of D-Bus library @@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.json b/configure.json -index baa99a3da9..dfb8835ecb 100644 +index c404fd7066..1488cde728 100644 --- a/configure.json +++ b/configure.json @@ -185,7 +185,7 @@ @@ -25,5 +25,5 @@ index baa99a3da9..dfb8835ecb 100644 }, "condition": "config.win32 && features.shared" -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch index afeb1252..c9fbd7f6 100644 --- a/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From 7c357a7a1a8e7b5ab4eb2bf4dfce9a5aee5c444d Mon Sep 17 00:00:00 2001 +From a1ce36f86105230865fd6fb5eb4f0bbe09d7221b Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 11/33] Fix linking against static freetype2 @@ -26,5 +26,5 @@ index d629a45b92..afa3d95f39 100644 }, "fontconfig": { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-harfbuzz.patch index 33e27261..16e00a6b 100644 --- a/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From e7137841052bacf081a9d8c33486ffc86403acd5 Mon Sep 17 00:00:00 2001 +From ab966035502f0b14f4e9b037223c9d84646f0bf2 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 12/33] Fix linking against static harfbuzz @@ -25,5 +25,5 @@ index afa3d95f39..a2b0a00d09 100644 }, "imf": { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0013-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64-static/0013-Fix-linking-against-static-pcre.patch index 4c94c36c..9d242b10 100644 --- a/qt5-base/mingw-w64-static/0013-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64-static/0013-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From d0bc7fd8109d53c80976e00f89af33a2b841a595 Mon Sep 17 00:00:00 2001 +From 313ee18fb5ba456880fbcfcb5f5d991235094da4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 13/33] Fix linking against static pcre @@ -24,5 +24,5 @@ index 13eff07c04..ea747244da 100644 #include -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-MariaDB.patch index 913a0837..22a251ae 100644 --- a/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From a2831789ce79bcff73a2cdb2378626f593499fd2 Mon Sep 17 00:00:00 2001 +From 267961ff9c908b5c02828b0c2842c8f320fa7f1b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 14/33] Fix linking against shared/static MariaDB @@ -23,5 +23,5 @@ index 234f880579..4619db4a54 100644 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64-static/0015-Fix-linking-against-shared-static-PostgreSQL.patch index 38d22d9d..54b11a41 100644 --- a/qt5-base/mingw-w64-static/0015-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64-static/0015-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From 2097d5ad594a291ecf8ca098566681fa52731183 Mon Sep 17 00:00:00 2001 +From 00fc4018caca88c40fb216917ae0066aa3dd2ed3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL @@ -25,5 +25,5 @@ index 4619db4a54..ef0d45f6cc 100644 ] }, -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch index d95196cb..4208b789 100644 --- a/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 594acda6ca575369ca13cc4a14ba7bd392de4aee Mon Sep 17 00:00:00 2001 +From ef21b8b44d8c71e927a93bd24cdca38ec2c37391 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 16/33] Rename qtmain to qt5main @@ -12,10 +12,10 @@ Prevents conflict with mingw-w64-qt4 package 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index f099380cca..44c211d176 100644 +index e747ef16af..8b8a4ad240 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf -@@ -90,7 +90,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 +@@ -87,7 +87,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32 QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32 QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 @@ -25,7 +25,7 @@ index f099380cca..44c211d176 100644 QMAKE_IDL = $${CROSS_COMPILE}widl QMAKE_LIB = $${CROSS_COMPILE}ar -rc diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 66acedef55..5d553d9ca6 100644 +index 2ed708e085..e67917cc96 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -227,8 +227,8 @@ mac { @@ -66,5 +66,5 @@ index 4140ae48de..9ae73db74b 100644 CONFIG += static -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch index 0b364109..bee22db0 100644 --- a/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch +++ b/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch @@ -1,4 +1,4 @@ -From 2cfb089ea3b0155758be97c7ea8724d77f63a704 Mon Sep 17 00:00:00 2001 +From c79c2a4f048484d235574a69e6f6ba3dcff23abe Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:27:28 +0200 Subject: [PATCH 17/33] Build dynamic host libraries @@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644 -INSTALLS = lib +INSTALLS += lib -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0018-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64-static/0018-Enable-rpath-for-build-tools.patch index 9a9bcbc0..4b5af4bf 100644 --- a/qt5-base/mingw-w64-static/0018-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64-static/0018-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From c2c76f23ead7aa39ab076de58fb52da7dd79d7eb Mon Sep 17 00:00:00 2001 +From 9a506994e00aa0fb257bfe80458b0543c0e9f8b0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 18/33] Enable rpath for build tools @@ -33,5 +33,5 @@ index 883f8ca215..786f2e660c 100644 INSTALLS += target -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0019-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64-static/0019-Use-system-zlib-for-build-tools.patch index c41e5725..bfa04928 100644 --- a/qt5-base/mingw-w64-static/0019-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64-static/0019-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From e21b3f56efc786c0dd5dc75957fc6f3ba198d600 Mon Sep 17 00:00:00 2001 +From 92e7155e22bfe514a20d6ebf39b6bdfbf45f194c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 19/33] Use system zlib for build tools @@ -21,5 +21,5 @@ index a45382106a..17b9828581 100644 } else { CONFIG += no_core_dep -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch index c1473f53..8dca1167 100644 --- a/qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From b2f4400da1fce797a2a939f731ef2f5689a300c5 Mon Sep 17 00:00:00 2001 +From d3a0f355335aa086e2663d634f2f41766f1bcdd6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 20/33] Use *.dll.a as import lib extension @@ -11,7 +11,7 @@ mingw-w64 specific mkspec 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 5d553d9ca6..3e5ec55dae 100644 +index e67917cc96..2a94964b49 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -238,8 +238,9 @@ mac { @@ -64,5 +64,5 @@ index 737f3abc3a..2e6d5d94a9 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch index c532a95d..ad50940b 100644 --- a/qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 10b1ab0ecf79787af8906a6186088d7e81a05b8a Mon Sep 17 00:00:00 2001 +From 91d94eadf25139197ce3cf74bb75692e9c77db07 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 21/33] Merge shared and static library trees @@ -101,10 +101,10 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 0d07d6c333..5e84628e72 100644 +index bd87c5bd6d..736af1c843 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3163,6 +3163,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3167,6 +3167,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -114,7 +114,7 @@ index 0d07d6c333..5e84628e72 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3336,9 +3339,9 @@ MakefileGenerator::writePkgConfigFile() +@@ -3340,9 +3343,9 @@ MakefileGenerator::writePkgConfigFile() t << endl; // requires @@ -128,5 +128,5 @@ index 0d07d6c333..5e84628e72 100644 t << endl; -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64-static/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index d894cf8e..59d65864 100644 --- a/qt5-base/mingw-w64-static/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/qt5-base/mingw-w64-static/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From a9a2bb15ac7ae34e43ff146c8dad6f15e3877dd7 Mon Sep 17 00:00:00 2001 +From 86e3c50a96608acab006e9e525c23e4f420d8b4d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 22/33] Pull dependencies of static libraries in CMake modules @@ -251,7 +251,7 @@ index 5baf0fdb10..ec5f3cc437 100644 + +endif() diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 5e84628e72..43f570fb2c 100644 +index 736af1c843..a1972b7eb0 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -994,10 +994,18 @@ MakefileGenerator::writePrlFile(QTextStream &t) @@ -278,5 +278,5 @@ index 5e84628e72..43f570fb2c 100644 } -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0023-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-static/0023-Allow-usage-of-static-version-with-CMake.patch index 31bf85a1..cde35882 100644 --- a/qt5-base/mingw-w64-static/0023-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64-static/0023-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From 4e2e5f7c439f46101f59525af6f271912df5b133 Mon Sep 17 00:00:00 2001 +From 244565bea2e8c84287b0a5dbbacea3db7e186f6d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 23/33] Allow usage of static version with CMake @@ -22,10 +22,10 @@ installed in the same prefix create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 3e5ec55dae..b6c47124cc 100644 +index 2a94964b49..839a51f377 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -38,7 +38,7 @@ split_incpath { +@@ -42,7 +42,7 @@ split_incpath { $$QT_MODULE_INCLUDE_BASE/Qt$${CMAKE_MODULE_NAME}/$$eval(QT.$${MODULE}.VERSION)/Qt$${CMAKE_MODULE_NAME}) cmake_extra_source_includes.input = $$PWD/data/cmake/ExtraSourceIncludes.cmake.in @@ -992,5 +992,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64-static/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index c0d4180c..2b5958cc 100644 --- a/qt5-base/mingw-w64-static/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/qt5-base/mingw-w64-static/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From c34e48c2f0ce088b746e2d8bdc646db929339454 Mon Sep 17 00:00:00 2001 +From dad3f2977824ca10f03f28486f10780fa2f615e3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 24/33] Adjust linker flags for static build with @@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644 +unset(_isExe) +!!ENDIF -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0025-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-static/0025-Use-correct-pkg-config-static-flag.patch index b770cfd8..53944187 100644 --- a/qt5-base/mingw-w64-static/0025-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64-static/0025-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From f7284cc26542c8d760e0d348be44f1bf947296cb Mon Sep 17 00:00:00 2001 +From 2c846ab2a45c159905715e98338246f86e98e5a8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 25/33] Use correct pkg-config --static flag @@ -22,5 +22,5 @@ index c3ce522e4f..59a9b1e88a 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0026-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-static/0026-Fix-macro-invoking-moc-rcc-and-uic.patch index 23e7c6f9..46fba5b4 100644 --- a/qt5-base/mingw-w64-static/0026-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/qt5-base/mingw-w64-static/0026-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From 9204f18623db15d10cadbd4c659f47550584984a Mon Sep 17 00:00:00 2001 +From 400f992fa24ed2b62be4258d5d26bff3846d95ce Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 26/33] Fix macro invoking moc, rcc and uic @@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake -index 1627de4002..ed0f6555a7 100644 +index 819b48f973..f11a61be6b 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target @@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0027-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-static/0027-Ignore-errors-about-missing-feature-static.patch index e7d0f24d..a685f598 100644 --- a/qt5-base/mingw-w64-static/0027-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64-static/0027-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From c1a0fe77f6528695728fc35d7057da66939d39e0 Mon Sep 17 00:00:00 2001 +From 3872dc79e2e8c530ee73003c6c7f4b08e4697f7f Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 27/33] Ignore errors about missing feature static @@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0028-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-static/0028-Enable-and-fix-use-of-iconv.patch index 72ac5516..6dbec1ec 100644 --- a/qt5-base/mingw-w64-static/0028-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64-static/0028-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 075aed08de151f6fc1c8dad91214c66ce4e614d5 Mon Sep 17 00:00:00 2001 +From c7eb8dbf86904eab61b3bb53f52563d861372f65 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 28/33] Enable and fix use of iconv @@ -63,7 +63,7 @@ index 330eb7c038..88a782b863 100644 #else char **inBytesPtr = &inBytes; diff --git a/src/corelib/configure.json b/src/corelib/configure.json -index 5e48024def..15e7372dcb 100644 +index dfb575da0d..a630d7abf3 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -539,9 +539,9 @@ @@ -79,5 +79,5 @@ index 5e48024def..15e7372dcb 100644 }, "icu": { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0029-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-static/0029-Ignore-failing-pkg-config-test.patch index 61caf681..cd156a3a 100644 --- a/qt5-base/mingw-w64-static/0029-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64-static/0029-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From ef184cf89b14e092051a2644b5fefa0e2bfaf7fe Mon Sep 17 00:00:00 2001 +From 558b86ad0cbaa5fb318d729c3768bc51f385e7cd Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 29/33] Ignore failing pkg-config test @@ -9,7 +9,7 @@ Didn't investigate why it fails, let's hope for the best 1 file changed, 1 deletion(-) diff --git a/configure.json b/configure.json -index dfb8835ecb..f9735f59cd 100644 +index 1488cde728..a52c1c9c95 100644 --- a/configure.json +++ b/configure.json @@ -597,7 +597,6 @@ @@ -21,5 +21,5 @@ index dfb8835ecb..f9735f59cd 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-static/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch index 38f184df..6b9077cc 100644 --- a/qt5-base/mingw-w64-static/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64-static/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From a401f6740c459cc21909ec406814852ff3ec233d Mon Sep 17 00:00:00 2001 +From cfdde9962386c34c3f2bfe902aa2a522b0530dba Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies @@ -11,7 +11,7 @@ static freetype2 and harfbuzz 2 files changed, 6 insertions(+) diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp -index 30f99174f8..154edd67d4 100644 +index 894020d2bd..5f57d6f5cb 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -414,6 +414,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) @@ -39,5 +39,5 @@ index 2e6d5d94a9..a8320bae09 100644 static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 }; for (int i = 0; lflags[i]; i++) { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0031-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64-static/0031-Hardcode-linker-flags-for-platform-plugins.patch index 6f873f40..ad6fa90b 100644 --- a/qt5-base/mingw-w64-static/0031-Hardcode-linker-flags-for-platform-plugins.patch +++ b/qt5-base/mingw-w64-static/0031-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From 1c4ecb65d3f7a060f499cad169a7252b550f6769 Mon Sep 17 00:00:00 2001 +From 0e3e71c77f1bf23ab20c2c4b3219c371ba94825f Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 31/33] Hardcode linker flags for platform plugins @@ -106,5 +106,5 @@ index 174bc7b609..e66488e364 100644 include(windows.pri) -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0032-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64-static/0032-Fix-linking-against-static-plugins-with-qmake.patch index 92b0abe8..d437395d 100644 --- a/qt5-base/mingw-w64-static/0032-Fix-linking-against-static-plugins-with-qmake.patch +++ b/qt5-base/mingw-w64-static/0032-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From af66aa78320b37f4c5100e2822eceb3ecd0a703a Mon Sep 17 00:00:00 2001 +From 8741a4b4d6c3bc569dc6452c777a7692266e6a91 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 32/33] Fix linking against static plugins with qmake @@ -33,5 +33,5 @@ index 6eebd068f1..310b8713f0 100644 # Check if the plugin is known to Qt. We can use this to determine # the plugin path. Unknown plugins must rely on the default link path. -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/0033-Disable-hardware-randomizer-for-32-bit.patch b/qt5-base/mingw-w64-static/0033-Disable-hardware-randomizer-for-32-bit.patch index d7cf9b4b..c3b291a1 100644 --- a/qt5-base/mingw-w64-static/0033-Disable-hardware-randomizer-for-32-bit.patch +++ b/qt5-base/mingw-w64-static/0033-Disable-hardware-randomizer-for-32-bit.patch @@ -1,4 +1,4 @@ -From 3758ea380174eaf89f31b68d5b7e4e2bf02e50be Mon Sep 17 00:00:00 2001 +From 4c9b1ccd23a3d0b63e57f5dff781ae8650b5d85c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 26 May 2018 03:47:14 +0200 Subject: [PATCH 33/33] Disable hardware randomizer for 32-bit @@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644 #else return false; -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD index 2c240415..cd297b67 100644 --- a/qt5-base/mingw-w64-static/PKGBUILD +++ b/qt5-base/mingw-w64-static/PKGBUILD @@ -36,7 +36,7 @@ isNoOpenGL() { } pkgname=mingw-w64-qt5-base-static -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 pkgdesc='A cross-platform application and UI framework (mingw-w64)' # The static variant doesn't contain any executables which need to be executed on the build machine @@ -85,40 +85,40 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0031-Hardcode-linker-flags-for-platform-plugins.patch' '0032-Fix-linking-against-static-plugins-with-qmake.patch' '0033-Disable-hardware-randomizer-for-32-bit.patch') -sha256sums=('ed6e46db84f7d34923ab4eae165c63e05ab3cfa9d19a73d3f57b4e7bfd41de66' - 'd01df5be5f96578f65c0343b1ae6eaac31e0c7608fb9b69e745865a5dfc8a1a3' - '29621ba67b026c9fb61ba865ba9d6198d3b8914623609b97bbc375feb33415b2' - '58435fde3af1478450c49637581884c217bd9080704dc80d035eb38df4706a6e' - '3b4dff095110e60257f794c31e5c3b7f73c91d690c7acb3182b489d04988dd27' - '2b62c549626e76da5c36779fe7dd18bddb8041fdb1b983cd29651cf5b0a2b905' - '5c94228d93b7a6340098968738477f9720908a360358f51cd1bc6590e83679c0' - '164b09da056113e19b859a151f93803f19e0c9ea5130db916722f5f0bcb7a8cd' - '351e61261c87d700f4076c6d3f19e81a60d1bfcc0e64f2164cb2696c47a0fafc' - 'a1ed220ddba56656fdbc37163e794f3b43e9a5dae6099b2b23967e870cd9214e' - '844d136f65d498dc1eea11e1882cf2645320d249c82fdcec5d25875e9158cb39' - 'a4a4f5ea9bc79b474ea3c5d86903054d6e9242a22b84589c210b3b8c2f797447' - '7d1d1d57bff00ae77d5480955b85737bd4f30185f5b99f8b34d89f90976f53fb' - '1937bb971912fa7021295174aee8c250a7be9c2d3e3ad76f700d9f7d80fd1117' - '504fd54855d13a326cb65cffc006d1c67d9e6236830df9f581106ae8fe319fff' - 'b732bca79bced6595e278e9e7ceec79306f51be121e78db0a9faa461344c918d' - 'f86242c7e013971812c9a17d667db362ac10d19a63b51cda23d1f306bc8f3242' - 'da007b133f51f27342854e0fb251a1784096f24dab454def99c8496c143f38e5' - 'e6e8f2290a019071ded71c090c3cb8b24e0e33a37dcabdc6f676b886c18dd06a' - '83645b01666aae48121ea9a952c6cfce9ba2aedb3edb9e1b11a893a5d8882831' - 'bb7e54a090ceb6cddac43acee2f34d888a15df2ae0e99808ef6aad9ff6e9ebcf' - '7166f4ab8b7c5a60c4a6e3ac86411719fab67ef6a6c5a16463c6541e9955ce17' - 'bf1defbedd5c0d26aa000178092ac2c87ecb70b992184dc8ffff4502351e70c2' - '29289ac6b2380c4a5d551d3c9b331f9b13190f4dafabdc203dcbfabcb4075c4d' - '0494a41d31ff097cd59117557a6869c5e0e7670eef33267f93974c15e4445e76' - 'bc53b50f4055170fea15b669366b8961e896d2705f91382ee3beea013979408e' - '08d299eb938edc1d535bbb68b5b720203e2dffbc49129218bb1368791e6fb384' - '20d945b374b0e73501013fcf6ba9fd7e8732b76060c948faeb42c605f2f9dd1f' - 'd9eeaceb89efd143918a1bfed6b60d33e004e8421a613036647f318320b25d6a' - 'fb54191f4479ed66446d9c6b9066be11c5d2d580ff4aa0910a3ad29183329e75' - 'df8bfa7901b6af9de447a4f4d0983419f7c1fe5882cc97614d0e5b0759c67dec' - '65d4a1aedc465dd9f5284cd1e2a352bc3c21e8e8e697e58ff9e89f54e5fcb173' - '178144d85cf4c69ae5cea694959a555c4a8eb3a0a5ad5116a2c979beac0e36c0' - '704c95d7fc157e58cc7d4436eb74bdcc0453ba29bb3326a3fe511ee35273e4c3') +sha256sums=('a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46' + 'e1973bda25994e3dc3d6c1b4d9b78fbbb540490d2da43db166df14f776a39039' + '46da072fdffff5edee7c23a024f4a28ca55b5ae57890145fb59ebe00bbeb897e' + '48a9629a9f26b7e828d6021e7db0149421ad05c3927cb9b60147c90caa487f9b' + 'b8d97a80c547e90e1348fa722b26dbda3d1f07ddfa4a00a0a268a5dbb3de489d' + '765501ce588fe5ebaccc8e54f3a588a08abceae304a19988358dd118fead847c' + '80181dda780b44bc24d3d7f0eb6b7c496170ef0db5955dd2d7e4214a24b48169' + '22974a0a1f902f812a655e86fb0bb18a7931be89240aef3a5b5eebadf085cbce' + '1eeeaf5b710df4846c94ad3e06802cd204ebfaf481905fe2644421efd557ff0f' + 'd26c120c12eddc18f1a424117e38c27c8171dfccb7d5ba1fcf3991d57328b9d7' + 'a8e27ad9ef209661ba42112a49f0fbf29fdb9bc94d6ad51f715e59b031d3230d' + 'dacf9cbed1f0f309b8394d4a1a27d60b641f3d19e70352827b1ef123dcf194a8' + '7e919946802ba7b3d666b69c661dff396abfc24b046edb439b684d4b3cc7f42f' + '03003c3a2a16d6f7b36436d8b63496fb5eb97c5da9770eb3f0d0bc3090b5d4e4' + '910f6198069a5d72b88bab70bfef2de50cf44f253a61a37e24c10d3d2d1f2590' + 'a262866828f5fd77c49d4dd62aa49447ab2e59eb7031a3bc09304ef100837ce5' + '613246baff8474c33314c6320fbf163835d36e9aae3221ab1c3ad87a55bcab9a' + '3e08a5af6515821049d611143782bfe1bea7b75c46b25a1a8cdd5b5d66f01cde' + '9ab6cd425c778cded2575d22a4577d5ae220f7a031e3ebc9581fe871f5bbda98' + '90bd7cfdb2a8e890db775293b498008264ccb5571247c77a1dbca21ef96f0e3f' + '37fa408528ff94f4f41e27097a619acc7dd97e66a9f2584178517079e3c5232c' + '4b293b11424efabcf25fc634fd7eec058351297474fcaaad6bbbf3b7be94e39f' + '3878d33beb40fc2907ccfaf7f656e983e30399bd0f6afa78658d802715e2e91d' + 'f96bea78b8a04a5d278cd01fdc6478a79beea6bba8f922a7ba91b14acd7998b3' + 'c0dc173b900ea5edc45ab2695406b1ca11c08113d8c402672208bee95deff4c7' + 'feb8bf1ee858b8c499c3644c95454880835adc85a5039f6d2027b06caa552be1' + 'e463ff31d6bc218a3724d95463b405f63ee66fb270ac1bbc0f3fc3d1e81c6444' + 'faeac0d51bc8ddda40fd02fdf8aff5f35187d9a3bcfa9c0a02d6d19a7314f91c' + '241790c3788449d71ef38c84c15fa158408057730b782fb7976e93ba26df4876' + 'e2983e47533094c5add54bdc4d565f7107b5508a2b23c3de8e0e92bf93627505' + '5a8f2561eb06951b5923f115cdcb7df863169c4db01207dc216ede107e9fca7c' + 'e907fb9111c9a54ac91a538a40b420088d54f86f047c129b0b6e4ff4423ae982' + '60cdf773863423f33207526b343cf72c76ee1680af27fb3c494f63ce9a58f9e8' + '7e353383fbd5ce8368089b5ec4ced6f19674c4490a46d4e0db81e1ea6800b180') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch index 013d327f..dd47ebc2 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 bd010d1fb00f61dd6cca52c93a4285c5d967029b Mon Sep 17 00:00:00 2001 +From 955c44726565654efbf8099a66b1e3b23e2d41df Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 18:30:51 +0100 Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with @@ -13,16 +13,16 @@ Also see the following issues: * https://github.com/Martchus/PKGBUILDs/issues/59 * https://github.com/Martchus/PKGBUILDs/issues/60 --- - mkspecs/common/g++-win32.conf | 56 +++++++++++++++++++++--------- + mkspecs/common/g++-win32.conf | 53 ++++++++++++++++++++---------- mkspecs/win32-clang-g++/qmake.conf | 4 +-- mkspecs/win32-g++/qmake.conf | 4 +-- - 3 files changed, 43 insertions(+), 21 deletions(-) + 3 files changed, 40 insertions(+), 21 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index 610503379d..f099380cca 100644 +index 610503379d..e747ef16af 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf -@@ -8,22 +8,31 @@ +@@ -8,18 +8,24 @@ # Compiler-specific settings go into win32-g++/qmake.conf and # win32-clang-g++/qmake.conf # @@ -50,14 +50,7 @@ index 610503379d..f099380cca 100644 # can't add 'DEFINES += WIN64' and 'QMAKE_COMPILER_DEFINES += _WIN64' defines for # x86_64 platform similar to 'msvc-desktop.conf' toolchain, because, unlike for MSVC, # 'QMAKE_TARGET.arch' is inherently unavailable. - -+# prevent definition of _xgetbv() in psdk_inc/intrin-impl.h (already defined in xsaveintrin.h) -+DEFINES += __INTRINSIC_DEFINED__xgetbv -+ - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = bison -y -@@ -34,6 +43,7 @@ QMAKE_CFLAGS_SSE2 += -mstackrealign +@@ -34,6 +40,7 @@ QMAKE_CFLAGS_SSE2 += -mstackrealign QMAKE_CXXFLAGS_RTTI_ON = -frtti QMAKE_CXXFLAGS_RTTI_OFF = -fno-rtti QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads @@ -65,7 +58,7 @@ index 610503379d..f099380cca 100644 QMAKE_INCDIR = -@@ -42,41 +52,53 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< +@@ -42,41 +49,53 @@ QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH) -o $@ $< QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< @@ -170,5 +163,5 @@ index ed131c6823..b77d86cd6b 100644 QMAKE_LINK = $${CROSS_COMPILE}g++ -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch index c26ef5b8..6050478b 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 2cf971ff3e2c1a6f736d6b23f843f00456e3949b Mon Sep 17 00:00:00 2001 +From 190efab0758fdd9055145491f6c788996fa6b7ce Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:36:53 +0200 Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL @@ -23,5 +23,5 @@ index 1a43f13d9b..a4c954a453 100644 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG #include -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch index b22e59f7..a6af034b 100644 --- a/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch +++ b/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch @@ -1,4 +1,4 @@ -From cb3fe1244a3c10139b4019d3378e644d41b6db6c Mon Sep 17 00:00:00 2001 +From f17fa5afa2f24bc569eda2bbe35b77a4ab268608 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:41:38 +0200 Subject: [PATCH 03/33] Use external ANGLE library @@ -93,5 +93,5 @@ index 1f7c5d99c1..24e24ef7f1 100644 SUBDIRS += src_3rdparty_libpng src_3rdparty_freetype.depends += src_3rdparty_libpng -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch index 7cb589f5..3c4a639d 100644 --- a/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch +++ b/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch @@ -1,4 +1,4 @@ -From ad81c1479122de4d4468cabf26c9f19b5703d9c1 Mon Sep 17 00:00:00 2001 +From 1ec5d5ee305fd993022c404ad00e5c3f4524d007 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:48:51 +0200 Subject: [PATCH 04/33] Fix too many sections assemler error in OpenGL factory @@ -25,5 +25,5 @@ index 4c778b184e..1dd1755d7f 100644 HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch index 6968e393..793cde11 100644 --- a/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch +++ b/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch @@ -1,4 +1,4 @@ -From 5bd6c26b352fe5bdf4d62ace615ccdd411c39002 Mon Sep 17 00:00:00 2001 +From ddc22a123829a1d50a82ea62e6b9f1df3496b253 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:54:12 +0200 Subject: [PATCH 05/33] Make sure *.pc files are installed correctly @@ -10,10 +10,10 @@ Subject: [PATCH 05/33] Make sure *.pc files are installed correctly 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 82573347b6..b9871ff49c 100644 +index 99aecdd8ce..6c614fd868 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3146,7 +3146,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const +@@ -3150,7 +3150,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const } QString @@ -22,7 +22,7 @@ index 82573347b6..b9871ff49c 100644 { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3171,7 +3171,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) +@@ -3175,7 +3175,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify) if(fixify) { if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR").toQString()); @@ -62,5 +62,5 @@ index 75bb5d236d..737f3abc3a 100644 uninst.append("\n\t"); uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc)); -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch index 45d79c88..45dc92b0 100644 --- a/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From 9b80c0d4cabad01097173fd73693417f9461f4e9 Mon Sep 17 00:00:00 2001 +From 1eb6c3cccc09e51f68f30ab2fc6d8bbf04085031 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 06/33] Don't add resource files to LIBS parameter @@ -24,5 +24,5 @@ index d6d6b04148..7bb616302f 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch index 8cd33a82..d15f39fb 100644 --- a/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch +++ b/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch @@ -1,4 +1,4 @@ -From 4beab05117f21513f0e400c94c9b3d31db25fec0 Mon Sep 17 00:00:00 2001 +From 31cca3a47eea50156a5549574d934dd0264cb0f3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:01:14 +0200 Subject: [PATCH 07/33] Prevent debug library names in pkg-config files @@ -15,10 +15,10 @@ files for the debug build an unique file name. 1 file changed, 3 insertions(+) diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index b9871ff49c..0d07d6c333 100644 +index 6c614fd868..bd87c5bd6d 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3160,6 +3160,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3164,6 +3164,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (dot != -1) ret = ret.left(dot); } @@ -29,5 +29,5 @@ index b9871ff49c..0d07d6c333 100644 QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch index ff974a9c..0d22e8c1 100644 --- a/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch +++ b/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch @@ -1,4 +1,4 @@ -From d4effcacb4dcb9e2cdd33162d7da3dd53e79a9aa Mon Sep 17 00:00:00 2001 +From c8ebd475383209c46510769731be7f7598e6feee Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 26 Jan 2017 17:51:31 +0100 Subject: [PATCH 08/33] Fix linking against shared/static libpng @@ -23,5 +23,5 @@ index 219385a108..d629a45b92 100644 "use": [ { "lib": "zlib", "condition": "features.system-zlib" } -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch index 385522d8..85ac9f40 100644 --- a/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch +++ b/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch @@ -1,4 +1,4 @@ -From 3f683a34bafb1cc19636c017febdc92a450be9e2 Mon Sep 17 00:00:00 2001 +From d79b593a0d432b88521ec58ed6e7411a85347bb8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 19:36:25 +0100 Subject: [PATCH 09/33] Fix linking against static D-Bus @@ -9,7 +9,7 @@ Subject: [PATCH 09/33] Fix linking against static D-Bus 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.json b/configure.json -index ae2aa22070..baa99a3da9 100644 +index b4a87f5505..c404fd7066 100644 --- a/configure.json +++ b/configure.json @@ -172,18 +172,23 @@ @@ -54,5 +54,5 @@ index 9eaebe6d7e..ac1b1d977b 100644 # include #else -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch index a0ee8314..f2672212 100644 --- a/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch +++ b/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch @@ -1,4 +1,4 @@ -From 990f59202b9e39903d43ada99fd4f6b58e046c55 Mon Sep 17 00:00:00 2001 +From 6032fdbbd2df9576e7509b80c2e4d6c87d744470 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 18:28:10 +0200 Subject: [PATCH 10/33] Don't try to use debug version of D-Bus library @@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.json b/configure.json -index baa99a3da9..dfb8835ecb 100644 +index c404fd7066..1488cde728 100644 --- a/configure.json +++ b/configure.json @@ -185,7 +185,7 @@ @@ -25,5 +25,5 @@ index baa99a3da9..dfb8835ecb 100644 }, "condition": "config.win32 && features.shared" -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch index afeb1252..c9fbd7f6 100644 --- a/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch +++ b/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch @@ -1,4 +1,4 @@ -From 7c357a7a1a8e7b5ab4eb2bf4dfce9a5aee5c444d Mon Sep 17 00:00:00 2001 +From a1ce36f86105230865fd6fb5eb4f0bbe09d7221b Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 3 Feb 2017 20:51:19 +0100 Subject: [PATCH 11/33] Fix linking against static freetype2 @@ -26,5 +26,5 @@ index d629a45b92..afa3d95f39 100644 }, "fontconfig": { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch index 33e27261..16e00a6b 100644 --- a/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch +++ b/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch @@ -1,4 +1,4 @@ -From e7137841052bacf081a9d8c33486ffc86403acd5 Mon Sep 17 00:00:00 2001 +From ab966035502f0b14f4e9b037223c9d84646f0bf2 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:22:56 +0200 Subject: [PATCH 12/33] Fix linking against static harfbuzz @@ -25,5 +25,5 @@ index afa3d95f39..a2b0a00d09 100644 }, "imf": { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch index 4c94c36c..9d242b10 100644 --- a/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch +++ b/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch @@ -1,4 +1,4 @@ -From d0bc7fd8109d53c80976e00f89af33a2b841a595 Mon Sep 17 00:00:00 2001 +From 313ee18fb5ba456880fbcfcb5f5d991235094da4 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:24:01 +0200 Subject: [PATCH 13/33] Fix linking against static pcre @@ -24,5 +24,5 @@ index 13eff07c04..ea747244da 100644 #include -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch index 913a0837..22a251ae 100644 --- a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch +++ b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch @@ -1,4 +1,4 @@ -From a2831789ce79bcff73a2cdb2378626f593499fd2 Mon Sep 17 00:00:00 2001 +From 267961ff9c908b5c02828b0c2842c8f320fa7f1b Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:56:55 +0200 Subject: [PATCH 14/33] Fix linking against shared/static MariaDB @@ -23,5 +23,5 @@ index 234f880579..4619db4a54 100644 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true }, { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false }, -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch index 38d22d9d..54b11a41 100644 --- a/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch +++ b/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch @@ -1,4 +1,4 @@ -From 2097d5ad594a291ecf8ca098566681fa52731183 Mon Sep 17 00:00:00 2001 +From 00fc4018caca88c40fb216917ae0066aa3dd2ed3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:58:25 +0200 Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL @@ -25,5 +25,5 @@ index 4619db4a54..ef0d45f6cc 100644 ] }, -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch index d95196cb..4208b789 100644 --- a/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch +++ b/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch @@ -1,4 +1,4 @@ -From 594acda6ca575369ca13cc4a14ba7bd392de4aee Mon Sep 17 00:00:00 2001 +From ef21b8b44d8c71e927a93bd24cdca38ec2c37391 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:25:40 +0200 Subject: [PATCH 16/33] Rename qtmain to qt5main @@ -12,10 +12,10 @@ Prevents conflict with mingw-w64-qt4 package 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf -index f099380cca..44c211d176 100644 +index e747ef16af..8b8a4ad240 100644 --- a/mkspecs/common/g++-win32.conf +++ b/mkspecs/common/g++-win32.conf -@@ -90,7 +90,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 +@@ -87,7 +87,7 @@ QMAKE_LIBS_OPENGL = -lglu32 -lopengl32 -lgdi32 -luser32 QMAKE_LIBS_OPENGL_ES2 = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32 QMAKE_LIBS_OPENGL_ES2_DEBUG = -l$${LIBEGL_NAME} -l$${LIBGLESV2_NAME} -ld3d9 -ldxguid -lgdi32 -luser32 QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32 @@ -25,7 +25,7 @@ index f099380cca..44c211d176 100644 QMAKE_IDL = $${CROSS_COMPILE}widl QMAKE_LIB = $${CROSS_COMPILE}ar -rc diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 66acedef55..5d553d9ca6 100644 +index 2ed708e085..e67917cc96 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -227,8 +227,8 @@ mac { @@ -66,5 +66,5 @@ index 4140ae48de..9ae73db74b 100644 CONFIG += static -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch index 0b364109..bee22db0 100644 --- a/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch +++ b/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch @@ -1,4 +1,4 @@ -From 2cfb089ea3b0155758be97c7ea8724d77f63a704 Mon Sep 17 00:00:00 2001 +From c79c2a4f048484d235574a69e6f6ba3dcff23abe Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 14:27:28 +0200 Subject: [PATCH 17/33] Build dynamic host libraries @@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644 -INSTALLS = lib +INSTALLS += lib -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch index 9a9bcbc0..4b5af4bf 100644 --- a/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch +++ b/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch @@ -1,4 +1,4 @@ -From c2c76f23ead7aa39ab076de58fb52da7dd79d7eb Mon Sep 17 00:00:00 2001 +From 9a506994e00aa0fb257bfe80458b0543c0e9f8b0 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 17:59:27 +0200 Subject: [PATCH 18/33] Enable rpath for build tools @@ -33,5 +33,5 @@ index 883f8ca215..786f2e660c 100644 INSTALLS += target -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch index c41e5725..bfa04928 100644 --- a/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch +++ b/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch @@ -1,4 +1,4 @@ -From e21b3f56efc786c0dd5dc75957fc6f3ba198d600 Mon Sep 17 00:00:00 2001 +From 92e7155e22bfe514a20d6ebf39b6bdfbf45f194c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:04:42 +0200 Subject: [PATCH 19/33] Use system zlib for build tools @@ -21,5 +21,5 @@ index a45382106a..17b9828581 100644 } else { CONFIG += no_core_dep -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0020-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64/0020-Use-.dll.a-as-import-lib-extension.patch index c1473f53..8dca1167 100644 --- a/qt5-base/mingw-w64/0020-Use-.dll.a-as-import-lib-extension.patch +++ b/qt5-base/mingw-w64/0020-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From b2f4400da1fce797a2a939f731ef2f5689a300c5 Mon Sep 17 00:00:00 2001 +From d3a0f355335aa086e2663d634f2f41766f1bcdd6 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 20/33] Use *.dll.a as import lib extension @@ -11,7 +11,7 @@ mingw-w64 specific mkspec 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 5d553d9ca6..3e5ec55dae 100644 +index e67917cc96..2a94964b49 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -238,8 +238,9 @@ mac { @@ -64,5 +64,5 @@ index 737f3abc3a..2e6d5d94a9 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0021-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64/0021-Merge-shared-and-static-library-trees.patch index c532a95d..ad50940b 100644 --- a/qt5-base/mingw-w64/0021-Merge-shared-and-static-library-trees.patch +++ b/qt5-base/mingw-w64/0021-Merge-shared-and-static-library-trees.patch @@ -1,4 +1,4 @@ -From 10b1ab0ecf79787af8906a6186088d7e81a05b8a Mon Sep 17 00:00:00 2001 +From 91d94eadf25139197ce3cf74bb75692e9c77db07 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:45:08 +0200 Subject: [PATCH 21/33] Merge shared and static library trees @@ -101,10 +101,10 @@ index 51ea3a8321..275e080ae4 100644 QMAKE_EXT_YACC = .y diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 0d07d6c333..5e84628e72 100644 +index bd87c5bd6d..736af1c843 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp -@@ -3163,6 +3163,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) +@@ -3167,6 +3167,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir) if (project->isActiveConfig("debug")) { ret += "d"; } @@ -114,7 +114,7 @@ index 0d07d6c333..5e84628e72 100644 ret += Option::pkgcfg_ext; QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString(); if(!subdir.isEmpty()) { -@@ -3336,9 +3339,9 @@ MakefileGenerator::writePkgConfigFile() +@@ -3340,9 +3343,9 @@ MakefileGenerator::writePkgConfigFile() t << endl; // requires @@ -128,5 +128,5 @@ index 0d07d6c333..5e84628e72 100644 t << endl; -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch index d894cf8e..59d65864 100644 --- a/qt5-base/mingw-w64/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch +++ b/qt5-base/mingw-w64/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch @@ -1,4 +1,4 @@ -From a9a2bb15ac7ae34e43ff146c8dad6f15e3877dd7 Mon Sep 17 00:00:00 2001 +From 86e3c50a96608acab006e9e525c23e4f420d8b4d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:32:00 +0200 Subject: [PATCH 22/33] Pull dependencies of static libraries in CMake modules @@ -251,7 +251,7 @@ index 5baf0fdb10..ec5f3cc437 100644 + +endif() diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp -index 5e84628e72..43f570fb2c 100644 +index 736af1c843..a1972b7eb0 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -994,10 +994,18 @@ MakefileGenerator::writePrlFile(QTextStream &t) @@ -278,5 +278,5 @@ index 5e84628e72..43f570fb2c 100644 } -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0023-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64/0023-Allow-usage-of-static-version-with-CMake.patch index 31bf85a1..cde35882 100644 --- a/qt5-base/mingw-w64/0023-Allow-usage-of-static-version-with-CMake.patch +++ b/qt5-base/mingw-w64/0023-Allow-usage-of-static-version-with-CMake.patch @@ -1,4 +1,4 @@ -From 4e2e5f7c439f46101f59525af6f271912df5b133 Mon Sep 17 00:00:00 2001 +From 244565bea2e8c84287b0a5dbbacea3db7e186f6d Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 5 Aug 2017 21:14:26 +0200 Subject: [PATCH 23/33] Allow usage of static version with CMake @@ -22,10 +22,10 @@ installed in the same prefix create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf -index 3e5ec55dae..b6c47124cc 100644 +index 2a94964b49..839a51f377 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -38,7 +38,7 @@ split_incpath { +@@ -42,7 +42,7 @@ split_incpath { $$QT_MODULE_INCLUDE_BASE/Qt$${CMAKE_MODULE_NAME}/$$eval(QT.$${MODULE}.VERSION)/Qt$${CMAKE_MODULE_NAME}) cmake_extra_source_includes.input = $$PWD/data/cmake/ExtraSourceIncludes.cmake.in @@ -992,5 +992,5 @@ index 2a575958ae..ca0e3be3b5 100644 INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\" ) -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch index c0d4180c..2b5958cc 100644 --- a/qt5-base/mingw-w64/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch +++ b/qt5-base/mingw-w64/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch @@ -1,4 +1,4 @@ -From c34e48c2f0ce088b746e2d8bdc646db929339454 Mon Sep 17 00:00:00 2001 +From dad3f2977824ca10f03f28486f10780fa2f615e3 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 2 Jun 2017 16:42:07 +0200 Subject: [PATCH 24/33] Adjust linker flags for static build with @@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644 +unset(_isExe) +!!ENDIF -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0025-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64/0025-Use-correct-pkg-config-static-flag.patch index b770cfd8..53944187 100644 --- a/qt5-base/mingw-w64/0025-Use-correct-pkg-config-static-flag.patch +++ b/qt5-base/mingw-w64/0025-Use-correct-pkg-config-static-flag.patch @@ -1,4 +1,4 @@ -From f7284cc26542c8d760e0d348be44f1bf947296cb Mon Sep 17 00:00:00 2001 +From 2c846ab2a45c159905715e98338246f86e98e5a8 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 18 Sep 2016 18:50:21 +0200 Subject: [PATCH 25/33] Use correct pkg-config --static flag @@ -22,5 +22,5 @@ index c3ce522e4f..59a9b1e88a 100644 $$qtConfEvaluate("features.cross_compile") { # cross compiling, check that pkg-config is set up sanely -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0026-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64/0026-Fix-macro-invoking-moc-rcc-and-uic.patch index 23e7c6f9..46fba5b4 100644 --- a/qt5-base/mingw-w64/0026-Fix-macro-invoking-moc-rcc-and-uic.patch +++ b/qt5-base/mingw-w64/0026-Fix-macro-invoking-moc-rcc-and-uic.patch @@ -1,4 +1,4 @@ -From 9204f18623db15d10cadbd4c659f47550584984a Mon Sep 17 00:00:00 2001 +From 400f992fa24ed2b62be4258d5d26bff3846d95ce Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 4 Dec 2016 20:35:47 +0100 Subject: [PATCH 26/33] Fix macro invoking moc, rcc and uic @@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake -index 1627de4002..ed0f6555a7 100644 +index 819b48f973..f11a61be6b 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target @@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644 MAIN_DEPENDENCY ${infile} VERBATIM) set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON) -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0027-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64/0027-Ignore-errors-about-missing-feature-static.patch index e7d0f24d..a685f598 100644 --- a/qt5-base/mingw-w64/0027-Ignore-errors-about-missing-feature-static.patch +++ b/qt5-base/mingw-w64/0027-Ignore-errors-about-missing-feature-static.patch @@ -1,4 +1,4 @@ -From c1a0fe77f6528695728fc35d7057da66939d39e0 Mon Sep 17 00:00:00 2001 +From 3872dc79e2e8c530ee73003c6c7f4b08e4697f7f Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 20:59:54 +0100 Subject: [PATCH 27/33] Ignore errors about missing feature static @@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644 + !equals($$1, "static"): error("Could not find feature $${1}.") } -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0028-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64/0028-Enable-and-fix-use-of-iconv.patch index 72ac5516..6dbec1ec 100644 --- a/qt5-base/mingw-w64/0028-Enable-and-fix-use-of-iconv.patch +++ b/qt5-base/mingw-w64/0028-Enable-and-fix-use-of-iconv.patch @@ -1,4 +1,4 @@ -From 075aed08de151f6fc1c8dad91214c66ce4e614d5 Mon Sep 17 00:00:00 2001 +From c7eb8dbf86904eab61b3bb53f52563d861372f65 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:20 +0100 Subject: [PATCH 28/33] Enable and fix use of iconv @@ -63,7 +63,7 @@ index 330eb7c038..88a782b863 100644 #else char **inBytesPtr = &inBytes; diff --git a/src/corelib/configure.json b/src/corelib/configure.json -index 5e48024def..15e7372dcb 100644 +index dfb575da0d..a630d7abf3 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -539,9 +539,9 @@ @@ -79,5 +79,5 @@ index 5e48024def..15e7372dcb 100644 }, "icu": { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0029-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64/0029-Ignore-failing-pkg-config-test.patch index 61caf681..cd156a3a 100644 --- a/qt5-base/mingw-w64/0029-Ignore-failing-pkg-config-test.patch +++ b/qt5-base/mingw-w64/0029-Ignore-failing-pkg-config-test.patch @@ -1,4 +1,4 @@ -From ef184cf89b14e092051a2644b5fefa0e2bfaf7fe Mon Sep 17 00:00:00 2001 +From 558b86ad0cbaa5fb318d729c3768bc51f385e7cd Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 21:08:48 +0100 Subject: [PATCH 29/33] Ignore failing pkg-config test @@ -9,7 +9,7 @@ Didn't investigate why it fails, let's hope for the best 1 file changed, 1 deletion(-) diff --git a/configure.json b/configure.json -index dfb8835ecb..f9735f59cd 100644 +index 1488cde728..a52c1c9c95 100644 --- a/configure.json +++ b/configure.json @@ -597,7 +597,6 @@ @@ -21,5 +21,5 @@ index dfb8835ecb..f9735f59cd 100644 "publicFeature", { "type": "publicQtConfig", "negative": true }, -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch index 38f184df..6b9077cc 100644 --- a/qt5-base/mingw-w64/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch +++ b/qt5-base/mingw-w64/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch @@ -1,4 +1,4 @@ -From a401f6740c459cc21909ec406814852ff3ec233d Mon Sep 17 00:00:00 2001 +From cfdde9962386c34c3f2bfe902aa2a522b0530dba Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 7 Feb 2017 18:25:28 +0100 Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies @@ -11,7 +11,7 @@ static freetype2 and harfbuzz 2 files changed, 6 insertions(+) diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp -index 30f99174f8..154edd67d4 100644 +index 894020d2bd..5f57d6f5cb 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -414,6 +414,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib) @@ -39,5 +39,5 @@ index 2e6d5d94a9..a8320bae09 100644 static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 }; for (int i = 0; lflags[i]; i++) { -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0031-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64/0031-Hardcode-linker-flags-for-platform-plugins.patch index 6f873f40..ad6fa90b 100644 --- a/qt5-base/mingw-w64/0031-Hardcode-linker-flags-for-platform-plugins.patch +++ b/qt5-base/mingw-w64/0031-Hardcode-linker-flags-for-platform-plugins.patch @@ -1,4 +1,4 @@ -From 1c4ecb65d3f7a060f499cad169a7252b550f6769 Mon Sep 17 00:00:00 2001 +From 0e3e71c77f1bf23ab20c2c4b3219c371ba94825f Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 25 Jan 2017 23:42:30 +0100 Subject: [PATCH 31/33] Hardcode linker flags for platform plugins @@ -106,5 +106,5 @@ index 174bc7b609..e66488e364 100644 include(windows.pri) -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0032-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64/0032-Fix-linking-against-static-plugins-with-qmake.patch index 92b0abe8..d437395d 100644 --- a/qt5-base/mingw-w64/0032-Fix-linking-against-static-plugins-with-qmake.patch +++ b/qt5-base/mingw-w64/0032-Fix-linking-against-static-plugins-with-qmake.patch @@ -1,4 +1,4 @@ -From af66aa78320b37f4c5100e2822eceb3ecd0a703a Mon Sep 17 00:00:00 2001 +From 8741a4b4d6c3bc569dc6452c777a7692266e6a91 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 25 Aug 2017 17:07:17 +0200 Subject: [PATCH 32/33] Fix linking against static plugins with qmake @@ -33,5 +33,5 @@ index 6eebd068f1..310b8713f0 100644 # Check if the plugin is known to Qt. We can use this to determine # the plugin path. Unknown plugins must rely on the default link path. -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/0033-Disable-hardware-randomizer-for-32-bit.patch b/qt5-base/mingw-w64/0033-Disable-hardware-randomizer-for-32-bit.patch index d7cf9b4b..c3b291a1 100644 --- a/qt5-base/mingw-w64/0033-Disable-hardware-randomizer-for-32-bit.patch +++ b/qt5-base/mingw-w64/0033-Disable-hardware-randomizer-for-32-bit.patch @@ -1,4 +1,4 @@ -From 3758ea380174eaf89f31b68d5b7e4e2bf02e50be Mon Sep 17 00:00:00 2001 +From 4c9b1ccd23a3d0b63e57f5dff781ae8650b5d85c Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 26 May 2018 03:47:14 +0200 Subject: [PATCH 33/33] Disable hardware randomizer for 32-bit @@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644 #else return false; -- -2.17.0 +2.18.0 diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD index 97219767..9aefec77 100644 --- a/qt5-base/mingw-w64/PKGBUILD +++ b/qt5-base/mingw-w64/PKGBUILD @@ -36,7 +36,7 @@ isNoOpenGL() { } pkgname=mingw-w64-qt5-base -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 pkgdesc='A cross-platform application and UI framework (mingw-w64)' # The static variant doesn't contain any executables which need to be executed on the build machine @@ -85,40 +85,40 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0031-Hardcode-linker-flags-for-platform-plugins.patch' '0032-Fix-linking-against-static-plugins-with-qmake.patch' '0033-Disable-hardware-randomizer-for-32-bit.patch') -sha256sums=('ed6e46db84f7d34923ab4eae165c63e05ab3cfa9d19a73d3f57b4e7bfd41de66' - 'd01df5be5f96578f65c0343b1ae6eaac31e0c7608fb9b69e745865a5dfc8a1a3' - '29621ba67b026c9fb61ba865ba9d6198d3b8914623609b97bbc375feb33415b2' - '58435fde3af1478450c49637581884c217bd9080704dc80d035eb38df4706a6e' - '3b4dff095110e60257f794c31e5c3b7f73c91d690c7acb3182b489d04988dd27' - '2b62c549626e76da5c36779fe7dd18bddb8041fdb1b983cd29651cf5b0a2b905' - '5c94228d93b7a6340098968738477f9720908a360358f51cd1bc6590e83679c0' - '164b09da056113e19b859a151f93803f19e0c9ea5130db916722f5f0bcb7a8cd' - '351e61261c87d700f4076c6d3f19e81a60d1bfcc0e64f2164cb2696c47a0fafc' - 'a1ed220ddba56656fdbc37163e794f3b43e9a5dae6099b2b23967e870cd9214e' - '844d136f65d498dc1eea11e1882cf2645320d249c82fdcec5d25875e9158cb39' - 'a4a4f5ea9bc79b474ea3c5d86903054d6e9242a22b84589c210b3b8c2f797447' - '7d1d1d57bff00ae77d5480955b85737bd4f30185f5b99f8b34d89f90976f53fb' - '1937bb971912fa7021295174aee8c250a7be9c2d3e3ad76f700d9f7d80fd1117' - '504fd54855d13a326cb65cffc006d1c67d9e6236830df9f581106ae8fe319fff' - 'b732bca79bced6595e278e9e7ceec79306f51be121e78db0a9faa461344c918d' - 'f86242c7e013971812c9a17d667db362ac10d19a63b51cda23d1f306bc8f3242' - 'da007b133f51f27342854e0fb251a1784096f24dab454def99c8496c143f38e5' - 'e6e8f2290a019071ded71c090c3cb8b24e0e33a37dcabdc6f676b886c18dd06a' - '83645b01666aae48121ea9a952c6cfce9ba2aedb3edb9e1b11a893a5d8882831' - 'bb7e54a090ceb6cddac43acee2f34d888a15df2ae0e99808ef6aad9ff6e9ebcf' - '7166f4ab8b7c5a60c4a6e3ac86411719fab67ef6a6c5a16463c6541e9955ce17' - 'bf1defbedd5c0d26aa000178092ac2c87ecb70b992184dc8ffff4502351e70c2' - '29289ac6b2380c4a5d551d3c9b331f9b13190f4dafabdc203dcbfabcb4075c4d' - '0494a41d31ff097cd59117557a6869c5e0e7670eef33267f93974c15e4445e76' - 'bc53b50f4055170fea15b669366b8961e896d2705f91382ee3beea013979408e' - '08d299eb938edc1d535bbb68b5b720203e2dffbc49129218bb1368791e6fb384' - '20d945b374b0e73501013fcf6ba9fd7e8732b76060c948faeb42c605f2f9dd1f' - 'd9eeaceb89efd143918a1bfed6b60d33e004e8421a613036647f318320b25d6a' - 'fb54191f4479ed66446d9c6b9066be11c5d2d580ff4aa0910a3ad29183329e75' - 'df8bfa7901b6af9de447a4f4d0983419f7c1fe5882cc97614d0e5b0759c67dec' - '65d4a1aedc465dd9f5284cd1e2a352bc3c21e8e8e697e58ff9e89f54e5fcb173' - '178144d85cf4c69ae5cea694959a555c4a8eb3a0a5ad5116a2c979beac0e36c0' - '704c95d7fc157e58cc7d4436eb74bdcc0453ba29bb3326a3fe511ee35273e4c3') +sha256sums=('a0d047b2da5782c8332c59ae203984b64e4d5dc5f4ba9c0884fdbe753d0afb46' + 'e1973bda25994e3dc3d6c1b4d9b78fbbb540490d2da43db166df14f776a39039' + '46da072fdffff5edee7c23a024f4a28ca55b5ae57890145fb59ebe00bbeb897e' + '48a9629a9f26b7e828d6021e7db0149421ad05c3927cb9b60147c90caa487f9b' + 'b8d97a80c547e90e1348fa722b26dbda3d1f07ddfa4a00a0a268a5dbb3de489d' + '765501ce588fe5ebaccc8e54f3a588a08abceae304a19988358dd118fead847c' + '80181dda780b44bc24d3d7f0eb6b7c496170ef0db5955dd2d7e4214a24b48169' + '22974a0a1f902f812a655e86fb0bb18a7931be89240aef3a5b5eebadf085cbce' + '1eeeaf5b710df4846c94ad3e06802cd204ebfaf481905fe2644421efd557ff0f' + 'd26c120c12eddc18f1a424117e38c27c8171dfccb7d5ba1fcf3991d57328b9d7' + 'a8e27ad9ef209661ba42112a49f0fbf29fdb9bc94d6ad51f715e59b031d3230d' + 'dacf9cbed1f0f309b8394d4a1a27d60b641f3d19e70352827b1ef123dcf194a8' + '7e919946802ba7b3d666b69c661dff396abfc24b046edb439b684d4b3cc7f42f' + '03003c3a2a16d6f7b36436d8b63496fb5eb97c5da9770eb3f0d0bc3090b5d4e4' + '910f6198069a5d72b88bab70bfef2de50cf44f253a61a37e24c10d3d2d1f2590' + 'a262866828f5fd77c49d4dd62aa49447ab2e59eb7031a3bc09304ef100837ce5' + '613246baff8474c33314c6320fbf163835d36e9aae3221ab1c3ad87a55bcab9a' + '3e08a5af6515821049d611143782bfe1bea7b75c46b25a1a8cdd5b5d66f01cde' + '9ab6cd425c778cded2575d22a4577d5ae220f7a031e3ebc9581fe871f5bbda98' + '90bd7cfdb2a8e890db775293b498008264ccb5571247c77a1dbca21ef96f0e3f' + '37fa408528ff94f4f41e27097a619acc7dd97e66a9f2584178517079e3c5232c' + '4b293b11424efabcf25fc634fd7eec058351297474fcaaad6bbbf3b7be94e39f' + '3878d33beb40fc2907ccfaf7f656e983e30399bd0f6afa78658d802715e2e91d' + 'f96bea78b8a04a5d278cd01fdc6478a79beea6bba8f922a7ba91b14acd7998b3' + 'c0dc173b900ea5edc45ab2695406b1ca11c08113d8c402672208bee95deff4c7' + 'feb8bf1ee858b8c499c3644c95454880835adc85a5039f6d2027b06caa552be1' + 'e463ff31d6bc218a3724d95463b405f63ee66fb270ac1bbc0f3fc3d1e81c6444' + 'faeac0d51bc8ddda40fd02fdf8aff5f35187d9a3bcfa9c0a02d6d19a7314f91c' + '241790c3788449d71ef38c84c15fa158408057730b782fb7976e93ba26df4876' + 'e2983e47533094c5add54bdc4d565f7107b5508a2b23c3de8e0e92bf93627505' + '5a8f2561eb06951b5923f115cdcb7df863169c4db01207dc216ede107e9fca7c' + 'e907fb9111c9a54ac91a538a40b420088d54f86f047c129b0b6e4ff4423ae982' + '60cdf773863423f33207526b343cf72c76ee1680af27fb3c494f63ce9a58f9e8' + '7e353383fbd5ce8368089b5ec4ced6f19674c4490a46d4e0db81e1ea6800b180') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-canvas3d/mingw-w64/PKGBUILD b/qt5-canvas3d/mingw-w64/PKGBUILD index 52f55969..3981a057 100644 --- a/qt5-canvas3d/mingw-w64/PKGBUILD +++ b/qt5-canvas3d/mingw-w64/PKGBUILD @@ -8,7 +8,7 @@ _qt_module=qtcanvas3d pkgname="mingw-w64-qt5-canvas3d" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="A JavaScript 3D rendering API for Qt Quick (mingw-w64)" @@ -20,7 +20,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('3fc60eafbe8737a8ff126eb9e2becc010d94f3db99dfa1d365e84f6af4540ccf') +sha256sums=('0fb51102bdd595673e2cc4f4878b8fb8b7da4c8b1f026885a75912e2421d2ede') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-charts/mingw-w64/PKGBUILD b/qt5-charts/mingw-w64/PKGBUILD index 92c75873..6d5b49d5 100644 --- a/qt5-charts/mingw-w64/PKGBUILD +++ b/qt5-charts/mingw-w64/PKGBUILD @@ -8,7 +8,7 @@ _qt_module=qtcharts pkgname="mingw-w64-qt5-charts" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Provides a set of easy to use chart components (mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('c46e12beeaabf731ce918c7508d8ab62ae3b675870992faf36878268da4ee351') +sha256sums=('62f65f08b08c1fdce4f358103be1f7d7aba54d21774e1a9bfff91314ad667a2b') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-connectivity/mingw-w64/PKGBUILD b/qt5-connectivity/mingw-w64/PKGBUILD index da75e2de..3d68852e 100644 --- a/qt5-connectivity/mingw-w64/PKGBUILD +++ b/qt5-connectivity/mingw-w64/PKGBUILD @@ -8,7 +8,7 @@ _qt_module=qtconnectivity pkgname="mingw-w64-qt5-connectivity" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Provides access to Bluetooth hardware (mingw-w64)" @@ -20,7 +20,7 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('cd2e53b1a7bee098b651cbedcecf0717036ae4bec5de0daf3a0038a50b2e1873') +sha256sums=('738ed4eb058334fe7cfd6d68f2e2e7c9b2a97f3477b36ae26ed82703dcaae657') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-datavis3d/mingw-w64/PKGBUILD b/qt5-datavis3d/mingw-w64/PKGBUILD index 9ff11a92..7614ba68 100644 --- a/qt5-datavis3d/mingw-w64/PKGBUILD +++ b/qt5-datavis3d/mingw-w64/PKGBUILD @@ -8,7 +8,7 @@ _qt_module=qtdatavis3d pkgname="mingw-w64-qt5-datavis3d" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Qt Data Visualization module (mingw-w64)" @@ -21,7 +21,7 @@ groups=('mingw-w64-qt5') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('64bc1b9b55348210491cefac1d12210e59c3b27350e1e8c951518d67e0abefe8') +sha256sums=('1c9da0876e0058bff1c24e0088505aff469e2e2cc983143acdae17f075035e3d') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-declarative/apple-darwin/PKGBUILD b/qt5-declarative/apple-darwin/PKGBUILD index 31fc2368..9f5319b8 100644 --- a/qt5-declarative/apple-darwin/PKGBUILD +++ b/qt5-declarative/apple-darwin/PKGBUILD @@ -5,8 +5,8 @@ _qt_module=qtdeclarative pkgname='apple-darwin-qt5-declarative' -pkgver=5.11.0 -pkgrel=2 +pkgver=5.11.1 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Classes for QML and JavaScript languages (apple-darwin)" depends=('apple-darwin-qt5-base') diff --git a/qt5-declarative/mingw-w64/0001-Ensure-QML-dev-tools-is-built-as-static-library.patch b/qt5-declarative/mingw-w64/0001-Ensure-QML-dev-tools-is-built-as-static-library.patch index 8949f198..1d41a55c 100644 --- a/qt5-declarative/mingw-w64/0001-Ensure-QML-dev-tools-is-built-as-static-library.patch +++ b/qt5-declarative/mingw-w64/0001-Ensure-QML-dev-tools-is-built-as-static-library.patch @@ -1,4 +1,4 @@ -From 8cfa15af4358dc4043e19b8bd06bc2ddcfaca9fa Mon Sep 17 00:00:00 2001 +From 5ef2925b7bf0990e5a2c57558389f1c435de47bf Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 25 Sep 2016 21:24:15 +0200 Subject: [PATCH 1/3] Ensure QML dev tools is built as static library @@ -23,5 +23,5 @@ index 23b7cf651..d48a36059 100644 MODULE_INCNAME = QtQml INCLUDEPATH += $$OUT_PWD/../qml -- -2.17.0 +2.18.0 diff --git a/qt5-declarative/mingw-w64/0002-Ensure-static-plugins-are-exported.patch b/qt5-declarative/mingw-w64/0002-Ensure-static-plugins-are-exported.patch index 026f2c84..002ed924 100644 --- a/qt5-declarative/mingw-w64/0002-Ensure-static-plugins-are-exported.patch +++ b/qt5-declarative/mingw-w64/0002-Ensure-static-plugins-are-exported.patch @@ -1,4 +1,4 @@ -From e0a3f49cfd64490cc03c8d5e25555b06ce581a19 Mon Sep 17 00:00:00 2001 +From e2ca84329d873c92c386bdf88782c1d6813e04bf Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 23 Oct 2016 01:18:13 +0200 Subject: [PATCH 2/3] Ensure static plugins are exported @@ -18,5 +18,5 @@ index 9ddb9885c..9775d85e0 100644 foreach(_other_plugin ${_qt5qml_other_plugins}) include(${_other_plugin} OPTIONAL) -- -2.17.0 +2.18.0 diff --git a/qt5-declarative/mingw-w64/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch b/qt5-declarative/mingw-w64/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch index c657f352..6dd57780 100644 --- a/qt5-declarative/mingw-w64/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch +++ b/qt5-declarative/mingw-w64/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch @@ -1,4 +1,4 @@ -From 327b82f8a5658eef45bf3bed0709e0566ab4f7f5 Mon Sep 17 00:00:00 2001 +From d664294abc056675d1f05d964424d18146a36059 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 4 Feb 2017 01:59:59 +0100 Subject: [PATCH 3/3] Prevent exporting QML parser symbols on static build @@ -33,5 +33,5 @@ index 0e195994b..8aa451e9d 100644 # define QML_PARSER_EXPORT # elif defined(QT_BUILD_QML_LIB) -- -2.17.0 +2.18.0 diff --git a/qt5-declarative/mingw-w64/PKGBUILD b/qt5-declarative/mingw-w64/PKGBUILD old mode 100644 new mode 100755 index a5a885bd..f3ef7546 --- a/qt5-declarative/mingw-w64/PKGBUILD +++ b/qt5-declarative/mingw-w64/PKGBUILD @@ -12,7 +12,7 @@ _qt_module=qtdeclarative pkgname=mingw-w64-qt5-declarative -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Classes for QML and JavaScript languages (mingw-w64)' @@ -27,10 +27,10 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm '0001-Ensure-QML-dev-tools-is-built-as-static-library.patch' '0002-Ensure-static-plugins-are-exported.patch' '0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch') -sha256sums=('eea9378b17b1c16d3b5235629b9128349bf98cba7d9c61122653d976b25f57c0' - '95bf80aa39a9705d84d3cfe73b5de0540f2aa5853645f170d47cfa7ef8bd0074' - '182808bb60fcef2397e2e2476d1a86a43945f89cf653b58f2a6b6bf82e8cfe1e' - 'b629fa778ef275f07eb3cf224c0584813bd1825e005823307e0690ad4c8e1326') +sha256sums=('9ecf5ef6bf618fcb6719a4b22e3d9f9ce7623c2344667038171d5662624c4f3a' + '6f7ed7f76de78c1486478fd34830395be5e94f63cfad668187e84d5de8c60073' + '5a468edfc4c2af7f239695c793f8400598a6001ece5dbe37835eb55cc7d5661a' + '1455bd2f2896aef4f28892f446c25f9724a8c3440cd8829a7e173b3a0b516cb3') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-gamepad/mingw-w64/PKGBUILD b/qt5-gamepad/mingw-w64/PKGBUILD index f30e7afa..07e91393 100644 --- a/qt5-gamepad/mingw-w64/PKGBUILD +++ b/qt5-gamepad/mingw-w64/PKGBUILD @@ -8,7 +8,7 @@ _qt_module=qtgamepad pkgname="mingw-w64-qt5-gamepad" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Adds support for getting events from gamepad devices (mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('71a1445de3f0148639fcce27510f3eb410df6061bbb7af0f3ce5bff60660a23c') +sha256sums=('aaf219667f87d07a216bd30374013f97deea964471d827f7fc15bdc572e227d9') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-graphicaleffects/mingw-w64/PKGBUILD b/qt5-graphicaleffects/mingw-w64/PKGBUILD index 0c29ff2f..8290639d 100644 --- a/qt5-graphicaleffects/mingw-w64/PKGBUILD +++ b/qt5-graphicaleffects/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtgraphicaleffects pkgname="mingw-w64-qt5-graphicaleffects" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Graphical effects for use with Qt Quick 2 (mingw-w64)" @@ -22,7 +22,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-$pkgver" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('727846c9d8985be402f573ea28995f4a2bc13847a6d9deeca32d1e1e0421f977') +sha256sums=('d9d27236696221098e832d6fee8c0fbb2834b1670d9ca1e5bf3d0fbc8e5448f3') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-imageformats/apple-darwin/PKGBUILD b/qt5-imageformats/apple-darwin/PKGBUILD index ed2ab472..2c86f8fb 100644 --- a/qt5-imageformats/apple-darwin/PKGBUILD +++ b/qt5-imageformats/apple-darwin/PKGBUILD @@ -5,7 +5,7 @@ _qt_module=qtimageformats pkgname='apple-darwin-qt5-imageformats' -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (apple-darwin)" diff --git a/qt5-imageformats/mingw-w64/PKGBUILD b/qt5-imageformats/mingw-w64/PKGBUILD index 1499cbed..9f6d8799 100644 --- a/qt5-imageformats/mingw-w64/PKGBUILD +++ b/qt5-imageformats/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtimageformats pkgname="mingw-w64-qt5-imageformats" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)" @@ -26,7 +26,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('58406fef507a9f1e1cd97c0834b94d0a6484e19f5dea796a3b7b58fafff11e70') +sha256sums=('eb50deeccce12ede0a5faeb3e411f34920ba43092c65f063ab23d37970f65616') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-location/mingw-w64/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch b/qt5-location/mingw-w64/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch index 5a29efcf..dcdb1bcd 100644 --- a/qt5-location/mingw-w64/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch +++ b/qt5-location/mingw-w64/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch @@ -1,4 +1,4 @@ -From 7f6bb0791dbd8352c5485f307ccf05e5a9438699 Mon Sep 17 00:00:00 2001 +From bd9e3a4542b9f4e4a05f78584f4f8e34cfe37e58 Mon Sep 17 00:00:00 2001 From: Martchus Date: Thu, 22 Dec 2016 22:30:59 +0100 Subject: [PATCH] Ensure static 3rdparty libs are linked correctly @@ -23,5 +23,5 @@ index dec1149b..ad57a5c5 100644 plugin.json \ qmldir -- -2.17.0 +2.18.0 diff --git a/qt5-location/mingw-w64/PKGBUILD b/qt5-location/mingw-w64/PKGBUILD index 44bc1f1b..e50b3638 100644 --- a/qt5-location/mingw-w64/PKGBUILD +++ b/qt5-location/mingw-w64/PKGBUILD @@ -14,7 +14,7 @@ _mapboxcfg='QT.global.disabled_features+=geoservices_mapboxgl' _qt_module=qtlocation pkgname=mingw-w64-qt5-location -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc='Provides access to position, satellite and area monitoring classes (mingw-w64)' @@ -27,8 +27,8 @@ url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" '0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch') -sha256sums=('28f6911e3f00173005c0348c0b59f45e59ccda7feae724b1a6b8929021968c1c' - 'cfbaa9be5e71f51e4eaa4848052cd90cea105f06e3b7444c170477822b7b4b10') +sha256sums=('172c9a39e8267739e20d60bda45de3db02b13163245776bdc696d8c5ab5f790f' + '875bbeb35dbc2cc0b6a3c1fb2677f25f4e1e4f64cb803b03154d7954c4a330f6') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-multimedia/mingw-w64/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch b/qt5-multimedia/mingw-w64/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch index 64f43e21..2206a3fa 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 432d653b358ebb5bf82aa6a5b67f4331cc5b4b21 Mon Sep 17 00:00:00 2001 +From ce9491d330b55c184f62d676dabc66fa318fd675 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 25 Sep 2016 21:36:56 +0200 Subject: [PATCH 1/2] Recorder includes to prevent conflict with vsnprintf @@ -37,5 +37,5 @@ index 5f391710..3ae3b8aa 100644 QT_BEGIN_NAMESPACE -- -2.17.0 +2.18.0 diff --git a/qt5-multimedia/mingw-w64/0002-Fix-build-with-ANGLE.patch b/qt5-multimedia/mingw-w64/0002-Fix-build-with-ANGLE.patch index 99c451c3..eeecaa2c 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 20ebf5798011fafc06b929ac5c4b9387e9c96115 Mon Sep 17 00:00:00 2001 +From 685ae2e8299be0e0528b98b0244df17ac8eb157a Mon Sep 17 00:00:00 2001 From: Jose Santiago Date: Thu, 3 Nov 2016 14:36:10 -0500 Subject: [PATCH 2/2] Fix build with ANGLE @@ -25,5 +25,5 @@ index 54403fab..9132b3d8 100644 #endif -- -2.17.0 +2.18.0 diff --git a/qt5-multimedia/mingw-w64/PKGBUILD b/qt5-multimedia/mingw-w64/PKGBUILD index 65a11a1a..813286ba 100644 --- a/qt5-multimedia/mingw-w64/PKGBUILD +++ b/qt5-multimedia/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtmultimedia pkgname=mingw-w64-qt5-multimedia -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)' @@ -24,9 +24,9 @@ _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" '0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch' '0002-Fix-build-with-ANGLE.patch') -sha256sums=('ef5328f111ed2d27eff16e50febb66d1480e99f6a6df703f2ab8c650040f9d3c' - 'b574d0df6d11e4569bb2153640def0b8b40ac554c5c1a0c3dc24831d573da7a8' - '9a3e20370c4d9fafd4069f1257039903c6771be166e0a829c54dd8abaa4dc79f') +sha256sums=('f28bb57890b4666a9aafaa116a30c51dedb0f23b60a510280a27eb032b58c90c' + '2818f84cd4a00222517a2192702c5341bfd65dafaa330859a8a0c8ff6b4f03bb' + '7ec08be14199f3eed6e851673ceeeecf063926498823d415304f495ccfe9d890') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-networkauth/mingw-w64/PKGBUILD b/qt5-networkauth/mingw-w64/PKGBUILD index 9c5fe94a..aa0c8a7c 100644 --- a/qt5-networkauth/mingw-w64/PKGBUILD +++ b/qt5-networkauth/mingw-w64/PKGBUILD @@ -8,7 +8,7 @@ _qt_module=qtnetworkauth pkgname="mingw-w64-qt5-networkauth" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Network authentication module (mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('d56b068f02272690a2814d80102dcba26e366dde8848bcaf6745a1a5258728cf') +sha256sums=('02b405e9b1af27e3dd986f9a2e4ed987bd9586bcdb2a529a08a6cc71ddbee416') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-quickcontrols/mingw-w64/PKGBUILD b/qt5-quickcontrols/mingw-w64/PKGBUILD index f0e4b6bf..655ba1ac 100644 --- a/qt5-quickcontrols/mingw-w64/PKGBUILD +++ b/qt5-quickcontrols/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtquickcontrols pkgname="mingw-w64-qt5-quickcontrols" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)" @@ -22,7 +22,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-$pkgver" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('26627d592193094c65f842d5dd20c771d77c554591b9375659b03945dc8af107') +sha256sums=('baea7f59513ffade3f8041c1756722334b7d04245667fa8faaeace07a430c656') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-quickcontrols2/mingw-w64/PKGBUILD b/qt5-quickcontrols2/mingw-w64/PKGBUILD index b1ccb84c..08c252c2 100644 --- a/qt5-quickcontrols2/mingw-w64/PKGBUILD +++ b/qt5-quickcontrols2/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtquickcontrols2 pkgname="mingw-w64-qt5-quickcontrols2" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)" @@ -22,7 +22,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-$pkgver" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('feac87e9a6ecff47bd8c18baffb93f4cea9ebb86014f817bfafe62da88454ac3') +sha256sums=('bdb066fa0d51ad36a2c756d4cba63892587638e5df9b9b6ee63b963ff39ec442') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-remoteobjects/mingw-w64/PKGBUILD b/qt5-remoteobjects/mingw-w64/PKGBUILD index 32945a3c..4a2330aa 100644 --- a/qt5-remoteobjects/mingw-w64/PKGBUILD +++ b/qt5-remoteobjects/mingw-w64/PKGBUILD @@ -8,7 +8,7 @@ _qt_module=qtremoteobjects pkgname="mingw-w64-qt5-remoteobjects" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Inter-process communication (IPC) module developed for Qt (mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('09af3b3e104497576f6d5ad36027ea8837e19ee390914d33dcdc5d057b0f16b2') +sha256sums=('eb2d69c662cd828a11d248e61742e3e494507e640757ec63dc64db24867069fb') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-script/mingw-w64/PKGBUILD b/qt5-script/mingw-w64/PKGBUILD index 969f46b6..f9a5d556 100644 --- a/qt5-script/mingw-w64/PKGBUILD +++ b/qt5-script/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtscript pkgname="mingw-w64-qt5-script" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility (mingw-w64)" @@ -22,7 +22,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('25926ae733b31baac7af51f489ad26570d4f4f02ad4892a4a82babae5f5168c5') +sha256sums=('1c430fd06e8eb25dbca43422453a16588d1aade936770df2e4b4e8961659da7c') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-scxml/mingw-w64/PKGBUILD b/qt5-scxml/mingw-w64/PKGBUILD index 0744f5a6..1f92e1bf 100644 --- a/qt5-scxml/mingw-w64/PKGBUILD +++ b/qt5-scxml/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtscxml pkgname="mingw-w64-qt5-scxml" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="Static and runtime integration of SCXML models into Qt code (mingw-w64)" @@ -22,7 +22,7 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('531c204860e381808714486bd9703570de5fc5b1f8e2f4e18ede211d73428b03') +sha256sums=('f0463f02c0bb81d214b04ec82ff0d22744cdae1966cd8dfb53cd2b31ad233338') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-sensors/mingw-w64/PKGBUILD b/qt5-sensors/mingw-w64/PKGBUILD index c5cde45a..2139a030 100644 --- a/qt5-sensors/mingw-w64/PKGBUILD +++ b/qt5-sensors/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtsensors pkgname=mingw-w64-qt5-sensors -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Provides access to sensor hardware and motion gesture recognition (mingw-w64)" @@ -23,7 +23,7 @@ groups=('mingw-w64-qt5') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('0fc4e6d6b3281610551226cb6ffd9ef4e61b2f3bd0b7b1302135b03b5b16e2ab') +sha256sums=('cbe90f58b73c344d67098eaa333f2d2562fa7a9f1794448e7543ff696831c0fa') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-serialport/mingw-w64/PKGBUILD b/qt5-serialport/mingw-w64/PKGBUILD index fdbe9980..69c3ee9f 100644 --- a/qt5-serialport/mingw-w64/PKGBUILD +++ b/qt5-serialport/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtserialport pkgname="mingw-w64-qt5-serialport" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Provides access to hardware and virtual serial ports (mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-$pkgver" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/${_pkgfqn}.tar.xz") -sha256sums=('85eef7533a18fce59551fe26bb0055dd290d5d33cbb313fcb8e5daf8b40c6eb1') +sha256sums=('56a7993821d556d84494c6dfc22759eb6f2a979e21685403a2b9da75f0ba64a3') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-speech/mingw-w64/PKGBUILD b/qt5-speech/mingw-w64/PKGBUILD index 0a9ffb26..da8def42 100644 --- a/qt5-speech/mingw-w64/PKGBUILD +++ b/qt5-speech/mingw-w64/PKGBUILD @@ -8,7 +8,7 @@ _qt_module=qtspeech pkgname="mingw-w64-qt5-speech" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Qt module to make text to speech and speech recognition easy (mingw-w64)" @@ -24,7 +24,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('a1c125f9dde6817ae41be668973b8f365c20e1860d5924ea7736383c1578eead') +sha256sums=('dcc782c7d6693b0874881cf6ccc7269681bd8bf5f6e1a83c4ab18c27a35a9bdb') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-svg/apple-darwin/PKGBUILD b/qt5-svg/apple-darwin/PKGBUILD index 6f347671..bba92661 100644 --- a/qt5-svg/apple-darwin/PKGBUILD +++ b/qt5-svg/apple-darwin/PKGBUILD @@ -5,7 +5,7 @@ _qt_module=qtsvg pkgname='apple-darwin-qt5-svg' -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Classes for displaying the contents of SVG files (apple-darwin)" diff --git a/qt5-svg/mingw-w64/PKGBUILD b/qt5-svg/mingw-w64/PKGBUILD index 3cfd60e6..9cfa3d0d 100644 --- a/qt5-svg/mingw-w64/PKGBUILD +++ b/qt5-svg/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtsvg pkgname="mingw-w64-qt5-svg" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('4b8efe60678a37c731356cc146886360e5852a1cd4a8ba6339fb950a2e7d1f54') +sha256sums=('1d6aff3e3304ceec670c0f19029771ff21279553d561158063436b26c18b3037') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-tools/apple-darwin/PKGBUILD b/qt5-tools/apple-darwin/PKGBUILD index 57cea4a8..b56b1660 100644 --- a/qt5-tools/apple-darwin/PKGBUILD +++ b/qt5-tools/apple-darwin/PKGBUILD @@ -5,7 +5,7 @@ _qt_module=qttools pkgname="apple-darwin-qt5-tools" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; apple-darwin)" diff --git a/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch b/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch index 39b88136..d77df4f0 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 61e5d85ffe9ad4656b8dc39d763b3c9a83604c81 Mon Sep 17 00:00:00 2001 +From 2a78698b7dc6f991f067c8cce90bf3d9a5ecb159 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 25 Sep 2016 21:44:42 +0200 Subject: [PATCH 1/2] Fix linguist macro @@ -38,5 +38,5 @@ index b9959730..75776e0e 100644 DEPENDS ${_abs_FILE} VERBATIM ) -- -2.17.0 +2.18.0 diff --git a/qt5-tools/mingw-w64/0002-Prevent-linking-qhelpconverter-against-static-bearer.patch b/qt5-tools/mingw-w64/0002-Prevent-linking-qhelpconverter-against-static-bearer.patch index 9103cf99..9b2da368 100644 --- a/qt5-tools/mingw-w64/0002-Prevent-linking-qhelpconverter-against-static-bearer.patch +++ b/qt5-tools/mingw-w64/0002-Prevent-linking-qhelpconverter-against-static-bearer.patch @@ -1,4 +1,4 @@ -From 7144128f261005ef0d2b5bcf46e383b252441520 Mon Sep 17 00:00:00 2001 +From a410e171253fd42dd08f3bb9471cb47eec155e4a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 15 Oct 2017 22:25:22 +0200 Subject: [PATCH 2/2] Prevent linking qhelpconverter against static bearer @@ -27,5 +27,5 @@ index d60aae7c..99943618 100644 SOURCES += conversionwizard.cpp \ inputpage.cpp \ -- -2.17.0 +2.18.0 diff --git a/qt5-tools/mingw-w64/PKGBUILD b/qt5-tools/mingw-w64/PKGBUILD old mode 100755 new mode 100644 index 306e4578..bc0467f6 --- a/qt5-tools/mingw-w64/PKGBUILD +++ b/qt5-tools/mingw-w64/PKGBUILD @@ -16,8 +16,8 @@ _qt_module=qttools pkgname="mingw-w64-qt5-tools" -pkgver=5.11.0 -pkgrel=2 +pkgver=5.11.1 +pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)" depends=('mingw-w64-qt5-declarative') @@ -30,9 +30,9 @@ _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" '0001-Fix-linguist-macro.patch' '0002-Prevent-linking-qhelpconverter-against-static-bearer.patch') -sha256sums=('9d93ca84272cdf9031913cb3a6876716aa8a174e91693839f0de0ea3dd3a67d9' - '488e6f75865a6e818851f18ae4d45dd9ef91c02b48b1ce9cfb49ae2805858304' - 'aa2ef73945159e1c38a4f47938e58ddac3cac8d253c607a2f8c97241e0090842') +sha256sums=('b7fb186f92aedb922c4e7f57ff276bbf90caf0087a2a980f704bad9ac44514fe' + '834af0d5cc321e0513a856632190a1d96d85452779c2e3e0ead9445d2756e274' + '2b66137938499e02398005b70a1af54d43ed6c019ca156b3cdafa4940571038c') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' # can not use static MySQL plugin because mariadb-connector-c comes with its own pthread implementation diff --git a/qt5-translations/apple-darwin/PKGBUILD b/qt5-translations/apple-darwin/PKGBUILD index e5cc222d..9b9f8ffb 100644 --- a/qt5-translations/apple-darwin/PKGBUILD +++ b/qt5-translations/apple-darwin/PKGBUILD @@ -5,7 +5,7 @@ _qt_module=qttranslations pkgname='apple-darwin-qt5-translations' -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="A cross-platform application and UI framework (translations, apple-darwin)" diff --git a/qt5-translations/mingw-w64/PKGBUILD b/qt5-translations/mingw-w64/PKGBUILD index ef6177aa..a05eddd2 100644 --- a/qt5-translations/mingw-w64/PKGBUILD +++ b/qt5-translations/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qttranslations pkgname="mingw-w64-qt5-translations" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="A cross-platform application and UI framework (translations, mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('f13e92fce935ccc0e4bfd088645bf78ebadb42d4e944fc36c9dc08d537f2e81c') +sha256sums=('12d89b2afa64dce4d32c9e680135243c579d99aa9279d2aafc5602c15a697106') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' diff --git a/qt5-virtualkeyboard/mingw-w64/PKGBUILD b/qt5-virtualkeyboard/mingw-w64/PKGBUILD index 5e49b81a..1156ba5d 100644 --- a/qt5-virtualkeyboard/mingw-w64/PKGBUILD +++ b/qt5-virtualkeyboard/mingw-w64/PKGBUILD @@ -11,7 +11,7 @@ _qt_module=qtvirtualkeyboard pkgname="mingw-w64-qt5-virtualkeyboard" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Virtual keyboard framework (translations, mingw-w64)" @@ -23,7 +23,7 @@ license=('GPL3') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('914de601a81b32acdddc572d3ade41129b018f3693d9cecdc5dad32424913cbd') +sha256sums=('5b330dcc770976a2cfb8d85711d72a57c9764c1a9efb889c91e81f6071bbbf9b') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-webchannel/mingw-w64/PKGBUILD b/qt5-webchannel/mingw-w64/PKGBUILD index 7e4de40e..5e22dd3b 100644 --- a/qt5-webchannel/mingw-w64/PKGBUILD +++ b/qt5-webchannel/mingw-w64/PKGBUILD @@ -8,7 +8,7 @@ _qt_module=qtwebchannel pkgname=mingw-w64-qt5-webchannel -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc='Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients (mingw-w64)' @@ -21,7 +21,7 @@ url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" groups=('mingw-w64-qt5') source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('b0761a3b8260bae7f76bf26626ccd1d4ee92541d7c5d53d1958c88b9f92dca15') +sha256sums=('b9a476af15ae0c68a930f0b0aa8d988b8dc3e63c3d2134abebbf2148d6942e87') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-webengine/mingw-w64/PKGBUILD b/qt5-webengine/mingw-w64/PKGBUILD index 194bd32e..92860efa 100644 --- a/qt5-webengine/mingw-w64/PKGBUILD +++ b/qt5-webengine/mingw-w64/PKGBUILD @@ -10,7 +10,7 @@ _qt_module=qtwebengine pkgname=mingw-w64-qt5-webengine -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc='Provides support for web applications using the Chromium browser project (mingw-w64)' diff --git a/qt5-webglplugin/mingw-w64/PKGBUILD b/qt5-webglplugin/mingw-w64/PKGBUILD index e2a9a808..7eb407b7 100644 --- a/qt5-webglplugin/mingw-w64/PKGBUILD +++ b/qt5-webglplugin/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qt3d pkgname="mingw-w64-qt5-webglplugin" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="QPA plugin for running an application via a browser using streamed WebGL commands (mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('4d541516abb31a831a668d2be984e3af7cc6bffaa3af6223a76bdd5dd25870c0') +sha256sums=('cb8659e1e5541bea4c3684ac76a496f8e0cd6e3aa9e4e22eba1910095f5ed30d') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-websockets/mingw-w64/PKGBUILD b/qt5-websockets/mingw-w64/PKGBUILD index 5a0da147..e4ef0f42 100644 --- a/qt5-websockets/mingw-w64/PKGBUILD +++ b/qt5-websockets/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtwebsockets pkgname="mingw-w64-qt5-websockets" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Provides WebSocket communication compliant with RFC 6455 (mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('7d5845805bec42de121ecc063ee40ac1438975adcec395c6af97cfd5bb3539b7') +sha256sums=('7aaa12f719e853a195a670ff51697b73914e37c94ed2216d53a2d9e0861748ae') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-winextras/mingw-w64/0001-Revert-Directly-link-to-functions-available-from-Win.patch b/qt5-winextras/mingw-w64/0001-Revert-Directly-link-to-functions-available-from-Win.patch index 9017a313..6ee1214b 100644 --- a/qt5-winextras/mingw-w64/0001-Revert-Directly-link-to-functions-available-from-Win.patch +++ b/qt5-winextras/mingw-w64/0001-Revert-Directly-link-to-functions-available-from-Win.patch @@ -1,4 +1,4 @@ -From 6a1db14020557c6bbfa41852d29e2bda1720b607 Mon Sep 17 00:00:00 2001 +From 2389a5aa62a2b3bbc7d5b8daaa618c6a55ff5143 Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 27 May 2018 14:23:11 +0200 Subject: [PATCH] Revert "Directly link to functions available from Windows 7 @@ -294,5 +294,5 @@ index 705c48c..5d93c6b 100644 qwintaskbarprogress.cpp \ windowsguidsdefs.cpp \ -- -2.17.0 +2.18.0 diff --git a/qt5-winextras/mingw-w64/PKGBUILD b/qt5-winextras/mingw-w64/PKGBUILD index 12ae416e..2f28eb8f 100644 --- a/qt5-winextras/mingw-w64/PKGBUILD +++ b/qt5-winextras/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtwinextras pkgname="mingw-w64-qt5-winextras" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Classes and functions that enable you to use Windows-specific functions (mingw-w64)" @@ -22,8 +22,8 @@ url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz" '0001-Revert-Directly-link-to-functions-available-from-Win.patch') -sha256sums=('1c3344707a9288d9a2588bedb170897dd0158271a409f13c739b8598dc362e63' - 'dedbdb16f33d179e3dcea4776ee19650556bb5f617a1e676f9c1c04225d91935') +sha256sums=('ff2f17275b6e9764ce3691822fc8da7b3b13613fdeacb4a8294409931e74bc63' + 'fd14ea5af49cb1aa4beae123ef25b729e3d01ea6ede423a737ebad507667afa1') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \ diff --git a/qt5-xmlpatterns/mingw-w64/PKGBUILD b/qt5-xmlpatterns/mingw-w64/PKGBUILD index fe5e190d..afad7ab2 100644 --- a/qt5-xmlpatterns/mingw-w64/PKGBUILD +++ b/qt5-xmlpatterns/mingw-w64/PKGBUILD @@ -9,7 +9,7 @@ _qt_module=qtxmlpatterns pkgname="mingw-w64-qt5-xmlpatterns" -pkgver=5.11.0 +pkgver=5.11.1 pkgrel=1 arch=('any') pkgdesc="Support for XPath, XQuery, XSLT and XML schema validation (mingw-w64)" @@ -21,7 +21,7 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom') url='https://www.qt.io/' _pkgfqn="${_qt_module}-everywhere-src-${pkgver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz") -sha256sums=('19a378cba26e243ebb97c29a9ec02499c5eb49f2672fbcc8415e1b70d415d28e') +sha256sums=('6117e120c87b32dd07877dd0a6bf862b6285cb0d8b547190882980682f53af58') _architectures='i686-w64-mingw32 x86_64-w64-mingw32' [[ $NO_STATIC_LIBS ]] || \