From 277fe540dcf722eff72fe7c0fbf2693dda51d6bf Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Thu, 21 Sep 2023 12:42:54 +0400 Subject: [PATCH] Update Qt to 6.2.5 on macOS --- CMakeLists.txt | 2 +- Telegram/build/prepare/prepare.py | 16 ++++++++-------- Telegram/lib_ui | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ec62b158..9b0a772fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,7 +61,7 @@ if (NOT DESKTOP_APP_USE_PACKAGED) if (WIN32) set(qt_version 5.15.10) elseif (APPLE) - set(qt_version 6.3.2) + set(qt_version 6.2.5) endif() endif() include(cmake/external/qt/package.cmake) diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 1533a29fa..51a1b4519 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -404,7 +404,7 @@ if customRunCommand: stage('patches', """ git clone https://github.com/desktop-app/patches.git cd patches - git checkout dbaa6eb6f9 + git checkout b1907e1250 """) stage('msys64', """ @@ -1363,22 +1363,22 @@ mac: """) if buildQt6: - stage('qt_6_3_2', """ + stage('qt_6_2_5', """ mac: - git clone -b v6.3.2 https://code.qt.io/qt/qt5.git qt_6_3_2 - cd qt_6_3_2 + git clone -b v6.2.5-lts-lgpl https://code.qt.io/qt/qt5.git qt_6_2_5 + cd qt_6_2_5 perl init-repository --module-subset=qtbase,qtimageformats,qtsvg -depends:patches/qtbase_6.3.2/*.patch +depends:patches/qtbase_6.2.5/*.patch cd qtbase - - find ../../patches/qtbase_6.3.2 -type f -print0 | sort -z | xargs -0 git apply + find ../../patches/qtbase_6.2.5 -type f -print0 | sort -z | xargs -0 git apply cd .. + sed -i.bak 's/tqtc-//' {qtimageformats,qtsvg}/dependencies.yaml CONFIGURATIONS=-debug release: CONFIGURATIONS=-debug-and-release mac: - ./configure -prefix "$USED_PREFIX/Qt-6.3.2" \ + ./configure -prefix "$USED_PREFIX/Qt-6.2.5" \ $CONFIGURATIONS \ -force-debug-info \ -opensource \ diff --git a/Telegram/lib_ui b/Telegram/lib_ui index f317f20ac..a33bd4e0a 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit f317f20ac831c9564575f9ce6f0d3f8b40aa4c90 +Subproject commit a33bd4e0a590fb08f0055b6e859ce84db11eb843