From 2a3c260dd6ff3fbeae3fb78817b6db096648243e Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 29 Jan 2026 16:46:18 +0400 Subject: [PATCH] Qt 6.10.1 -> 6.10.2 --- Telegram/build/docker/centos_env/Dockerfile | 4 ++-- Telegram/build/prepare/prepare.py | 2 +- Telegram/build/qt_version.py | 2 +- snap/snapcraft.yaml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 212c85ba4f..e5ce8f7fe8 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -93,7 +93,7 @@ FROM builder AS patches RUN git init patches \ && cd patches \ && git remote add origin https://github.com/desktop-app/patches.git \ - && git fetch --depth=1 origin 6eee01a2c24ed9a2bd4510a5087b489ab842d00e \ + && git fetch --depth=1 origin b8c3a8ffc1514861837b9213383133c63023e0de \ && git reset --hard FETCH_HEAD \ && rm -rf .git @@ -734,7 +734,7 @@ COPY --link --from=xcb-cursor /usr/src/xcb-cursor-cache / COPY --link --from=openssl /usr/src/openssl-cache / COPY --link --from=xkbcommon /usr/src/xkbcommon-cache / -ENV QT=6.10.1 +ENV QT=6.10.2 RUN git clone -b v$QT --depth=1 https://github.com/qt/qt5.git \ && cd qt5 \ && git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools \ diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index b3ecd5dd64..e1deff4997 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -452,7 +452,7 @@ if customRunCommand: stage('patches', """ git clone https://github.com/desktop-app/patches.git cd patches - git checkout 6eee01a2c24ed9a2bd4510a5087b489ab842d00e + git checkout b8c3a8ffc1514861837b9213383133c63023e0de """) stage('msys64', """ diff --git a/Telegram/build/qt_version.py b/Telegram/build/qt_version.py index 8d0293907c..f3678ed185 100644 --- a/Telegram/build/qt_version.py +++ b/Telegram/build/qt_version.py @@ -6,7 +6,7 @@ def resolve(arch): elif sys.platform == 'win32': if arch == 'arm' or 'qt6' in sys.argv: print('Choosing Qt 6.') - os.environ['QT'] = '6.10.1' + os.environ['QT'] = '6.10.2' else: print('Choosing Qt 5.') os.environ['QT'] = '5.15.18' diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 91ed22fc53..ff548488cd 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -122,7 +122,7 @@ parts: patches: source: https://github.com/desktop-app/patches.git source-depth: 1 - source-commit: 859556cab51d17585ff76d3db62ff1c7502bc850 + source-commit: b8c3a8ffc1514861837b9213383133c63023e0de plugin: nil override-pull: | craftctl default @@ -403,7 +403,7 @@ parts: qt: source: https://github.com/qt/qt5.git source-depth: 1 - source-tag: v6.10.1 + source-tag: v6.10.2 source-submodules: - qtbase - qtdeclarative