Qt 6.8.0-rc1 -> 6.8.0

This commit is contained in:
Ilya Fedin 2024-10-08 17:53:50 +04:00 committed by John Preston
parent 51f1999412
commit c70482dbc4
3 changed files with 3 additions and 3 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 QT = "6.8.0" -%}
{%- set QT_TAG = "v" ~ QT ~ "-rc1" -%}
{%- set QT_TAG = "v" ~ QT -%}
{%- set CFLAGS_DEBUG = "$CFLAGS -O0 -fno-lto -U_FORTIFY_SOURCE" -%}
{%- set LibrariesPath = "/usr/src/Libraries" -%}

View file

@ -1629,7 +1629,7 @@ mac:
make install
""")
else: # qt > '6'
branch = 'v$QT' + ('-lts-lgpl' if qt < '6.3' else '-rc1')
branch = 'v$QT' + ('-lts-lgpl' if qt < '6.3' else '')
stage('qt_' + qt, """
git clone -b """ + branch + """ https://github.com/qt/qt5.git qt_$QT
cd qt_$QT

View file

@ -381,7 +381,7 @@ parts:
override-pull: |
QT=6.8.0
git clone -b v${QT}-rc1 --depth=1 https://github.com/qt/qt5.git .
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
cd qtbase