From b96593246282e9ea463cd204f9f873c2ca14b010 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 18 Sep 2017 22:17:45 +1000 Subject: [PATCH] Telegram: fix crash on call --- .../tdesktop-1.1.23-libtgvoip.patchset | 34 +++++++++++++++++-- net-im/tdesktop/tdesktop-1.1.23.recipe | 2 +- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/net-im/tdesktop/patches/tdesktop-1.1.23-libtgvoip.patchset b/net-im/tdesktop/patches/tdesktop-1.1.23-libtgvoip.patchset index adf38e575..1ac7884ee 100644 --- a/net-im/tdesktop/patches/tdesktop-1.1.23-libtgvoip.patchset +++ b/net-im/tdesktop/patches/tdesktop-1.1.23-libtgvoip.patchset @@ -1,4 +1,4 @@ -From 02c81db678ccf9aca0941677117d831a00b07d51 Mon Sep 17 00:00:00 2001 +From ec7bde5fd17969a08b8149785445ecb69b09c729 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 15 Sep 2017 22:18:56 +1000 Subject: Fix opus header path @@ -40,7 +40,7 @@ index 9329f89..b2a9305 100644 2.13.1 -From d8bce771a907af24ef841903a70efe5e55b4a967 Mon Sep 17 00:00:00 2001 +From 11ec9121c35bcf4127ff2e982329ba2c354d0259 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 15 Sep 2017 22:22:31 +1000 Subject: Add haiku @@ -420,3 +420,33 @@ index c9c4e65..9d93596 100644 -- 2.13.1 + +From 7e861e2b3c0d02e0fabdab46b9e5f88b56585716 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Mon, 18 Sep 2017 22:05:53 +1000 +Subject: Fix for crash when calls + + +diff --git a/libtgvoip-757a5d8ec31aadcf387ac3cb135256152c18de1c/VoIPController.cpp b/libtgvoip-757a5d8ec31aadcf387ac3cb135256152c18de1c/VoIPController.cpp +index 78e9e4b..a9c34b7 100644 +--- a/libtgvoip-757a5d8ec31aadcf387ac3cb135256152c18de1c/VoIPController.cpp ++++ b/libtgvoip-757a5d8ec31aadcf387ac3cb135256152c18de1c/VoIPController.cpp +@@ -276,6 +276,7 @@ VoIPController::~VoIPController(){ + sendQueue->Put(PendingOutgoingPacket{0}); + if(openingTcpSocket) + openingTcpSocket->Close(); ++#ifndef __HAIKU__ + LOGD("before join sendThread"); + join_thread(sendThread); + LOGD("before join recvThread"); +@@ -284,6 +285,7 @@ VoIPController::~VoIPController(){ + join_thread(tickThread); + free_mutex(sendBufferMutex); + LOGD("before close socket"); ++#endif + if(udpSocket) + delete udpSocket; + if(udpSocket!=realUdpSocket) +-- +2.13.1 + diff --git a/net-im/tdesktop/tdesktop-1.1.23.recipe b/net-im/tdesktop/tdesktop-1.1.23.recipe index 6ea4d4564..5cdb863b7 100644 --- a/net-im/tdesktop/tdesktop-1.1.23.recipe +++ b/net-im/tdesktop/tdesktop-1.1.23.recipe @@ -3,7 +3,7 @@ DESCRIPTION="Official desktop version of Telegram messaging app." HOMEPAGE="https://www.telegram.org/" COPYRIGHT="2013-2017 Telegram" LICENSE="GNU GPL v3" -REVISION="3" +REVISION="4" SOURCE_URI="https://github.com/telegramdesktop/tdesktop/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="56b7fce84adf85a4af1c3174353169f32d0b0c052a4e7a284fc741fa96b04030" COMMIT_2="757a5d8ec31aadcf387ac3cb135256152c18de1c"