From 59bb46aa406a0e446aec4984025045e86881b2f7 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 19 Jul 2023 22:58:22 +0400 Subject: [PATCH] Update Qt to 6.5.2 on Linux --- Telegram/build/docker/centos_env/Dockerfile | 4 ++-- snap/snapcraft.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index a7de4ed0d..88fe34eb2 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -1,6 +1,6 @@ {%- set GIT = "https://github.com" -%} {%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%} -{%- set QT = "6.5.1" -%} +{%- set QT = "6.5.2" -%} {%- set QT_TAG = "v" ~ QT -%} {%- set QT_PREFIX = "/usr/local/desktop-app/Qt-" ~ QT -%} {%- set OPENSSL_VER = "1_1_1" -%} @@ -59,7 +59,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 963f5b0c2a57f7e90239e64c9e14ed5f043e637e \ + && git fetch --depth=1 origin 523b061671d4dd2f29979c982a2d03c2cc8eaf4f \ && git reset --hard FETCH_HEAD \ && rm -rf .git diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 693773d0b..f6ccbea64 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -461,7 +461,7 @@ parts: - libxkbcommon-x11-0 - zlib1g override-pull: | - QT=6.5.1 + QT=6.5.2 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