RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-02-26 02:20:46 +00:00
Code Issues Projects Releases Wiki Activity

Update Qt to 6.4.2 on Linux

Browse Source
This commit is contained in:
Ilya Fedin 2023-01-05 19:22:14 +04:00 committed by John Preston
parent 0af26dd353
commit 3cbbe3d3c2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
{%- set GIT = "https://github.com" -%} {%- set GIT = "https://github.com" -%}
{%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%} {%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%}
{%- set QT = "6_4_1" -%} {%- set QT = "6_4_2" -%}
{%- set QT_TAG = "v6.4.1" -%} {%- set QT_TAG = "v6.4.2" -%}
{%- set QT_PREFIX = "/usr/local/desktop-app/Qt-6.4.1" -%} {%- set QT_PREFIX = "/usr/local/desktop-app/Qt-6.4.2" -%}
{%- set OPENSSL_VER = "1_1_1" -%} {%- set OPENSSL_VER = "1_1_1" -%}
{%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%} {%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%}
{%- set CMAKE_VER = "3.24.3" -%} {%- set CMAKE_VER = "3.24.3" -%}
@ -56,7 +56,7 @@ ENV CXXFLAGS $CFLAGS
FROM builder AS patches FROM builder AS patches
RUN git clone {{ GIT }}/desktop-app/patches.git \ RUN git clone {{ GIT }}/desktop-app/patches.git \
&& cd patches \ && cd patches \
&& git checkout 9e04e2eb9c \ && git checkout 614ff3aebd \
&& rm -rf .git && rm -rf .git
FROM builder AS nasm FROM builder AS nasm

4
snap/snapcraft.yaml
View File

@ -449,9 +449,9 @@ parts:
- libxkbcommon-x11-0 - libxkbcommon-x11-0
- zlib1g - zlib1g
override-pull: | override-pull: |
QT=6_4_1 QT=6_4_2
git clone -b v6.4.1 --depth=1 git://code.qt.io/qt/qt5.git . git clone -b v6.4.2 --depth=1 git://code.qt.io/qt/qt5.git .
git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qt5compat qtshadertools git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qt5compat qtshadertools
cd qtbase cd qtbase