Update Qt 6.8.2 -> 6.9.0

This commit is contained in:
Ilya Fedin 2025-03-26 15:44:25 +00:00 committed by John Preston
parent 0aa1031270
commit 8b92ab25c7
5 changed files with 7 additions and 7 deletions

View file

@ -2,7 +2,7 @@
{%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
{%- set GIT_UPDATE_M4 = "git submodule set-url m4 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 && git config -f .gitmodules submodule.m4.shallow true && git submodule init && git submodule update" -%}
{%- set TOOLSET = "gcc-toolset-12" -%}
{%- set QT = "6.8.2" -%}
{%- set QT = "6.9.0" -%}
{%- set QT_TAG = "v" ~ QT -%}
{%- set CFLAGS_DEBUG = "$CFLAGS -O0 -fno-lto -U_FORTIFY_SOURCE" -%}
{%- set LibrariesPath = "/usr/src/Libraries" -%}
@ -44,7 +44,7 @@ FROM builder AS patches
RUN git init patches \
&& cd patches \
&& git remote add origin {{ GIT }}/desktop-app/patches.git \
&& git fetch --depth=1 origin fb35ec726cf0a99eead201ddf80e1e717b9fa7c2 \
&& git fetch --depth=1 origin 7119a74e3f9b782f3cc29bf52fc78f2e8b0ca352 \
&& git reset --hard FETCH_HEAD \
&& rm -rf .git

View file

@ -457,7 +457,7 @@ if customRunCommand:
stage('patches', """
git clone https://github.com/desktop-app/patches.git
cd patches
git checkout 7cb9049583
git checkout 7119a74e3f
""")
stage('msys64', """

View file

@ -5,7 +5,7 @@ def resolve(arch):
os.environ['QT'] = '6.2.12'
elif sys.platform == 'win32':
if arch == 'arm' or 'qt6' in sys.argv:
os.environ['QT'] = '6.8.2'
os.environ['QT'] = '6.9.0'
elif os.environ.get('QT') is None:
os.environ['QT'] = '5.15.15'
elif os.environ.get('QT') is None:

@ -1 +1 @@
Subproject commit b28088164b7a46c70ae2cfd9daf865f6425610b2
Subproject commit 720eaf44a529da50f5277fd6874318d9a08b735a

View file

@ -171,7 +171,7 @@ parts:
patches:
source: https://github.com/desktop-app/patches.git
source-depth: 1
source-commit: fb35ec726cf0a99eead201ddf80e1e717b9fa7c2
source-commit: 7119a74e3f9b782f3cc29bf52fc78f2e8b0ca352
plugin: dump
override-pull: |
craftctl default
@ -382,7 +382,7 @@ parts:
- mesa-vulkan-drivers
- xkb-data
override-pull: |
QT=6.8.2
QT=6.9.0
git clone -b v${QT} --depth=1 https://github.com/qt/qt5.git .
git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools