RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-02-17 21:36:54 +00:00
Code Issues Projects Releases Wiki Activity

Migrate macOS build to patched Qt 6.3.2.

Browse Source 
Fixes #24915.
This commit is contained in:
John Preston 2022-12-06 16:38:07 +04:00
parent 4db2b83c9b
commit cd85c4911c
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -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()

14
Telegram/build/prepare/prepare.py
View File

@ -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 \