mirror of
https://github.com/telegramdesktop/tdesktop
synced 2025-02-19 06:26:55 +00:00
Update Qt 6.8.1 -> 6.8.2
This commit is contained in:
parent
5e624605cf
commit
bf48025d12
@ -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.1" -%}
|
||||
{%- set QT = "6.8.2" -%}
|
||||
{%- 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 140cd1837ed200946d6248e9f4cada52452178c1 \
|
||||
&& git fetch --depth=1 origin 61bbacab28d377d0a2771cc87e008554e2f23ffb \
|
||||
&& git reset --hard FETCH_HEAD \
|
||||
&& rm -rf .git
|
||||
|
||||
|
@ -457,7 +457,7 @@ if customRunCommand:
|
||||
stage('patches', """
|
||||
git clone https://github.com/desktop-app/patches.git
|
||||
cd patches
|
||||
git checkout 8828ed7f66
|
||||
git checkout 61bbacab28
|
||||
""")
|
||||
|
||||
stage('msys64', """
|
||||
|
@ -5,7 +5,7 @@ def resolve(arch):
|
||||
os.environ['QT'] = '6.2.9'
|
||||
elif sys.platform == 'win32':
|
||||
if arch == 'arm' or 'qt6' in sys.argv:
|
||||
os.environ['QT'] = '6.8.1'
|
||||
os.environ['QT'] = '6.8.2'
|
||||
elif os.environ.get('QT') is None:
|
||||
os.environ['QT'] = '5.15.15'
|
||||
elif os.environ.get('QT') is None:
|
||||
|
@ -166,7 +166,7 @@ parts:
|
||||
patches:
|
||||
source: https://github.com/desktop-app/patches.git
|
||||
source-depth: 1
|
||||
source-commit: cf3b896e00c288143fce51862dbd9b1c86df1960
|
||||
source-commit: 61bbacab28d377d0a2771cc87e008554e2f23ffb
|
||||
plugin: dump
|
||||
override-pull: |
|
||||
craftctl default
|
||||
@ -376,7 +376,7 @@ parts:
|
||||
- mesa-vulkan-drivers
|
||||
- xkb-data
|
||||
override-pull: |
|
||||
QT=6.8.1
|
||||
QT=6.8.2
|
||||
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user