From d67f25d726470a049194f3fe8175d7599808969d Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 13 Mar 2024 12:50:37 +0400 Subject: [PATCH] Update Qt to 6.7.0 on Linux --- Telegram/build/docker/centos_env/Dockerfile | 6 +++--- snap/snapcraft.yaml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index bf2ef2fbe..7a06f2ee6 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -1,7 +1,7 @@ {%- set GIT = "https://github.com" -%} {%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%} -{%- set QT = "6.6.2" -%} -{%- set QT_TAG = "v" ~ QT -%} +{%- set QT = "6.7.0" -%} +{%- set QT_TAG = "v" ~ QT ~ "-rc1" -%} {%- 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" -%} @@ -785,7 +785,7 @@ RUN git clone -b {{ QT_TAG }} --depth=1 {{ GIT }}/qt/qt5.git qt_{{ QT }} \ && rm -rf qt_{{ QT }} FROM builder AS breakpad -RUN git clone -b v2023.01.27 --depth=1 https://chromium.googlesource.com/breakpad/breakpad.git \ +RUN git clone -b v2023.06.01 --depth=1 https://chromium.googlesource.com/breakpad/breakpad.git \ && cd breakpad \ && git clone -b v2022.10.12 --depth=1 https://chromium.googlesource.com/linux-syscall-support.git src/third_party/lss \ && env -u CFLAGS -u CXXFLAGS ./configure \ diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 0996a2797..3d9e75301 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -494,9 +494,9 @@ parts: - zlib1g - mesa-vulkan-drivers override-pull: | - QT=6.6.2 + QT=6.7.0 - git clone -b v${QT} --depth=1 https://github.com/qt/qt5.git . + git clone -b v${QT}-rc1 --depth=1 https://github.com/qt/qt5.git . git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools cd qtbase