qt6-doc: update to 6.4.0

This commit is contained in:
مهدي شينون (Mehdi Chinoune)
2022-09-30 17:37:10 +01:00
parent a60916fb86
commit 8fe121e4fc
2 changed files with 30 additions and 7 deletions

View File

@@ -0,0 +1,10 @@
--- a/cmake/FindWrapZSTD.cmake
+++ b/cmake/FindWrapZSTD.cmake
@@ -14,7 +14,6 @@
# ``WrapZSTD::WrapZSTD``
# The zstd library
-find_package(zstd CONFIG QUIET)
include(FindPackageHandleStandardArgs)

View File

@@ -3,7 +3,7 @@
_realname=qt6-doc
pkgbase=mingw-w64-${_realname}
pkgname=${MINGW_PACKAGE_PREFIX}-${_realname}
_qtver=6.3.1
_qtver=6.4.0
pkgver=${_qtver/-/}
pkgrel=1
arch=(any)
@@ -14,20 +14,30 @@ pkgdesc='Classes for displaying the contents of SVG files (mingw-w64)'
depends=("${MINGW_PACKAGE_PREFIX}-qt6-base")
makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
"${MINGW_PACKAGE_PREFIX}-ninja"
"${MINGW_PACKAGE_PREFIX}-pkgconf"
"${MINGW_PACKAGE_PREFIX}-qt6-declarative"
"${MINGW_PACKAGE_PREFIX}-qt6-tools"
"${MINGW_PACKAGE_PREFIX}-clang"
"${MINGW_PACKAGE_PREFIX}-clang-tools-extra"
"${MINGW_PACKAGE_PREFIX}-vulkan-headers"
"${MINGW_PACKAGE_PREFIX}-libmariadbclient"
$( [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-firebird2" )
"${MINGW_PACKAGE_PREFIX}-postgresql")
$([[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]] || echo "${MINGW_PACKAGE_PREFIX}-firebird2")
"${MINGW_PACKAGE_PREFIX}-postgresql"
"${MINGW_PACKAGE_PREFIX}-assimp"
"${MINGW_PACKAGE_PREFIX}-ffmpeg"
"${MINGW_PACKAGE_PREFIX}-jasper"
"${MINGW_PACKAGE_PREFIX}-libmng"
"${MINGW_PACKAGE_PREFIX}-libwebp"
"${MINGW_PACKAGE_PREFIX}-python"
"${MINGW_PACKAGE_PREFIX}-xmlstarlet")
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)
sha256sums=('51114e789485fdb6b35d112dfd7c7abb38326325ac51221b6341564a1c3cc726'
'3848318bccdfa21a139ccdb70f8226358c4a7ed3943231494aab3df83025d7c7')
001-fix-qtdocs-helpers-cmake.patch
002-do-not-find-zstd-with-cmake-config.patch)
sha256sums=('8936b0354d95fa26e87be65cc9c840495360ad93fd09b069bc780cbcab4a2ca1'
'3848318bccdfa21a139ccdb70f8226358c4a7ed3943231494aab3df83025d7c7'
'4508a70aebb573bd5b97b35e7926dcb08080aba8544e6a097f704bd8b814a279')
# Helper macros to help make tasks easier #
apply_patch_with_msg() {
@@ -43,7 +53,8 @@ prepare() {
cd qtbase
apply_patch_with_msg \
001-fix-qtdocs-helpers-cmake.patch
001-fix-qtdocs-helpers-cmake.patch \
002-do-not-find-zstd-with-cmake-config.patch
}
build() {
@@ -53,6 +64,7 @@ build() {
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
${MINGW_PREFIX}/bin/cmake \
--log-level=STATUS \
-GNinja \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
@@ -63,6 +75,7 @@ build() {
-DINSTALL_MKSPECSDIR=share/qt6/mkspecs \
-DINSTALL_DESCRIPTIONSDIR=share/qt6/modules \
-DINSTALL_DOCDIR=share/qt6/doc \
-DPython_EXECUTABLE=${MINGW_PREFIX}/bin/python \
../${_pkgfn}
${MINGW_PREFIX}/bin/cmake --build . --target docs