Update to version 2.3.2

3 files changed, 73 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3bf20d3b9d4..8b96bd6c736d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = telegram-desktop-udf-patched
 	pkgdesc = Telegram Desktop client with several personal patches
-	pkgver = 2.3.0
-	pkgrel = 2
+	pkgver = 2.3.2
+	pkgrel = 1
 	url = https://desktop.telegram.org/
 	arch = x86_64
 	license = GPL3
@@ -27,15 +27,15 @@ pkgbase = telegram-desktop-udf-patched
 	optdepends = ttf-opensans: default Open Sans font family
 	provides = telegram-desktop
 	conflicts = telegram-desktop
-	source = https://github.com/telegramdesktop/tdesktop/releases/download/v2.3.0/tdesktop-2.3.0-full.tar.gz
-	source = set_webrtc_location.patch::https://github.com/desktop-app/cmake_helpers/commit/7dc5da757124cb2d644e289a37d8957823a7f6c9.patch
+	source = https://github.com/telegramdesktop/tdesktop/releases/download/v2.3.2/tdesktop-2.3.2-full.tar.gz
+	source = Use-tg_owt-webrtc-fork.patch
 	source = always_delete_for_everyone.patch
 	source = always_clear_history_for_everyone.patch
 	source = always_pin_without_notify.patch
 	source = always_send_as_photo_or_album.patch
 	source = force_gtk_integration.patch
-	sha512sums = 65fa7641ed9ba2fcd4181e3f6bbc036dcf2ddcb12eb10a15a601e0fce79c0f99741b55741bb3c18b9de5d3cdb07190761ea0f8fbe111563f784e0ad3faea2ede
-	sha512sums = 5405ec01bd19350141588aad40eec63e47cd601d4945ed28ba2aaf077b398f4b746c3299e047bf0fb534f073ac1b9d4a515c5cc3eca9cdc754ccf87d2ce7176e
+	sha512sums = 757e57389ce24656c1d6676d6f0808e3d444785394e916b9f5fb47511662f01b6742c88c2a27274c4d9bb58263ae281218579c78cce7db119e2c863c1eaacc90
+	sha512sums = 071591c6bb71435f8186dcaf570703718051f00366dbbe3f13c4df3706d3de1f168bff4bfa707ad1d6f09f5505c925f0b01d76fd65efe904f3ba7db693d63f43
 	sha512sums = e88fa96024efc6176c818d0a46684e0ee1fb3a7bdadb323ad3b29f736209c80b6c31b135cf84389e7e2bbd614e57b241e4437c94b6fd114e73cfc418bf130015
 	sha512sums = 4a7e9de924bbf32fb4cd24ffa2764bcf49e0540bba649829b180da20a62810d4a21ebf11529d4eca22c9ceaa93b434ca3fbfd0b636795f8109ea4e1eddbff8f3
 	sha512sums = b4eeeb4b2801f3edcc7423f28403b1dfabd3f3869425e4f102a2a4554bde93e63bd73d2d4dbf3e5748ce831b570e441d3917f532fc5cceac1ee5e8fd0832cb30
diff --git a/PKGBUILD b/PKGBUILD
index de10f3d378ba..0fe5c0c6e890 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@
 # https://github.com/mymedia2/tdesktop
 
 pkgname=telegram-desktop-udf-patched
-pkgver=2.3.0
-pkgrel=2
+pkgver=2.3.2
+pkgrel=1
 pkgdesc='Telegram Desktop client with several personal patches'
 arch=('x86_64')
 url="https://desktop.telegram.org/"
@@ -27,7 +27,7 @@ conflicts=('telegram-desktop')
 
 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"
+    "Use-tg_owt-webrtc-fork.patch"
     # Custom patches
     "always_delete_for_everyone.patch"
     "always_clear_history_for_everyone.patch"
@@ -36,8 +36,8 @@ source=(
     "force_gtk_integration.patch"
 )
 sha512sums=(
-    '65fa7641ed9ba2fcd4181e3f6bbc036dcf2ddcb12eb10a15a601e0fce79c0f99741b55741bb3c18b9de5d3cdb07190761ea0f8fbe111563f784e0ad3faea2ede'
-    '5405ec01bd19350141588aad40eec63e47cd601d4945ed28ba2aaf077b398f4b746c3299e047bf0fb534f073ac1b9d4a515c5cc3eca9cdc754ccf87d2ce7176e'
+    '757e57389ce24656c1d6676d6f0808e3d444785394e916b9f5fb47511662f01b6742c88c2a27274c4d9bb58263ae281218579c78cce7db119e2c863c1eaacc90'
+    '071591c6bb71435f8186dcaf570703718051f00366dbbe3f13c4df3706d3de1f168bff4bfa707ad1d6f09f5505c925f0b01d76fd65efe904f3ba7db693d63f43'
     # Custom patches
     'e88fa96024efc6176c818d0a46684e0ee1fb3a7bdadb323ad3b29f736209c80b6c31b135cf84389e7e2bbd614e57b241e4437c94b6fd114e73cfc418bf130015'
     '4a7e9de924bbf32fb4cd24ffa2764bcf49e0540bba649829b180da20a62810d4a21ebf11529d4eca22c9ceaa93b434ca3fbfd0b636795f8109ea4e1eddbff8f3'
@@ -48,7 +48,7 @@ sha512sums=(
 
 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
 
     cd ..
@@ -75,7 +75,6 @@ build() {
         -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 \
         -DTDESKTOP_USE_GTK_FILE_DIALOG=ON
diff --git a/Use-tg_owt-webrtc-fork.patch b/Use-tg_owt-webrtc-fork.patch
new file mode 100644
index 000000000000..d3a75b715033
--- /dev/null
+++ b/Use-tg_owt-webrtc-fork.patch
@@ -0,0 +1,61 @@
+From 4c8956027de8e8e8b984c5daa643aacb14a89123 Mon Sep 17 00:00:00 2001
+From: John Preston <johnprestonmail@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
+