diff options
| author | John Preston <johnprestonmail@gmail.com> | 2022-12-06 16:38:07 +0400 |
|---|---|---|
| committer | John Preston <johnprestonmail@gmail.com> | 2022-12-06 16:38:08 +0400 |
| commit | cd85c4911c7ad39754b7c343ae60a0369ee03dc6 (patch) | |
| tree | 1e05a27f015d9abd301f71db22321202d6ea2a9b | |
| parent | 4db2b83c9b999123077f4b0633054d8eff519923 (diff) | |
Migrate macOS build to patched Qt 6.3.2.
Fixes #24915.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Telegram/build/prepare/prepare.py | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c0f325b43..728a1013b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ if (NOT DESKTOP_APP_USE_PACKAGED) if (WIN32) set(qt_version 5.15.4) elseif (APPLE) - set(qt_version 6.3.1) + set(qt_version 6.3.2) else() set(qt_version 6.4.1) endif() diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index b97095f1da..84073cc300 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -397,7 +397,7 @@ if customRunCommand: stage('patches', """ git clone https://github.com/desktop-app/patches.git cd patches - git checkout b14854c6f6 + git checkout 2af5b01c6b """) stage('msys64', """ @@ -1147,22 +1147,22 @@ mac: """) if buildQt6: - stage('qt_6_3_1', """ + stage('qt_6_3_2', """ mac: - git clone -b v6.3.1 https://code.qt.io/qt/qt5.git qt_6_3_1 - cd qt_6_3_1 + git clone -b v6.3.2 https://code.qt.io/qt/qt5.git qt_6_3_2 + cd qt_6_3_2 perl init-repository --module-subset=qtbase,qtimageformats,qtsvg,qt5compat -depends:patches/qtbase_6_3_1/*.patch +depends:patches/qtbase_6_3_2/*.patch cd qtbase - find ../../patches/qtbase_6_3_1 -type f -print0 | sort -z | xargs -0 git apply + find ../../patches/qtbase_6_3_2 -type f -print0 | sort -z | xargs -0 git apply cd .. CONFIGURATIONS=-debug release: CONFIGURATIONS=-debug-and-release mac: - ./configure -prefix "$USED_PREFIX/Qt-6.3.1" \ + ./configure -prefix "$USED_PREFIX/Qt-6.3.2" \ $CONFIGURATIONS \ -force-debug-info \ -opensource \ |