From 51ff484913feb3a9a9fc95d0a66c9b244ebb26fe Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Sat, 23 Sep 2023 13:02:15 +0400 Subject: [PATCH] Update Qt to 6.6.0-beta4 on Linux --- Telegram/build/docker/centos_env/Dockerfile | 6 +++--- Telegram/lib_base | 2 +- Telegram/lib_webview | 2 +- snap/snapcraft.yaml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 5f38813d6..ed28bb53b 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.5.2" -%} -{%- set QT_TAG = "v" ~ QT -%} +{%- set QT = "6.6.0" -%} +{%- set QT_TAG = "v" ~ QT ~ "-beta4" -%} {%- 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 2c464cfbd9fa3c1d88335cf9462c8ef96542f87c \ + && git fetch --depth=1 origin 6442ae042bb6d43391747f7413c7a88a6a37c7ef \ && git reset --hard FETCH_HEAD \ && rm -rf .git diff --git a/Telegram/lib_base b/Telegram/lib_base index 5916b1db7..ce8f9214a 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit 5916b1db7ccae3ba0fafa8309d50c2c09a19604b +Subproject commit ce8f9214addfe14ac1c05437a20850836e23d45b diff --git a/Telegram/lib_webview b/Telegram/lib_webview index cea8958ca..90dc3f593 160000 --- a/Telegram/lib_webview +++ b/Telegram/lib_webview @@ -1 +1 @@ -Subproject commit cea8958ca2007192dbd6ce14967f74484d1fcc6f +Subproject commit 90dc3f593210804cebc23f5d48c9a8d80f387a7b diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 6e8b13906..c0bb00f7b 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -460,9 +460,9 @@ parts: - libxkbcommon-x11-0 - zlib1g override-pull: | - QT=6.5.2 + QT=6.6.0 - git clone -b v${QT} --depth=1 https://code.qt.io/qt/qt5.git . + git clone -b v${QT}-beta4 --depth=1 https://code.qt.io/qt/qt5.git . git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools cd qtbase