diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls index f0fa9b3914..6549849146 160000 --- a/Telegram/ThirdParty/tgcalls +++ b/Telegram/ThirdParty/tgcalls @@ -1 +1 @@ -Subproject commit f0fa9b391454622855f5df1332b45a2eec605157 +Subproject commit 65498491465fa64ffdf96a2b7cdeb67bfb697d5b diff --git a/Telegram/build/docker/build.sh b/Telegram/build/docker/build.sh index c9415e2f8f..76b0f506a2 100755 --- a/Telegram/build/docker/build.sh +++ b/Telegram/build/docker/build.sh @@ -16,7 +16,7 @@ if [ ! -d "$FullScriptPath/../../../../DesktopPrivate" ]; then fi Run () { - scl enable devtoolset-8 -- "$@" + scl enable devtoolset-9 -- "$@" } HomePath="$FullScriptPath/../.." diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index b9e43e0ec6..49ca6cf62f 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -19,10 +19,10 @@ RUN yum -y install git cmake3 meson ninja-build autoconf automake libtool \ freetype-devel libX11-devel at-spi2-core-devel alsa-lib-devel \ pulseaudio-libs-devel mesa-libGL-devel mesa-libEGL-devel \ webkitgtk4-devel pkgconfig bison yasm file which xorg-x11-util-macros \ - devtoolset-8-make devtoolset-8-gcc devtoolset-8-gcc-c++ \ - devtoolset-8-binutils + devtoolset-9-make devtoolset-9-gcc devtoolset-9-gcc-c++ \ + devtoolset-9-binutils -SHELL [ "scl", "enable", "devtoolset-8", "--", "bash", "-c" ] +SHELL [ "scl", "enable", "devtoolset-9", "--", "bash", "-c" ] RUN ln -s cmake3 /usr/bin/cmake ENV LibrariesPath /usr/src/Libraries @@ -597,7 +597,7 @@ RUN git checkout bc8fb886 RUN git clone https://chromium.googlesource.com/linux-syscall-support.git src/third_party/lss WORKDIR src/third_party/lss -RUN git checkout a91633d1 +RUN git checkout 8048ece WORKDIR ${LibrariesPath} ENV BreakpadCache ${LibrariesPath}/breakpad-cache diff --git a/Telegram/build/docker/centos_env/build.sh b/Telegram/build/docker/centos_env/build.sh index 9bac991f4a..c965b47d28 100755 --- a/Telegram/build/docker/centos_env/build.sh +++ b/Telegram/build/docker/centos_env/build.sh @@ -1,10 +1,10 @@ #!/bin/bash cd Telegram -scl enable devtoolset-8 -- ./configure.sh "$@" +scl enable devtoolset-9 -- ./configure.sh "$@" if [ -n "$DEBUG" ]; then - scl enable devtoolset-8 -- cmake3 --build ../out/Debug -j$(nproc) + scl enable devtoolset-9 -- cmake3 --build ../out/Debug -j$(nproc) else - scl enable devtoolset-8 -- cmake3 --build ../out/Release -j$(nproc) + scl enable devtoolset-9 -- cmake3 --build ../out/Release -j$(nproc) fi diff --git a/Telegram/build/docker/centos_env/run.sh b/Telegram/build/docker/centos_env/run.sh index 6a085b3ea9..22d050bb93 100755 --- a/Telegram/build/docker/centos_env/run.sh +++ b/Telegram/build/docker/centos_env/run.sh @@ -15,7 +15,7 @@ fi Command="$1" if [ "$Command" == "" ]; then - Command="scl enable devtoolset-8 -- bash" + Command="scl enable devtoolset-9 -- bash" fi docker run -it --rm --cpus=8 --memory=22g -v $HOME/Telegram/DesktopPrivate:/usr/src/DesktopPrivate -v $HOME/Telegram/tdesktop:/usr/src/tdesktop tdesktop:centos_env $Command