From 12eae95a319b40ac02be21a04deee5da93817719 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Mon, 21 Nov 2022 15:57:13 +0300 Subject: [PATCH] qt5-static: Update to 5.15.7 --- ...E_EXTENSION_IMPORTLIB-defaulting-to-.patch | 29 ++++++++++--------- mingw-w64-qt5-static/PKGBUILD | 28 ++++-------------- 2 files changed, 20 insertions(+), 37 deletions(-) diff --git a/mingw-w64-qt5-static/0008-qt-5.3.0-win32-g-Add-QMAKE_EXTENSION_IMPORTLIB-defaulting-to-.patch b/mingw-w64-qt5-static/0008-qt-5.3.0-win32-g-Add-QMAKE_EXTENSION_IMPORTLIB-defaulting-to-.patch index 0794697afd..a0b164c06c 100644 --- a/mingw-w64-qt5-static/0008-qt-5.3.0-win32-g-Add-QMAKE_EXTENSION_IMPORTLIB-defaulting-to-.patch +++ b/mingw-w64-qt5-static/0008-qt-5.3.0-win32-g-Add-QMAKE_EXTENSION_IMPORTLIB-defaulting-to-.patch @@ -1,7 +1,7 @@ diff -Naur qt-everywhere-src-5.12.4-orig/qtbase/mkspecs/common/g++-win32.conf qt-everywhere-src-5.12.4/qtbase/mkspecs/common/g++-win32.conf --- qt-everywhere-src-5.12.4-orig/qtbase/mkspecs/common/g++-win32.conf 2019-06-15 15:09:10.556066900 +0300 +++ qt-everywhere-src-5.12.4/qtbase/mkspecs/common/g++-win32.conf 2019-06-15 15:09:21.226485600 +0300 -@@ -63,7 +63,7 @@ +@@ -61,7 +61,7 @@ QMAKE_EXTENSION_SHLIB = dll QMAKE_PREFIX_STATICLIB = lib QMAKE_EXTENSION_STATICLIB = a @@ -14,7 +14,7 @@ diff --git a/mingw-w64-qt5-base/src/qtbase-everywhere-src-5.14.2/mkspecs/feature index 0e71fd001..61d225310 100644 --- a/qtbase/mkspecs/features/create_cmake.prf +++ b/qtbase/mkspecs/features/create_cmake.prf -@@ -328,8 +328,14 @@ mac { +@@ -339,8 +339,14 @@ mac { CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}$${debug_suffix}.a CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a @@ -34,25 +34,26 @@ index 0e71fd001..61d225310 100644 diff -Naur qt-everywhere-src-5.12.4-orig/qtbase/mkspecs/features/qt.prf qt-everywhere-src-5.12.4/qtbase/mkspecs/features/qt.prf --- qt-everywhere-src-5.12.4-orig/qtbase/mkspecs/features/qt.prf 2019-06-12 23:59:14.000000000 +0300 +++ qt-everywhere-src-5.12.4/qtbase/mkspecs/features/qt.prf 2019-06-15 15:09:21.226485600 +0300 -@@ -213,8 +213,12 @@ - LIBS$$var_sfx += -framework $$framework +@@ -217,9 +217,13 @@ } else { - lib = $$MODULE_MODULE$$qtPlatformTargetSuffix() + candidates = $$MODULE_MODULE$$qtPlatformTargetSuffix() + darwin: candidates *= $$MODULE_MODULE - win32|contains(MODULE_CONFIG, staticlib) { -- lib = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB$${lib}.$$QMAKE_EXTENSION_STATICLIB + win32 { + lib_prefix = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB +- lib_suffix = $$QMAKE_EXTENSION_STATICLIB + contains(MODULE_CONFIG, staticlib) { -+ lib = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB$${lib}.$$QMAKE_EXTENSION_STATICLIB ++ lib_suffix = $$QMAKE_EXTENSION_STATICLIB + } else { -+ lib = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB$${lib}.$$QMAKE_EXTENSION_IMPORTLIB ++ lib_suffix = $$QMAKE_EXTENSION_IMPORTLIB + } - PRE_TARGETDEPS += $$lib + add_lib_to_pretargetdeps = true } else { - lib = $$MODULE_LIBS/$$QMAKE_PREFIX_SHLIB$${lib}.$$QMAKE_EXTENSION_SHLIB + lib_prefix = $$MODULE_LIBS/$$QMAKE_PREFIX_SHLIB diff -Naur qt-everywhere-src-5.12.4-orig/qtbase/qmake/generators/win32/winmakefile.cpp qt-everywhere-src-5.12.4/qtbase/qmake/generators/win32/winmakefile.cpp --- qt-everywhere-src-5.12.4-orig/qtbase/qmake/generators/win32/winmakefile.cpp 2019-06-12 23:59:14.000000000 +0300 +++ qt-everywhere-src-5.12.4/qtbase/qmake/generators/win32/winmakefile.cpp 2019-06-15 15:09:21.226485600 +0300 -@@ -80,10 +80,16 @@ +@@ -99,10 +99,16 @@ bool Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) { @@ -72,8 +73,8 @@ diff -Naur qt-everywhere-src-5.12.4-orig/qtbase/qmake/generators/win32/winmakefi + dirs.append(qt_prefix_libs); int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) - dirs.append(LibrarySearchPath(dlib.toQString())); -@@ -257,9 +263,12 @@ + dirs.append(LibrarySearchPath(dlib.toQString(), true)); +@@ -283,9 +289,12 @@ if (!project->values("QMAKE_APP_FLAG").isEmpty()) { project->values("TARGET_EXT").append(".exe"); } else if (project->isActiveConfig("shared")) { @@ -89,7 +90,7 @@ diff -Naur qt-everywhere-src-5.12.4-orig/qtbase/qmake/generators/win32/winmakefi project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); --- qtbase-everywhere-src-5.14.0/qtbase/src/corelib/global/qlibraryinfo.cpp 2020-01-24 09:18:55.394378700 +0000 +++ qtbase-everywhere-src-5.14.0/qtbase/src/corelib/global/qlibraryinfo.cpp 2020-01-24 09:18:01.235198900 +0000 -@@ -576,7 +576,7 @@ +@@ -598,7 +598,7 @@ const QLatin1Char slash('/'); #if defined(Q_CC_MINGW) const QString implibPrefix = QStringLiteral("lib"); diff --git a/mingw-w64-qt5-static/PKGBUILD b/mingw-w64-qt5-static/PKGBUILD index 555f57c872..f01dcff677 100644 --- a/mingw-w64-qt5-static/PKGBUILD +++ b/mingw-w64-qt5-static/PKGBUILD @@ -118,7 +118,7 @@ if [ "${_variant}" = "-static" ]; then else pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") fi -_ver_base=5.15.3 +_ver_base=5.15.7 # use 5.6.1-1 hot fix : only the archive name was changed from *-5.6.1.tar.xz to *-5.6.1-1.tar.xz _hotfix= pkgver=${_ver_base//-/} @@ -243,11 +243,7 @@ source=(#https://download.qt.io/development_releases/qt/${pkgver%.*}/${_ver_base 0300-qt-5.8.0-cast-errors.patch 0302-ugly-hack-disable-qdoc-build.patch 0304-qtdeclarative-disable-dx12.patch - 0310-fix-assimp-not-found.patch - https://invent.kde.org/qt/qt/qtbase/commit/cd1646f00ae9df9824a639d01a2be708f85235fe.patch - https://invent.kde.org/qt/qt/qtbase/commit/8bcf1828f4d75606fb8d6913dfe09e2363a06cac.patch - https://invent.kde.org/qt/qt/qtdeclarative/commit/3c42d4d3dce95b67d65541c5612384eab0c3e27b.patch - https://invent.kde.org/qt/qt/qtdeclarative/commit/0eb5ff2e97713e12318c00bab9f3605abb8592c2.patch) + 0310-fix-assimp-not-found.patch) # Translates using cygpath according to the ${_make} being used # (so either mingw32-make or MSYS2 make can be used) @@ -351,16 +347,6 @@ prepare() { 0304-qtdeclarative-disable-dx12.patch \ 0310-fix-assimp-not-found.patch - cd qtbase - apply_patch_with_msg cd1646f00ae9df9824a639d01a2be708f85235fe.patch - apply_patch_with_msg 8bcf1828f4d75606fb8d6913dfe09e2363a06cac.patch - cd - - - cd qtdeclarative - apply_patch_with_msg 3c42d4d3dce95b67d65541c5612384eab0c3e27b.patch - apply_patch_with_msg 0eb5ff2e97713e12318c00bab9f3605abb8592c2.patch - cd - - # See: https://bugreports.qt.io/browse/QTBUG-37902 # _ver_num=${_ver_base%%-*} # sed -i "s/^MODULE_VERSION = .*$/MODULE_VERSION = ${_ver_num}/g" qtenginio/.qmake.conf @@ -806,14 +792,14 @@ done # export PKG_CONFIG_PATH=/mingw32/lib/pkgconfig # E:/m2/repo/mingw-w64-qt5/src/i686/qtbase/bin/qmake.exe -o Makefile qml.pro -sha256sums=('b7412734698a87f4a0ae20751bab32b1b07fdc351476ad8e35328dbe10efdedb' +sha256sums=('8a71986676a3f37a198a9113acedbfd5bc5606a459b6b85816d951458adbe9a0' '884b32f0e2e1bb110330a921b69443379a7be98c42f13754f9c5f56c040ba3b7' '617e6fa85a92353d0073425d37cd5d90d92cb7f906d66dd2d0df576122d091a4' '27ce2161b5dbea2fcce6b15948ab722a71036d056420854f6554969f683583bb' 'e04033364f5ad77906b4100c34572df57bd793a55bc33b7d8a753a2cc60af259' '18fd2fa42215ac47b3b314261ab98cbe65f8231429e4f29a152288a3ca93daf1' '4e154fbc9059a096c351d019da6b18c907b1d8b06e028f48c7365f62bcd0edc9' - 'd99a4b74a062912a6913a883655d67257715866209a5c17cf9a3e6837dbd9260' + 'e2ec5e67bdcfd162a82c49181a2d480f4b193acdfa6b0e22f4a8448286162630' '465d3897c4494695b66ac121944b3bd370db91bfea71dd2c9170dbf268cc99ea' 'b31929c78f9906756a5e1bdf9a796541865c474aaa1b3eefea1a3f1d7c8d94ca' 'd8a476be7e55e8bb9362868073dc9e7937431e68b9578c0a0ed103cf1ebc8c01' @@ -841,8 +827,4 @@ sha256sums=('b7412734698a87f4a0ae20751bab32b1b07fdc351476ad8e35328dbe10efdedb' '9ea7aeb486023f3aebf1af44603ebd9266009aaeaf91e52c37c8c5154ea3900c' '7e57ce20b6707bc3b4a727da3287cadda13a74317d86515358b2535bc15244c7' '052c7035ad9a4fc0321975ba7658fb755bbc0841c7e1d9e88bb0a15e6a90b770' - '157b97b3e3031d93d93e45368a1c54ebfbf9578116f75f5126e977e5dd518191' - 'c441973c3af66e6d58cce39d39b6e18d5832d942371ffd8c149ef732210c8e2c' - 'f216814efff6c834fcdc0dae4c54bec0b4ef41132f78c6d0a4c6bf7f6feafda2' - 'e8943934af0cea22814b526ca75abf98cacac2d0f86e2b2c9588c694a859f9d2' - '496241b7810f8073c82b781c7c4addb38a4ec3fbe3e7cafff56b0d0e340e2d5f') + '157b97b3e3031d93d93e45368a1c54ebfbf9578116f75f5126e977e5dd518191')