From f6ff0f3b2cc6eac728585245ddd48915b6f53877 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 28 Jan 2022 23:52:11 +0300 Subject: [PATCH] Fix build for macOS 10.12+. --- Telegram/build/build.sh | 2 +- Telegram/build/prepare/prepare.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Telegram/build/build.sh b/Telegram/build/build.sh index b982a3f5e6..99e9cbc4f0 100755 --- a/Telegram/build/build.sh +++ b/Telegram/build/build.sh @@ -249,7 +249,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "macstore" ]; then rm -rf "$ReleasePath/$BinaryName.app/Contents/_CodeSignature" rm -rf "$ReleasePath/Updater" - ./configure.sh + ./configure.sh -D DESKTOP_APP_MAC_ARCH="arm64;x86_64" cd $ProjectPath cmake --build . --config Release --target Telegram diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 6ebf1d53de..1d643c67b5 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -400,7 +400,7 @@ if customRunCommand: stage('patches', """ git clone https://github.com/desktop-app/patches.git cd patches - git checkout 4142f82d11 + git checkout 47d447b531 """) stage('depot_tools', """ @@ -622,10 +622,10 @@ mac: stage('libvpx', """ git clone https://github.com/webmproject/libvpx.git +depends:patches/libvpx/*.patch cd libvpx git checkout v1.11.0 win: -depends:patches/libvpx/*.patch for /r %%i in (..\\patches\\libvpx\\*) do git apply %%i SET PATH_BACKUP_=%PATH% @@ -645,6 +645,8 @@ depends:patches/build_libvpx_win.sh SET PATH=%PATH_BACKUP_% mac: + find ../patches/libvpx -type f -print0 | sort -z | xargs -0 git apply + depends:yasm/yasm ./configure --prefix=$USED_PREFIX \ --target=arm64-darwin20-gcc \