[arch-commits] Commit in telegram-desktop/trunk (2 files)

[Jiachen Yang]

    Date: Monday, August 24, 2020 @ 16:04:11
  Author: farseerfc
Revision: 687619

upgpkg: telegram-desktop 2.3.2-1: telegram-desktop 2.3.2 revert to libwebrtc for now

Added:
  telegram-desktop/trunk/Use-tg_owt-webrtc-fork.patch
Modified:
  telegram-desktop/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   14 ++++-----
 Use-tg_owt-webrtc-fork.patch |   61 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-08-24 15:46:41 UTC (rev 687618)
+++ PKGBUILD	2020-08-24 16:04:11 UTC (rev 687619)
@@ -1,8 +1,8 @@
 # Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
 # Contributor: hexchain <i at hexchain.org>
 pkgname=telegram-desktop
-pkgver=2.3.0
-pkgrel=2
+pkgver=2.3.2
+pkgrel=1
 pkgdesc='Official Telegram Desktop client'
 arch=('x86_64')
 url="https://desktop.telegram.org/"
@@ -12,13 +12,14 @@
 makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl' 'libwebrtc')
 optdepends=('ttf-opensans: default Open Sans font family')
 source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz"
-"set_webrtc_location.patch::https://github.com/desktop-app/cmake_helpers/commit/7dc5da757124cb2d644e289a37d8957823a7f6c9.patch")
-sha512sums=('65fa7641ed9ba2fcd4181e3f6bbc036dcf2ddcb12eb10a15a601e0fce79c0f99741b55741bb3c18b9de5d3cdb07190761ea0f8fbe111563f784e0ad3faea2ede'
-            '5405ec01bd19350141588aad40eec63e47cd601d4945ed28ba2aaf077b398f4b746c3299e047bf0fb534f073ac1b9d4a515c5cc3eca9cdc754ccf87d2ce7176e')
+"Use-tg_owt-webrtc-fork.patch"
+)
+sha512sums=('757e57389ce24656c1d6676d6f0808e3d444785394e916b9f5fb47511662f01b6742c88c2a27274c4d9bb58263ae281218579c78cce7db119e2c863c1eaacc90'
+            '071591c6bb71435f8186dcaf570703718051f00366dbbe3f13c4df3706d3de1f168bff4bfa707ad1d6f09f5505c925f0b01d76fd65efe904f3ba7db693d63f43')
 
 prepare() {
     cd tdesktop-$pkgver-full/cmake
-    patch -Np1 -i ../../set_webrtc_location.patch
+    patch -R -Np1 -i ${srcdir}/Use-tg_owt-webrtc-fork.patch
     sed 's|set(webrtc_build_loc ${webrtc_loc}/out/$<CONFIG>/obj)|set(webrtc_build_loc /usr/lib)|' -i external/webrtc/CMakeLists.txt
 }
 
@@ -37,7 +38,6 @@
         -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c \
         -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON \
         -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \
-        -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \
         -DDESKTOP_APP_SPECIAL_TARGET="" \
         -DDESKTOP_APP_WEBRTC_LOCATION=/usr/include/libwebrtc
     ninja -C build

Added: Use-tg_owt-webrtc-fork.patch
===================================================================
--- Use-tg_owt-webrtc-fork.patch	                        (rev 0)
+++ Use-tg_owt-webrtc-fork.patch	2020-08-24 16:04:11 UTC (rev 687619)
@@ -0,0 +1,61 @@
+From 4c8956027de8e8e8b984c5daa643aacb14a89123 Mon Sep 17 00:00:00 2001
+From: John Preston <johnprestonmail at gmail.com>
+Date: Thu, 20 Aug 2020 16:06:55 +0400
+Subject: [PATCH] Use tg_owt webrtc fork.
+
+---
+ external/webrtc/CMakeLists.txt | 8 ++++----
+ init_target.cmake              | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/external/webrtc/CMakeLists.txt b/external/webrtc/CMakeLists.txt
+index 2a09508..1273291 100644
+--- a/external/webrtc/CMakeLists.txt
++++ b/external/webrtc/CMakeLists.txt
+@@ -10,10 +10,10 @@ add_library(desktop-app::external_webrtc ALIAS external_webrtc)
+ if (DESKTOP_APP_WEBRTC_LOCATION)
+     set(webrtc_loc ${DESKTOP_APP_WEBRTC_LOCATION})
+ else()
+-    set(webrtc_loc ${libs_loc}/webrtc/src)
++    set(webrtc_loc ${libs_loc}/tg_owt/src)
+ endif()
+ 
+-set(webrtc_build_loc ${webrtc_loc}/out/$<CONFIG>/obj)
++set(webrtc_build_loc ${libs_loc}/tg_owt/out/$<CONFIG>)
+ 
+ target_compile_definitions(external_webrtc
+ INTERFACE
+@@ -64,7 +64,7 @@ INTERFACE
+ )
+ 
+ set(webrtc_libs
+-    ${webrtc_lib_prefix}webrtc
++    ${webrtc_lib_prefix}tg_owt
+ )
+ if (APPLE)
+     target_include_directories(external_webrtc
+@@ -87,7 +87,7 @@ if (WIN32)
+         wmcodecdspuuid.lib
+         amstrmid.lib
+         msdmo.lib
+-  )
++    )
+ elseif (APPLE)
+     target_link_libraries(external_webrtc
+     INTERFACE
+diff --git a/init_target.cmake b/init_target.cmake
+index 936a364..3a4806b 100644
+--- a/init_target.cmake
++++ b/init_target.cmake
+@@ -17,7 +17,7 @@ endfunction()
+ 
+ function(init_target target_name) # init_target(my_target folder_name)
+     if (ARGC GREATER 1)
+-        if (${ARGV1} STREQUAL cxx_std_14 OR ${ARGV1} STREQUAL cxx_std_11)
++        if (${ARGV1} STREQUAL cxx_std_14 OR ${ARGV1} STREQUAL cxx_std_11 OR ${ARGV1} STREQUAL cxx_std_17)
+             target_compile_features(${target_name} PUBLIC ${ARGV1})
+         else()
+             target_compile_features(${target_name} PUBLIC ${MAXIMUM_CXX_STANDARD})
+-- 
+2.28.0
+