From 3888e8084acc87e54bdd1af353d539d3fc3f7bf7 Mon Sep 17 00:00:00 2001 From: John Preston <johnprestonmail@gmail.com> Date: Fri, 26 Jul 2024 11:38:09 +0200 Subject: [PATCH] Update tg_owt, lib_webrtc and patches. --- Telegram/build/docker/centos_env/Dockerfile | 4 ++-- Telegram/build/prepare/prepare.py | 4 ++-- Telegram/lib_webrtc | 2 +- snap/snapcraft.yaml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 303aab478..99816a198 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -42,7 +42,7 @@ FROM builder AS patches RUN git init patches \ && cd patches \ && git remote add origin {{ GIT }}/desktop-app/patches.git \ - && git fetch --depth=1 origin 6898f0d215f249917c076f00d3fc954a43f35e6a \ + && git fetch --depth=1 origin 85a1c4ec327ed390a27e85f2162c31525220a50d \ && git reset --hard FETCH_HEAD \ && rm -rf .git @@ -771,7 +771,7 @@ COPY --link --from=pipewire {{ LibrariesPath }}/pipewire-cache / RUN git init tg_owt \ && cd tg_owt \ && git remote add origin {{ GIT }}/desktop-app/tg_owt.git \ - && git fetch --depth=1 origin 996dbe2c83b5a71d9045ce47960b8432e223dbb3 \ + && git fetch --depth=1 origin c0ba7b391c0fd1d408fc0d58f4fbecb68a6fcd55 \ && git reset --hard FETCH_HEAD \ && git submodule update --init --recursive --depth=1 \ && rm -rf .git \ diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index f5a64b413..b7c447019 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -457,7 +457,7 @@ if customRunCommand: stage('patches', """ git clone https://github.com/desktop-app/patches.git cd patches - git checkout 6898f0d215 + git checkout 85a1c4ec32 """) stage('msys64', """ @@ -1718,7 +1718,7 @@ win: stage('tg_owt', """ git clone https://github.com/desktop-app/tg_owt.git cd tg_owt - git checkout 996dbe2c83 + git checkout c0ba7b391c git submodule init git submodule update win: diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc index 70b83ba71..d9a08df0c 160000 --- a/Telegram/lib_webrtc +++ b/Telegram/lib_webrtc @@ -1 +1 @@ -Subproject commit 70b83ba71537016a04ff15d44dc078a22c18eced +Subproject commit d9a08df0c0b64e4323e23c9ccefe754fd86d0f44 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 0a3d3f855..12fa23acb 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -165,7 +165,7 @@ parts: patches: source: https://github.com/desktop-app/patches.git source-depth: 1 - source-commit: 6898f0d215f249917c076f00d3fc954a43f35e6a + source-commit: 85a1c4ec327ed390a27e85f2162c31525220a50d plugin: dump override-pull: | craftctl default @@ -433,7 +433,7 @@ parts: webrtc: source: https://github.com/desktop-app/tg_owt.git source-depth: 1 - source-commit: 996dbe2c83b5a71d9045ce47960b8432e223dbb3 + source-commit: c0ba7b391c0fd1d408fc0d58f4fbecb68a6fcd55 plugin: cmake build-environment: - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s