diff --git a/mingw-w64-qt6-doc/002-do-not-find-zstd-with-cmake-config.patch b/mingw-w64-qt6-doc/002-do-not-find-zstd-with-cmake-config.patch deleted file mode 100644 index 4f1d1a877f..0000000000 --- a/mingw-w64-qt6-doc/002-do-not-find-zstd-with-cmake-config.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/cmake/FindWrapZSTD.cmake -+++ b/cmake/FindWrapZSTD.cmake -@@ -14,7 +14,6 @@ - # ``WrapZSTD::WrapZSTD`` - # The zstd library - --find_package(zstd CONFIG QUIET) - - include(FindPackageHandleStandardArgs) - diff --git a/mingw-w64-qt6-doc/PKGBUILD b/mingw-w64-qt6-doc/PKGBUILD index 863274a60c..ada2216fce 100644 --- a/mingw-w64-qt6-doc/PKGBUILD +++ b/mingw-w64-qt6-doc/PKGBUILD @@ -3,15 +3,14 @@ _realname=qt6-doc pkgbase=mingw-w64-${_realname} pkgname=${MINGW_PACKAGE_PREFIX}-${_realname} -_qtver=6.5.2 +_qtver=6.6.0 pkgver=${_qtver/-/} pkgrel=1 arch=(any) mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url='https://www.qt.io' -license=(GPL3 LGPL3 FDL custom) +license=(spdx:GFDL-1.3-no-invariants-only) pkgdesc='A cross-platform application and UI framework (Documentation) (mingw-w64)' -depends=("${MINGW_PACKAGE_PREFIX}-qt6-base") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-pkgconf" @@ -33,10 +32,10 @@ groups=(${MINGW_PACKAGE_PREFIX}-qt6) _pkgfn="qt-everywhere-src-${_qtver}" source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/$_qtver/single/$_pkgfn.tar.xz" 001-fix-qtdocs-helpers-cmake.patch - 002-do-not-find-zstd-with-cmake-config.patch) -sha256sums=('cde57be663d0f875759797298bdc37a936d517c39f2013e4e6ece5e12edeed12' + 002-zstd-target.patch::https://invent.kde.org/qt/qt/qttools/-/commit/96306747.patch) +sha256sums=('652538fcb5d175d8f8176c84c847b79177c87847b7273dccaec1897d80b50002' '3848318bccdfa21a139ccdb70f8226358c4a7ed3943231494aab3df83025d7c7' - '4508a70aebb573bd5b97b35e7926dcb08080aba8544e6a097f704bd8b814a279') + 'aeee472ecdf7ab9b1b26df91116db8e01d2cc243c8e031ae055b5dca97267e37') # Helper macros to help make tasks easier # apply_patch_with_msg() { @@ -52,8 +51,11 @@ prepare() { cd qtbase apply_patch_with_msg \ - 001-fix-qtdocs-helpers-cmake.patch \ - 002-do-not-find-zstd-with-cmake-config.patch + 001-fix-qtdocs-helpers-cmake.patch + + cd ../qttools + apply_patch_with_msg \ + 002-zstd-target.patch } build() {