diff --git a/.gitmodules b/.gitmodules index 20bf11a83..26294499d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -97,3 +97,6 @@ [submodule "Telegram/ThirdParty/kwayland"] path = Telegram/ThirdParty/kwayland url = https://github.com/KDE/kwayland.git +[submodule "Telegram/ThirdParty/dispatch"] + path = Telegram/ThirdParty/dispatch + url = https://github.com/apple/swift-corelibs-libdispatch diff --git a/Telegram/ThirdParty/dispatch b/Telegram/ThirdParty/dispatch new file mode 160000 index 000000000..851fbd3cb --- /dev/null +++ b/Telegram/ThirdParty/dispatch @@ -0,0 +1 @@ +Subproject commit 851fbd3cb89385ba733bc37d6149280996715898 diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index f28cd1313..7bbc6164b 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -32,6 +32,9 @@ RUN yum -y install git meson ninja-build autoconf automake libtool patch \ devtoolset-10-binutils llvm-toolset-7.0 llvm-toolset-7.0-clang-devel \ llvm-toolset-7.0-llvm-devel && yum clean all +# Fix a bug with argument naming in CentOS 7 glibc +RUN sed -i 's/char \*__block/char */' /usr/include/unistd.h + SHELL [ "bash", "-c", ". /opt/rh/devtoolset-10/enable; exec bash -c \"$@\"", "-s"] ENV LibrariesPath /usr/src/Libraries diff --git a/Telegram/lib_crl b/Telegram/lib_crl index ec103d6bc..3fde21b40 160000 --- a/Telegram/lib_crl +++ b/Telegram/lib_crl @@ -1 +1 @@ -Subproject commit ec103d6bccaa59b56537c8658c9e41415bb9ccaf +Subproject commit 3fde21b40897faf84764597fe1b335ff4c2962ac