RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update to Qt 6.6.0 release on Linux

This commit is contained in:
Ilya Fedin 2023-10-10 23:03:39 +04:00 committed by John Preston
parent aa7575dec4
commit 9116328f29
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/build/docker/centos_env/Dockerfile
View File

@ -1,7 +1,7 @@
{%- set GIT = "https://github.com" -%}
{%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
{%- set QT = "6.6.0" -%}
{%- set QT_TAG = "v" ~ QT ~ "-rc1" -%}
{%- set QT_TAG = "v" ~ QT -%}
{%- set QT_PREFIX = "/usr/local/desktop-app/Qt-" ~ QT -%}
{%- set OPENSSL_VER = "1_1_1" -%}
{%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%}
@ -54,7 +54,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 413a12468bfdd02b9f1372c5c139753b0c5a432e \
&& git fetch --depth=1 origin c80c0d530200e3f27a9a39b4f230919529e73bd2 \
&& git reset --hard FETCH_HEAD \
&& rm -rf .git

2
snap/snapcraft.yaml
View File

@ -465,7 +465,7 @@ parts:
override-pull: |
QT=6.6.0
git clone -b v${QT}-rc1 --depth=1 https://code.qt.io/qt/qt5.git .
git clone -b v${QT} --depth=1 https://code.qt.io/qt/qt5.git .
git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools
cd qtbase