From e31704d01e43e396240c83c2d531b496fc0fa6df Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 15 Feb 2024 07:22:58 +0400 Subject: [PATCH] Update Qt to 6.6.2 on Linux --- Telegram/build/docker/centos_env/Dockerfile | 4 ++-- snap/snapcraft.yaml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 5e96e3340..bf2ef2fbe 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.6.1" -%} +{%- set QT = "6.6.2" -%} {%- set QT_TAG = "v" ~ QT -%} {%- set QT_PREFIX = "/usr/local/desktop-app/Qt-" ~ QT -%} {%- set OPENSSL_VER = "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 7f880df36a926fa2eeb4ef473261f2ca09d3c135 \ + && git fetch --depth=1 origin 0edd8a93409ca24e215fc8ba1e98814893ad05cf \ && git reset --hard FETCH_HEAD \ && rm -rf .git diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 4b28983d8..3b2b32994 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -168,6 +168,7 @@ parts: patches: source: https://github.com/desktop-app/patches.git source-depth: 1 + source-commit: 0edd8a93409ca24e215fc8ba1e98814893ad05cf plugin: dump override-pull: | craftctl default @@ -493,7 +494,7 @@ parts: - zlib1g - mesa-vulkan-drivers override-pull: | - QT=6.6.1 + QT=6.6.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