From 3cbbe3d3c2e81ccaceb9c9c19bf3c8f89a01008e Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 5 Jan 2023 19:22:14 +0400 Subject: [PATCH] Update Qt to 6.4.2 on Linux --- Telegram/build/docker/centos_env/Dockerfile | 8 ++++---- snap/snapcraft.yaml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 5007fb580e..138e8f56d1 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -1,8 +1,8 @@ {%- set GIT = "https://github.com" -%} {%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%} -{%- set QT = "6_4_1" -%} -{%- set QT_TAG = "v6.4.1" -%} -{%- set QT_PREFIX = "/usr/local/desktop-app/Qt-6.4.1" -%} +{%- set QT = "6_4_2" -%} +{%- set QT_TAG = "v6.4.2" -%} +{%- set QT_PREFIX = "/usr/local/desktop-app/Qt-6.4.2" -%} {%- set OPENSSL_VER = "1_1_1" -%} {%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%} {%- set CMAKE_VER = "3.24.3" -%} @@ -56,7 +56,7 @@ ENV CXXFLAGS $CFLAGS FROM builder AS patches RUN git clone {{ GIT }}/desktop-app/patches.git \ && cd patches \ - && git checkout 9e04e2eb9c \ + && git checkout 614ff3aebd \ && rm -rf .git FROM builder AS nasm diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 2581cdb2ac..d92d9516fb 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -449,9 +449,9 @@ parts: - libxkbcommon-x11-0 - zlib1g 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 cd qtbase