qt6-static: update to 6.9.1
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
_realname=qt6
|
||||
pkgbase=mingw-w64-${_realname}-static
|
||||
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}-static")
|
||||
_qtver=6.8.2
|
||||
_qtver=6.9.1
|
||||
pkgver=${_qtver/-/}
|
||||
pkgrel=1
|
||||
pkgdesc="A cross-platform application and UI framework (mingw-w64)"
|
||||
@@ -22,6 +22,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
|
||||
"${MINGW_PACKAGE_PREFIX}-ninja"
|
||||
"${MINGW_PACKAGE_PREFIX}-clang"
|
||||
"${MINGW_PACKAGE_PREFIX}-clang-tools-extra"
|
||||
"${MINGW_PACKAGE_PREFIX}-llvm"
|
||||
"${MINGW_PACKAGE_PREFIX}-pkgconf"
|
||||
"${MINGW_PACKAGE_PREFIX}-python"
|
||||
"${MINGW_PACKAGE_PREFIX}-xmlstarlet"
|
||||
@@ -59,8 +60,9 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/sing
|
||||
012-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
|
||||
013-disable-finding-webp-from-cmake-config-files.patch
|
||||
014-imageformats-transitive-dependencies.patch
|
||||
015-qt6-windeployqt-fixes.patch)
|
||||
sha256sums=('659d8bb5931afac9ed5d89a78e868e6bd00465a58ab566e2123db02d674be559'
|
||||
015-qt6-windeployqt-fixes.patch
|
||||
016-fix-build-on-mingw64.patch::https://github.com/qt/qtquick3d-assimp/commit/28ebc845.patch)
|
||||
sha256sums=('364fde2d7fa42dd7c9b2ea6db3d462dd54f3869e9fd0ca0a0ca62f750cd8329b'
|
||||
'26f3bcc3729520a5ba648a9ce92a9293c8fb1cf16d81af612587ce10d501dcb6'
|
||||
'817ce7a15eafb945da5f03706cd7196198c9a903c0372cb7023d1e27634355a4'
|
||||
'af3f4c6491942ee6a7681eecef2d999897e38fcef7a5edcf3774589f137dac73'
|
||||
@@ -75,7 +77,8 @@ sha256sums=('659d8bb5931afac9ed5d89a78e868e6bd00465a58ab566e2123db02d674be559'
|
||||
'39d57493b0edc1317729b88dad6a07b86936072f0fbbd2aae7b01e2211ce29ed'
|
||||
'ce0023e8b72fe4b5840ca892bd5ad52120b6b484161bf2ffe0b6da9404625641'
|
||||
'1d640ce887bbaaa847b8dd30a1a655f273c9907de06ad9d91580c02215e3e8c8'
|
||||
'ba6d3384ef40e287807e2fe33e3b8ffc815ca2f3b1af5def426fe62c880a5ec9')
|
||||
'ba6d3384ef40e287807e2fe33e3b8ffc815ca2f3b1af5def426fe62c880a5ec9'
|
||||
'f30f4591637498dc2985e5de548b2d74c7ba73c794fe967899d408528f21f886')
|
||||
|
||||
# Use the right mkspecs file
|
||||
if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
|
||||
@@ -119,6 +122,11 @@ prepare() {
|
||||
014-imageformats-transitive-dependencies.patch \
|
||||
015-qt6-windeployqt-fixes.patch
|
||||
|
||||
cd qtquick3d/src/3rdparty/assimp/src
|
||||
apply_patch_with_msg \
|
||||
016-fix-build-on-mingw64.patch
|
||||
cd -
|
||||
|
||||
local _ARCH_TUNE
|
||||
if [[ ${CARCH} == x86_64 ]]; then
|
||||
_ARCH_TUNE="-march=nocona -msahf -mtune=generic"
|
||||
@@ -134,6 +142,13 @@ prepare() {
|
||||
build() {
|
||||
mkdir -p B${MSYSTEM} && cd B${MSYSTEM}
|
||||
|
||||
declare -a _extra_config
|
||||
if check_option "debug" "n"; then
|
||||
_extra_config+=("-DCMAKE_BUILD_TYPE=Release")
|
||||
else
|
||||
_extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
|
||||
fi
|
||||
|
||||
CXXFLAGS+=" -Wno-invalid-constexpr" \
|
||||
PKG_CONFIG_ARGN="--static" \
|
||||
LDFLAGS+=" -static -static-libgcc -static-libstdc++" \
|
||||
@@ -142,7 +157,7 @@ build() {
|
||||
-Wno-dev \
|
||||
--log-level=STATUS \
|
||||
-G "Ninja" \
|
||||
-DCMAKE_BUILD_TYPE="Release" \
|
||||
"${_extra_config[@]}" \
|
||||
-DCMAKE_FIND_LIBRARY_SUFFIXES_OVERRIDE=".a" \
|
||||
-DBUILD_SHARED_LIBS=OFF \
|
||||
-DQT_QMAKE_TARGET_MKSPEC=${_platform} \
|
||||
@@ -202,6 +217,7 @@ build() {
|
||||
-DPython_EXECUTABLE=${MINGW_PREFIX}/bin/python \
|
||||
-DOPENSSL_USE_STATIC_LIBS=ON \
|
||||
-DZLIB_USE_STATIC_LIBS=ON \
|
||||
-DBUILD_qtwebengine=OFF \
|
||||
../qt${pkgver}
|
||||
|
||||
export PATH=$PWD/bin:$PATH
|
||||
|
||||
Reference in New Issue
Block a user