From 9f3b9393c95d4e421c44dfc71de33dab9012c283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Thu, 8 Sep 2022 15:56:33 +0100 Subject: [PATCH] qt5: update to 5.15.6 - Part1 --- mingw-w64-qt5-activeqt/PKGBUILD | 4 +- mingw-w64-qt5-imageformats/PKGBUILD | 4 +- mingw-w64-qt5-multimedia/PKGBUILD | 4 +- ...E_EXTENSION_IMPORTLIB-defaulting-to-.patch | 39 ++++++++++--------- mingw-w64-qt5-pkgs/PKGBUILD | 8 ++-- mingw-w64-qt5-svg/PKGBUILD | 6 +-- mingw-w64-qt5-tools/PKGBUILD | 4 +- mingw-w64-qt5-translations/PKGBUILD | 4 +- 8 files changed, 37 insertions(+), 36 deletions(-) diff --git a/mingw-w64-qt5-activeqt/PKGBUILD b/mingw-w64-qt5-activeqt/PKGBUILD index 68f89ca798..bfffea55c8 100644 --- a/mingw-w64-qt5-activeqt/PKGBUILD +++ b/mingw-w64-qt5-activeqt/PKGBUILD @@ -4,7 +4,7 @@ _realname=qt5-activeqt pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -_qtver=5.15.5 +_qtver=5.15.6 pkgver=${_qtver/-/} pkgrel=1 arch=('any') @@ -18,7 +18,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-qt5-declarative" options=('!strip' 'staticlibs' 'ccache') _pkgfn="${_realname/5-/}-everywhere-opensource-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz") -sha256sums=('a60ac7a44982424d6684ef94ecc2b80912b138f88ce42e2361c4344e84aeab16') +sha256sums=('7bbbb6f1e00b13d1a3139bed0ea117e8c27a49b4281df772379287a809403d8d') build() { cd ${srcdir} diff --git a/mingw-w64-qt5-imageformats/PKGBUILD b/mingw-w64-qt5-imageformats/PKGBUILD index ecf8b9ab79..ca96d7c6e1 100644 --- a/mingw-w64-qt5-imageformats/PKGBUILD +++ b/mingw-w64-qt5-imageformats/PKGBUILD @@ -4,7 +4,7 @@ _realname=qt5-imageformats pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -_qtver=5.15.5 +_qtver=5.15.6 pkgver=${_qtver/-/} pkgrel=1 arch=('any') @@ -23,7 +23,7 @@ options=('!strip' 'staticlibs' 'ccache') _pkgfn="${_realname/5-/}-everywhere-opensource-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz" "0001-qmng-fix-build.patch") -sha256sums=('4aa058e123b96c2c17cd9cf11cabbd5471b9db950d61ced23f5caa00c5174bf6' +sha256sums=('4cbc9318fb532d0fa9a147460c053d1dfc0aca019dfda271197d93e863404e5d' '727602791c21070a08c97c9423a4343e2a44d2f7ea48731b3720da50e4797ea5') prepare() { diff --git a/mingw-w64-qt5-multimedia/PKGBUILD b/mingw-w64-qt5-multimedia/PKGBUILD index d2cbec19a8..9b406eb622 100644 --- a/mingw-w64-qt5-multimedia/PKGBUILD +++ b/mingw-w64-qt5-multimedia/PKGBUILD @@ -4,7 +4,7 @@ _realname=qt5-multimedia pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -_qtver=5.15.5 +_qtver=5.15.6 pkgver=${_qtver/-/} pkgrel=1 arch=('any') @@ -21,7 +21,7 @@ options=('!strip' 'staticlibs' 'ccache') _pkgfn="${_realname/5-/}-everywhere-opensource-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz" "0001-fix-wmf-plugin.patch") -sha256sums=('bc9ff46c687570b2efa3f31b9b8225c0da672e81f484166b41f5b1ec828fe660' +sha256sums=('d60b9c6dc927547db5af09fd133099b5361444cb7e329a8b271980512e03304d' 'd4a325bb319ee746f355a54ea562d974aad4d05dadb0147f30fd023acd631558') prepare() { diff --git a/mingw-w64-qt5-pkgs/0007-qt-5.3.0-win32-g-Add-QMAKE_EXTENSION_IMPORTLIB-defaulting-to-.patch b/mingw-w64-qt5-pkgs/0007-qt-5.3.0-win32-g-Add-QMAKE_EXTENSION_IMPORTLIB-defaulting-to-.patch index bf1ffe7b35..988d617363 100644 --- a/mingw-w64-qt5-pkgs/0007-qt-5.3.0-win32-g-Add-QMAKE_EXTENSION_IMPORTLIB-defaulting-to-.patch +++ b/mingw-w64-qt5-pkgs/0007-qt-5.3.0-win32-g-Add-QMAKE_EXTENSION_IMPORTLIB-defaulting-to-.patch @@ -1,5 +1,5 @@ ---- a/mkspecs/common/g++-win32.conf 2019-06-15 15:09:10.556066900 +0300 -+++ b/mkspecs/common/g++-win32.conf 2019-06-15 15:09:21.226485600 +0300 +--- a/mkspecs/common/g++-win32.conf ++++ b/mkspecs/common/g++-win32.conf @@ -61,7 +61,7 @@ QMAKE_EXTENSION_SHLIB = dll QMAKE_PREFIX_STATICLIB = lib @@ -11,7 +11,7 @@ QMAKE_PKG_CONFIG = $${CROSS_COMPILE}pkg-config --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf -@@ -332,8 +332,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 @@ -28,25 +28,26 @@ } else { CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib ---- a/mkspecs/features/qt.prf 2019-06-12 23:59:14.000000000 +0300 -+++ b/mkspecs/features/qt.prf 2019-06-15 15:09:21.226485600 +0300 -@@ -216,8 +216,12 @@ - LIBS$$var_sfx += -framework $$framework +--- a/mkspecs/features/qt.prf ++++ b/mkspecs/features/qt.prf +@@ -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 ---- a/qmake/generators/win32/winmakefile.cpp 2019-06-12 23:59:14.000000000 +0300 -+++ b/qmake/generators/win32/winmakefile.cpp 2019-06-15 15:09:21.226485600 +0300 + lib_prefix = $$MODULE_LIBS/$$QMAKE_PREFIX_SHLIB +--- a/qmake/generators/win32/winmakefile.cpp ++++ b/qmake/generators/win32/winmakefile.cpp @@ -99,10 +99,16 @@ bool Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) @@ -67,7 +68,7 @@ + dirs.append(qt_prefix_libs); int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) - dirs.append(LibrarySearchPath(dlib.toQString())); + dirs.append(LibrarySearchPath(dlib.toQString(), true)); @@ -283,9 +289,12 @@ if (!project->values("QMAKE_APP_FLAG").isEmpty()) { project->values("TARGET_EXT").append(".exe"); @@ -82,9 +83,9 @@ project->values("TARGET_EXT").append(project->first("TARGET_VERSION_EXT") + "." + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); ---- a/src/corelib/global/qlibraryinfo.cpp 2020-01-24 09:18:55.394378700 +0000 -+++ b/src/corelib/global/qlibraryinfo.cpp 2020-01-24 09:18:01.235198900 +0000 -@@ -596,7 +596,7 @@ +--- a/src/corelib/global/qlibraryinfo.cpp ++++ b/src/corelib/global/qlibraryinfo.cpp +@@ -598,7 +598,7 @@ const QLatin1Char slash('/'); #if defined(Q_CC_MINGW) const QString implibPrefix = QStringLiteral("lib"); diff --git a/mingw-w64-qt5-pkgs/PKGBUILD b/mingw-w64-qt5-pkgs/PKGBUILD index 944d2ddef1..23b992da74 100644 --- a/mingw-w64-qt5-pkgs/PKGBUILD +++ b/mingw-w64-qt5-pkgs/PKGBUILD @@ -22,10 +22,10 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-base" "${MINGW_PACKAGE_PREFIX}-${_realname}-quick3d-debug" "${MINGW_PACKAGE_PREFIX}-${_realname}-script" "${MINGW_PACKAGE_PREFIX}-${_realname}-script-debug") -_qtver=5.15.5 -pkgver=${_qtver}+kde+r227 +_qtver=5.15.6 +pkgver=${_qtver}+kde+r235 pkgrel=1 -_commit=12ce21bb79322ae4a685ebe03e360da64823fd86 +_commit=287c68fedfc2770c6eff15c5aecc23a8fb67d49c arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') pkgdesc="A cross-platform application and UI framework (mingw-w64)" @@ -641,7 +641,7 @@ sha256sums=('SKIP' '02a3b24c02a6797b706582198ab1177648c2653e8870dcdddc5856d6cd629d49' '013401295022dbad73df0355124758d337da71b99253461bb84bc7c9320e27e6' '61cb036d39a12abc5f98fc2afdc41694471413171e79debd3cd5f464d74dad32' - '1ca4be5aefe731af2c9229ed97e8c6231d735a64c655768f6ef677a932ce2019' + 'ae7daec747b954c5bd93bf3f37971d173f8fbd277ad11a63b7c88494dad37986' '0fb18899437e86bdbea1750a892b18bef76bdf9b85e504afcb65e7f49f421ff0' '3a8de25edb2a4643583ad5fa2743475b60fffad931be25314b4067be2413bca4' '49eee16b318f1ac8d5ddf45f294b9f88e05c2f7f7ad2808f281961200d61c6cf' diff --git a/mingw-w64-qt5-svg/PKGBUILD b/mingw-w64-qt5-svg/PKGBUILD index 10482543bc..ed35f220ca 100644 --- a/mingw-w64-qt5-svg/PKGBUILD +++ b/mingw-w64-qt5-svg/PKGBUILD @@ -4,10 +4,10 @@ _realname=qt5-svg pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -_qtver=5.15.5 -pkgver=${_qtver}+kde+r11 +_qtver=5.15.6 +pkgver=${_qtver}+kde+r8 pkgrel=1 -_commit=b8e1a7eb5e45880dc97b9b29d2844bc9c07708a7 +_commit=8cebe1d49617370ea2f5daae68b41c5d45d606c3 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)" diff --git a/mingw-w64-qt5-tools/PKGBUILD b/mingw-w64-qt5-tools/PKGBUILD index 8a53ee93a8..e8a1664e04 100644 --- a/mingw-w64-qt5-tools/PKGBUILD +++ b/mingw-w64-qt5-tools/PKGBUILD @@ -4,7 +4,7 @@ _realname=qt5-tools pkgbase="mingw-w64-${_realname}" pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug") -_qtver=5.15.5 +_qtver=5.15.6 pkgver=${_qtver} pkgrel=1 arch=('any') @@ -24,7 +24,7 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submod 001-qt-5.11-mingw-fix-link-qdoc-with-clang.patch 002-qt5-windeployqt-fixes.patch 003-ugly-hack-disable-qdoc-build.patch) -sha256sums=('6d0778b71b2742cb527561791d1d3d255366163d54a10f78c683a398f09ffc6c' +sha256sums=('2c1486ab7e6dad76fb34642cd4f91d533e5dfeec0ee527129c2c2ed4ab283c3b' 'aff15370d18498ee1cc73f027b3fc76cc899b3cd1f79c3ed3bbda50b927dec33' '5009ef5c9812f6f6ba6d69d6b2a90b5caa43cf0ef46bf36ac507c672e697e5a1' '1927c71175f758914abc485506bb162f3eac5e0816a00be66a78562b168095f0') diff --git a/mingw-w64-qt5-translations/PKGBUILD b/mingw-w64-qt5-translations/PKGBUILD index faca16999e..7fc2759659 100644 --- a/mingw-w64-qt5-translations/PKGBUILD +++ b/mingw-w64-qt5-translations/PKGBUILD @@ -3,7 +3,7 @@ _realname=qt5-translations pkgbase="mingw-w64-${_realname}" pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -_qtver=5.15.5 +_qtver=5.15.6 pkgver=${_qtver/-/} pkgrel=1 arch=('any') @@ -18,7 +18,7 @@ groups=("${MINGW_PACKAGE_PREFIX}-qt5") options=('!strip' 'staticlibs' 'ccache') _pkgfn="${_realname/5-/}-everywhere-opensource-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/submodules/$_pkgfn.tar.xz") -sha256sums=('c92af4171397a0ed272330b4fa0669790fcac8d050b07c8b8cc565ebeba6735e') +sha256sums=('295ba009b0709fc59aeff3ec9973e7664f3e1885252a71d63d264e6e6a7dbc33') build() { cd ${srcdir}