From 9116328f29e56cfcd1297ba11ee9d96d1c934e13 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 10 Oct 2023 23:03:39 +0400 Subject: [PATCH] Update to Qt 6.6.0 release 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 49001895e..5f262ed66 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.0" -%} -{%- set QT_TAG = "v" ~ QT ~ "-rc1" -%} +{%- set QT_TAG = "v" ~ QT -%} {%- 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" -%} @@ -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 413a12468bfdd02b9f1372c5c139753b0c5a432e \ + && git fetch --depth=1 origin c80c0d530200e3f27a9a39b4f230919529e73bd2 \ && git reset --hard FETCH_HEAD \ && rm -rf .git diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index d850c04dd..feae5eb22 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -465,7 +465,7 @@ parts: override-pull: | QT=6.6.0 - git clone -b v${QT}-rc1 --depth=1 https://code.qt.io/qt/qt5.git . + 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 cd qtbase