From aa41cb2ac4c5f5e77e48a4dffbd62b91dd26b926 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, 15 Jun 2023 06:23:25 +0100 Subject: [PATCH] qt5-doc: update to 5.15.10 --- ...E_EXTENSION_IMPORTLIB-defaulting-to-.patch | 29 +++++++------- mingw-w64-qt5-doc/PKGBUILD | 40 +++++-------------- 2 files changed, 26 insertions(+), 43 deletions(-) diff --git a/mingw-w64-qt5-doc/0008-qt-5.3.0-win32-g-Add-QMAKE_EXTENSION_IMPORTLIB-defaulting-to-.patch b/mingw-w64-qt5-doc/0008-qt-5.3.0-win32-g-Add-QMAKE_EXTENSION_IMPORTLIB-defaulting-to-.patch index 0794697afd..a0b164c06c 100644 --- a/mingw-w64-qt5-doc/0008-qt-5.3.0-win32-g-Add-QMAKE_EXTENSION_IMPORTLIB-defaulting-to-.patch +++ b/mingw-w64-qt5-doc/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-doc/PKGBUILD b/mingw-w64-qt5-doc/PKGBUILD index 1089e5d210..1d0099ba03 100644 --- a/mingw-w64-qt5-doc/PKGBUILD +++ b/mingw-w64-qt5-doc/PKGBUILD @@ -11,7 +11,7 @@ fi _realname=qt5-doc pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=5.15.5 +pkgver=5.15.10 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -43,7 +43,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-qt5-tools" $([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-firebird2") ) groups=("${MINGW_PACKAGE_PREFIX}-qt5") -options=('!strip' 'staticlibs' 'ccache') _pkgfile="qt-everywhere-opensource-src-${pkgver}" _pkgfqn="qt-everywhere-src-${pkgver}" noextract=(${_pkgfile}.tar.xz) @@ -81,9 +80,7 @@ source=(https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/singl 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/a7e3a08bd5e7252555f4973f825f05b6795d649b.patch - https://invent.kde.org/qt/qt/qtdeclarative/commit/814f570d51323630ff84038ca04b5c02639e0ee5.patch) + 0310-fix-assimp-not-found.patch) # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -147,30 +144,17 @@ prepare() { 0304-qtdeclarative-disable-dx12.patch \ 0310-fix-assimp-not-found.patch - # Fix build for GCC 11 - cd qtbase - apply_patch_with_msg a7e3a08bd5e7252555f4973f825f05b6795d649b.patch - cd - - - # Fix build for GCC 11 - cd qtdeclarative - apply_patch_with_msg 814f570d51323630ff84038ca04b5c02639e0ee5.patch - cd - + if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then + sed -i "s| -mthreads||g" qtbase/mkspecs/common/g++-win32.conf + fi local _ARCH_TUNE= - local _HARD_FLAGS= case ${MINGW_CHOST} in i686*) - _ARCH_TUNE="-march=i686 -mtune=core2" - if [ "${_enable_hardening}" = "yes" ]; then - _HARD_FLAGS="-Wl,--dynamicbase,--nxcompat,--no-seh" - fi + _ARCH_TUNE="-march=pentium4 -mtune=generic" ;; x86_64*) - _ARCH_TUNE="-march=nocona -mtune=core2" - if [ "${_enable_hardening}" = "yes" ]; then - _HARD_FLAGS="-Wl,--dynamicbase,--high-entropy-va,--nxcompat,--default-image-base-high" - fi + _ARCH_TUNE="-march=nocona -msahf -mtune=generic" ;; esac @@ -178,7 +162,7 @@ prepare() { # Append these ones .. sed -i "s|^QMAKE_CFLAGS .*= \(.*\)$|QMAKE_CFLAGS = \1 ${_ARCH_TUNE} ${BIGOBJ_FLAGS}|g" qtbase/mkspecs/${_platform}/qmake.conf - sed -i "s|^QMAKE_LFLAGS +=\(.*\)$|QMAKE_LFLAGS += \1 ${_HARD_FLAGS}|g" qtbase/mkspecs/common/gcc-base.conf + sed -i "s|^QMAKE_CXXFLAGS .*= \(.*\)$|QMAKE_CXXFLAGS = \1 ${_ARCH_TUNE} ${BIGOBJ_FLAGS}|g" qtbase/mkspecs/${_platform}/qmake.conf # To keep the build folder name quite small (PATH_MAX limit) # the source folder (long) is renamed to $MSYSTEM @@ -262,14 +246,14 @@ package() { install -Dm644 $srcdir/${MSYSTEM}/${_realname/5-/}/LICENSE* -t "$pkgdir${MINGW_PREFIX}"/share/licenses/${_realname} } -sha256sums=('5a97827bdf9fd515f43bc7651defaf64fecb7a55e051c79b8f80510d0e990f06' +sha256sums=('b545cb83c60934adc9a6bbd27e2af79e5013de77d46f5b9f5bb2a3c762bf55ca' '884b32f0e2e1bb110330a921b69443379a7be98c42f13754f9c5f56c040ba3b7' '617e6fa85a92353d0073425d37cd5d90d92cb7f906d66dd2d0df576122d091a4' '27ce2161b5dbea2fcce6b15948ab722a71036d056420854f6554969f683583bb' 'e04033364f5ad77906b4100c34572df57bd793a55bc33b7d8a753a2cc60af259' '18fd2fa42215ac47b3b314261ab98cbe65f8231429e4f29a152288a3ca93daf1' '4e154fbc9059a096c351d019da6b18c907b1d8b06e028f48c7365f62bcd0edc9' - 'd99a4b74a062912a6913a883655d67257715866209a5c17cf9a3e6837dbd9260' + 'e2ec5e67bdcfd162a82c49181a2d480f4b193acdfa6b0e22f4a8448286162630' '465d3897c4494695b66ac121944b3bd370db91bfea71dd2c9170dbf268cc99ea' 'b31929c78f9906756a5e1bdf9a796541865c474aaa1b3eefea1a3f1d7c8d94ca' 'd8a476be7e55e8bb9362868073dc9e7937431e68b9578c0a0ed103cf1ebc8c01' @@ -296,6 +280,4 @@ sha256sums=('5a97827bdf9fd515f43bc7651defaf64fecb7a55e051c79b8f80510d0e990f06' '9ea7aeb486023f3aebf1af44603ebd9266009aaeaf91e52c37c8c5154ea3900c' '7e57ce20b6707bc3b4a727da3287cadda13a74317d86515358b2535bc15244c7' '052c7035ad9a4fc0321975ba7658fb755bbc0841c7e1d9e88bb0a15e6a90b770' - '157b97b3e3031d93d93e45368a1c54ebfbf9578116f75f5126e977e5dd518191' - '4568b1d756a98b45fef368229479f56af604274de227caf7fb23a4a15bb10a4f' - '3e865f2d5ae38463c6984883b4cb57ea599520fd358fc3df3eb5951002c079f2') + '157b97b3e3031d93d93e45368a1c54ebfbf9578116f75f5126e977e5dd518191')