From fb6445249580ef45a0a528148ae277c94f97f8ce Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 25 Jul 2024 09:32:20 +0300 Subject: [PATCH] Fix build on Linux. --- Telegram/ThirdParty/tgcalls | 2 +- Telegram/build/deploy.sh | 4 ++-- Telegram/build/docker/centos_env/Dockerfile | 2 +- cmake | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls index ce5bc41b2..0d88a47c7 160000 --- a/Telegram/ThirdParty/tgcalls +++ b/Telegram/ThirdParty/tgcalls @@ -1 +1 @@ -Subproject commit ce5bc41b27144dad10756c745f6098ba14beb36b +Subproject commit 0d88a47c7f6dcebf4e48c16d253bb3db5a15e2e6 diff --git a/Telegram/build/deploy.sh b/Telegram/build/deploy.sh index 21183fa38..e3217ca40 100755 --- a/Telegram/build/deploy.sh +++ b/Telegram/build/deploy.sh @@ -70,9 +70,9 @@ else DeployMac="1" DeployWin="1" DeployWin64="1" - DeployWinArm="1" + DeployWinArm="0" DeployLinux="1" - echo "Deploying five versions of $AppVersionStrFull: for Windows 32 bit, Windows 64 bit, Windows on ARM, macOS and Linux 64 bit.." + echo "Deploying four versions of $AppVersionStrFull: for Windows 32 bit, Windows 64 bit, macOS and Linux 64 bit.." fi if [ "$BuildTarget" == "mac" ]; then BackupPath="$HOME/Projects/backup/tdesktop" diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 0f101584b..303aab478 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -59,7 +59,7 @@ RUN git init zlib \ && rm -rf zlib FROM builder AS xz -RUN git clone -b v5.4.4 --depth=1 https://github.com/tukaani-project/xz.git \ +RUN git clone -b v5.4.4 --depth=1 {{ GIT }}/tukaani-project/xz.git \ && cd xz \ && cmake -B build . -DCMAKE_BUILD_TYPE=None \ && cmake --build build -j$(nproc) \ diff --git a/cmake b/cmake index 462b85cc6..17c758e2b 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 462b85cc62fd2422084bf6a66408ac7bec3d795d +Subproject commit 17c758e2b9f09a58f14582bde3561873ce026039