From e1ce5cf48d2746d69a42b6dd085ee57179b6a163 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 15 Apr 2019 21:44:20 +1000 Subject: [PATCH] Telegram: bump version --- ...telegram_desktop-1.6.7-libtgvoip.patchset} | 108 +++++----- ... => telegram_desktop-1.6.7-systemqt.patch} | 0 ...tchset => telegram_desktop-1.6.7.patchset} | 186 +++++------------- ...2.recipe => telegram_desktop-1.6.7.recipe} | 6 +- 4 files changed, 101 insertions(+), 199 deletions(-) rename net-im/telegram-desktop/patches/{telegram_desktop-1.6.2-libtgvoip.patchset => telegram_desktop-1.6.7-libtgvoip.patchset} (81%) rename net-im/telegram-desktop/patches/{telegram_desktop-1.6.2-systemqt.patch => telegram_desktop-1.6.7-systemqt.patch} (100%) rename net-im/telegram-desktop/patches/{telegram_desktop-1.6.2.patchset => telegram_desktop-1.6.7.patchset} (95%) rename net-im/telegram-desktop/{telegram_desktop-1.6.2.recipe => telegram_desktop-1.6.7.recipe} (97%) diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.6.2-libtgvoip.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.6.7-libtgvoip.patchset similarity index 81% rename from net-im/telegram-desktop/patches/telegram_desktop-1.6.2-libtgvoip.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-1.6.7-libtgvoip.patchset index ba7abc148..288be77d8 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-1.6.2-libtgvoip.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-1.6.7-libtgvoip.patchset @@ -1,15 +1,15 @@ -From 3a64e2affa9f42d6580bf85b80923cd61b68f21f Mon Sep 17 00:00:00 2001 +From b0f43936fb71181882e42ec3cb43eb676a07eab8 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Thu, 21 Mar 2019 19:35:35 +1000 +Date: Mon, 15 Apr 2019 18:51:48 +1000 Subject: Add mediakit support -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/OpusDecoder.cpp b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/OpusDecoder.cpp +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusDecoder.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusDecoder.cpp old mode 100755 new mode 100644 index 0ecd63e..61081f9 ---- a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/OpusDecoder.cpp -+++ b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/OpusDecoder.cpp +--- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusDecoder.cpp ++++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusDecoder.cpp @@ -10,7 +10,7 @@ #include #include @@ -19,12 +19,12 @@ index 0ecd63e..61081f9 #include #else #include "opus.h" -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/OpusEncoder.cpp b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/OpusEncoder.cpp +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusEncoder.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusEncoder.cpp old mode 100755 new mode 100644 index 8786bf5..ab5abc4 ---- a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/OpusEncoder.cpp -+++ b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/OpusEncoder.cpp +--- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusEncoder.cpp ++++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusEncoder.cpp @@ -9,7 +9,7 @@ #include #include "logging.h" @@ -34,15 +34,15 @@ index 8786bf5..ab5abc4 #include #else #include "opus.h" -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/OpusEncoder.h b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/OpusEncoder.h +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusEncoder.h b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/OpusEncoder.h old mode 100755 new mode 100644 -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/VoIPController.cpp b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/VoIPController.cpp +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/VoIPController.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/VoIPController.cpp old mode 100755 new mode 100644 index 66fb80e..bb65fb6 ---- a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/VoIPController.cpp -+++ b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/VoIPController.cpp +--- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/VoIPController.cpp ++++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/VoIPController.cpp @@ -8,6 +8,9 @@ #include #include @@ -64,10 +64,10 @@ index 66fb80e..bb65fb6 #elif defined(__APPLE__) static pthread_once_t token = PTHREAD_ONCE_INIT; pthread_once(&token, &initMachTimestart); -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/audio/AudioIO.cpp b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/audio/AudioIO.cpp +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioIO.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioIO.cpp index 2c16ca7..e00c731 100644 ---- a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/audio/AudioIO.cpp -+++ b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/audio/AudioIO.cpp +--- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioIO.cpp ++++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioIO.cpp @@ -39,6 +39,9 @@ #ifndef WITHOUT_PULSE #include "../os/linux/AudioPulse.h" @@ -87,10 +87,10 @@ index 2c16ca7..e00c731 100644 #elif defined(__linux__) #ifndef WITHOUT_ALSA #ifndef WITHOUT_PULSE -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/audio/AudioInput.cpp b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/audio/AudioInput.cpp +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioInput.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioInput.cpp index dae647a..4bab98c 100644 ---- a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/audio/AudioInput.cpp -+++ b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/audio/AudioInput.cpp +--- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioInput.cpp ++++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioInput.cpp @@ -33,6 +33,8 @@ #ifndef WITHOUT_PULSE #include "../os/linux/AudioPulse.h" @@ -100,10 +100,10 @@ index dae647a..4bab98c 100644 #else #error "Unsupported operating system" #endif -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/audio/AudioOutput.cpp b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/audio/AudioOutput.cpp +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioOutput.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioOutput.cpp index 458e8a5..1890350 100644 ---- a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/audio/AudioOutput.cpp -+++ b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/audio/AudioOutput.cpp +--- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioOutput.cpp ++++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/audio/AudioOutput.cpp @@ -37,6 +37,8 @@ #include "../os/linux/AudioOutputPulse.h" #include "../os/linux/AudioPulse.h" @@ -113,10 +113,10 @@ index 458e8a5..1890350 100644 #else #error "Unsupported operating system" #endif -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/libtgvoip.gyp b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/libtgvoip.gyp -index cb1352b..6fd62fd 100644 ---- a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/libtgvoip.gyp -+++ b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/libtgvoip.gyp +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/libtgvoip.gyp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/libtgvoip.gyp +index a033147..108ccaa 100644 +--- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/libtgvoip.gyp ++++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/libtgvoip.gyp @@ -115,6 +115,14 @@ '<(tgvoip_src_loc)/os/linux/AudioPulse.cpp', '<(tgvoip_src_loc)/os/linux/AudioPulse.h', @@ -167,11 +167,11 @@ index cb1352b..6fd62fd 100644 '"<(OS)" == "linux"', { 'defines': [ 'WEBRTC_POSIX', -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/haiku/AudioInputHaiku.cpp b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/haiku/AudioInputHaiku.cpp +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioInputHaiku.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioInputHaiku.cpp new file mode 100644 index 0000000..7cce3e3 --- /dev/null -+++ b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/haiku/AudioInputHaiku.cpp ++++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioInputHaiku.cpp @@ -0,0 +1,276 @@ +// +// libtgvoip is free and unencumbered public domain software. @@ -449,11 +449,11 @@ index 0000000..7cce3e3 + snooze(100); + } +} -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/haiku/AudioInputHaiku.h b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/haiku/AudioInputHaiku.h +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioInputHaiku.h b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioInputHaiku.h new file mode 100644 index 0000000..1c63afe --- /dev/null -+++ b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/haiku/AudioInputHaiku.h ++++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioInputHaiku.h @@ -0,0 +1,66 @@ +// +// libtgvoip is free and unencumbered public domain software. @@ -521,11 +521,11 @@ index 0000000..1c63afe +} + +#endif //LIBTGVOIP_AUDIOINPUTHAIKU_H -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/haiku/AudioOutputHaiku.cpp b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/haiku/AudioOutputHaiku.cpp +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioOutputHaiku.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioOutputHaiku.cpp new file mode 100644 index 0000000..2fca8a1 --- /dev/null -+++ b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/haiku/AudioOutputHaiku.cpp ++++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioOutputHaiku.cpp @@ -0,0 +1,99 @@ +// +// libtgvoip is free and unencumbered public domain software. @@ -626,11 +626,11 @@ index 0000000..2fca8a1 +bool AudioOutputHaiku::IsPlaying(){ + return isPlaying; +} -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/haiku/AudioOutputHaiku.h b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/haiku/AudioOutputHaiku.h +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioOutputHaiku.h b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioOutputHaiku.h new file mode 100644 index 0000000..91f2521 --- /dev/null -+++ b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/haiku/AudioOutputHaiku.h ++++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/AudioOutputHaiku.h @@ -0,0 +1,35 @@ +// +// libtgvoip is free and unencumbered public domain software. @@ -667,11 +667,11 @@ index 0000000..91f2521 +} + +#endif //LIBTGVOIP_AUDIOOUTPUTHAIKU_H -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/haiku/RingBuffer.cpp b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/haiku/RingBuffer.cpp +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/RingBuffer.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/RingBuffer.cpp new file mode 100644 index 0000000..43236d3 --- /dev/null -+++ b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/haiku/RingBuffer.cpp ++++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/RingBuffer.cpp @@ -0,0 +1,130 @@ +#include +#include @@ -803,11 +803,11 @@ index 0000000..43236d3 +{ + return initialized?B_OK:B_ERROR; +} -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/haiku/RingBuffer.h b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/haiku/RingBuffer.h +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/RingBuffer.h b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/RingBuffer.h new file mode 100644 index 0000000..4715632 --- /dev/null -+++ b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/haiku/RingBuffer.h ++++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/haiku/RingBuffer.h @@ -0,0 +1,31 @@ +#ifndef __RING_BUFFER_H__ +#define __RING_BUFFER_H__ @@ -840,10 +840,10 @@ index 0000000..4715632 +}; + +#endif -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/posix/NetworkSocketPosix.cpp b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/posix/NetworkSocketPosix.cpp +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/posix/NetworkSocketPosix.cpp b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/posix/NetworkSocketPosix.cpp index 52eef76..c480dfb 100644 ---- a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/posix/NetworkSocketPosix.cpp -+++ b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/os/posix/NetworkSocketPosix.cpp +--- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/posix/NetworkSocketPosix.cpp ++++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/os/posix/NetworkSocketPosix.cpp @@ -248,12 +248,13 @@ void NetworkSocketPosix::Open(){ } int flag=0; @@ -868,12 +868,12 @@ index 52eef76..c480dfb 100644 #else struct ifaddrs* interfaces; if(!getifaddrs(&interfaces)){ -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/threading.h b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/threading.h +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/threading.h b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/threading.h old mode 100755 new mode 100644 index 9dc2554..fc68fd4 ---- a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/threading.h -+++ b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/threading.h +--- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/threading.h ++++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/threading.h @@ -9,7 +9,7 @@ #include @@ -899,12 +899,12 @@ index 9dc2554..fc68fd4 } self->entry(); return NULL; -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/webrtc_dsp/rtc_base/logging_webrtc.cc b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/webrtc_dsp/rtc_base/logging_webrtc.cc +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/logging_webrtc.cc b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/logging_webrtc.cc old mode 100755 new mode 100644 index a8d1522..991241b ---- a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/webrtc_dsp/rtc_base/logging_webrtc.cc -+++ b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/webrtc_dsp/rtc_base/logging_webrtc.cc +--- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/logging_webrtc.cc ++++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/logging_webrtc.cc @@ -28,6 +28,10 @@ static const int kMaxLogLineSize = 1024 - 60; #endif // WEBRTC_MAC && !defined(WEBRTC_IOS) || WEBRTC_ANDROID @@ -929,13 +929,13 @@ index a8d1522..991241b } if (file != nullptr) { -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/webrtc_dsp/rtc_base/platform_file.h b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/webrtc_dsp/rtc_base/platform_file.h +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_file.h b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_file.h old mode 100755 new mode 100644 -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/webrtc_dsp/rtc_base/platform_thread_types.cc b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/webrtc_dsp/rtc_base/platform_thread_types.cc +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_thread_types.cc b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_thread_types.cc index 70cf237..e48948e 100644 ---- a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/webrtc_dsp/rtc_base/platform_thread_types.cc -+++ b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/webrtc_dsp/rtc_base/platform_thread_types.cc +--- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_thread_types.cc ++++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_thread_types.cc @@ -20,6 +20,8 @@ namespace rtc { PlatformThreadId CurrentThreadId() { #if defined(WEBRTC_WIN) @@ -945,10 +945,10 @@ index 70cf237..e48948e 100644 #elif defined(WEBRTC_POSIX) #if defined(WEBRTC_MAC) || defined(WEBRTC_IOS) return pthread_mach_thread_np(pthread_self()); -diff --git a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/webrtc_dsp/rtc_base/platform_thread_types.h b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/webrtc_dsp/rtc_base/platform_thread_types.h +diff --git a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_thread_types.h b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_thread_types.h index 0bc42eb..c87cde9 100644 ---- a/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/webrtc_dsp/rtc_base/platform_thread_types.h -+++ b/libtgvoip-16711e202393ae7e1b160436f4291c5f06a3d375/webrtc_dsp/rtc_base/platform_thread_types.h +--- a/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_thread_types.h ++++ b/libtgvoip-e7010506210fbb3a6704d7ac1276b3334f9ab6c9/webrtc_dsp/rtc_base/platform_thread_types.h @@ -35,6 +35,9 @@ typedef DWORD PlatformThreadRef; #elif defined(WEBRTC_FUCHSIA) typedef zx_handle_t PlatformThreadId; @@ -960,5 +960,5 @@ index 0bc42eb..c87cde9 100644 typedef pid_t PlatformThreadId; typedef pthread_t PlatformThreadRef; -- -2.19.1 +2.21.0 diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.6.2-systemqt.patch b/net-im/telegram-desktop/patches/telegram_desktop-1.6.7-systemqt.patch similarity index 100% rename from net-im/telegram-desktop/patches/telegram_desktop-1.6.2-systemqt.patch rename to net-im/telegram-desktop/patches/telegram_desktop-1.6.7-systemqt.patch diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.6.2.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.6.7.patchset similarity index 95% rename from net-im/telegram-desktop/patches/telegram_desktop-1.6.2.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-1.6.7.patchset index 77632bbce..8c249ed8f 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-1.6.2.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-1.6.7.patchset @@ -1,6 +1,6 @@ -From e82405c4d5b0f2eae1aac641625a98443cc0d7c0 Mon Sep 17 00:00:00 2001 +From a4216b3acfbbbf85a2a78a57e06b0cbf1c67396a Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 20 Mar 2019 20:44:47 +1000 +Date: Mon, 15 Apr 2019 20:31:29 +1000 Subject: Add Haiku support @@ -239,7 +239,7 @@ index 8aefb97..d54c8d1 100644 if (!updater.exists()) { QFileInfo current(curUpdater); diff --git a/Telegram/SourceFiles/core/utils.h b/Telegram/SourceFiles/core/utils.h -index ee1dbc5..cb811b3 100644 +index 4626702..2ef702b 100644 --- a/Telegram/SourceFiles/core/utils.h +++ b/Telegram/SourceFiles/core/utils.h @@ -347,6 +347,7 @@ enum DBIPlatform { @@ -251,30 +251,30 @@ index ee1dbc5..cb811b3 100644 enum DBIPeerReportSpamStatus { diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp -index 3dc7b4e..3506b23 100644 +index c2f0b70..36520a3 100644 --- a/Telegram/SourceFiles/export/data/export_data_types.cpp +++ b/Telegram/SourceFiles/export/data/export_data_types.cpp -@@ -242,7 +242,8 @@ Image ParseMaxImage( - result.width = data.vw.v; - result.height = data.vh.v; - result.file.location = ParseLocation(data.vlocation); +@@ -226,7 +226,8 @@ Image ParseMaxImage( + photo.vaccess_hash, + photo.vfile_reference, + data.vtype) }; - if constexpr (MTPDphotoCachedSize::Is()) { -+ constexpr bool is = (MTPDphotoCachedSize::Is()); ++ constexpr bool is = MTPDphotoCachedSize::Is(); + if constexpr (is) { result.file.content = data.vbytes.v; result.file.size = result.file.content.size(); } else { -@@ -431,7 +432,8 @@ Image ParseDocumentThumb( - result.width = data.vw.v; - result.height = data.vh.v; - result.file.location = ParseLocation(data.vlocation); +@@ -422,7 +423,8 @@ Image ParseDocumentThumb( + document.vaccess_hash, + document.vfile_reference, + data.vtype) }; - if constexpr (MTPDphotoCachedSize::Is()) { -+ constexpr bool is = (MTPDphotoCachedSize::Is()); ++ constexpr bool is = MTPDphotoCachedSize::Is(); + if constexpr (is) { result.file.content = data.vbytes.v; result.file.size = result.file.content.size(); } else { -@@ -1122,7 +1124,8 @@ Message ParseMessage( +@@ -1114,7 +1116,8 @@ Message ParseMessage( auto result = Message(); data.match([&](const auto &data) { result.id = data.vid.v; @@ -285,10 +285,10 @@ index 3dc7b4e..3506b23 100644 const auto peerId = (!data.is_out() && data.has_from_id() diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp -index 8583e34..470690d 100644 +index e937538..b45f493 100644 --- a/Telegram/SourceFiles/export/export_api_wrap.cpp +++ b/Telegram/SourceFiles/export/export_api_wrap.cpp -@@ -720,7 +720,8 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) { +@@ -741,7 +741,8 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) { Expects(_userpicsProcess != nullptr); result.match([&](const auto &data) { @@ -298,7 +298,7 @@ index 8583e34..470690d 100644 _userpicsProcess->lastSlice = true; } loadUserpicsFiles(Data::ParseUserpicsSlice( -@@ -1257,7 +1258,8 @@ void ApiWrap::requestMessagesSlice() { +@@ -1278,7 +1279,8 @@ void ApiWrap::requestMessagesSlice() { result.match([&](const MTPDmessages_messagesNotModified &data) { error("Unexpected messagesNotModified received."); }, [&](const auto &data) { @@ -322,10 +322,10 @@ index 84c9af0..5e343c6 100644 if (!cWorkingDir().isEmpty()) { // This value must come from TelegramForcePortable diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp -index 60071db..4c24515 100644 +index a74fa6d..26959b5 100644 --- a/Telegram/SourceFiles/media/audio/media_audio.cpp +++ b/Telegram/SourceFiles/media/audio/media_audio.cpp -@@ -109,6 +109,7 @@ void EnumeratePlaybackDevices() { +@@ -99,6 +99,7 @@ void EnumeratePlaybackDevices() { void EnumerateCaptureDevices() { auto deviceNames = QStringList(); auto devices = alcGetString(nullptr, ALC_CAPTURE_DEVICE_SPECIFIER); @@ -333,7 +333,7 @@ index 60071db..4c24515 100644 Assert(devices != nullptr); while (*devices != 0) { auto deviceName8Bit = QByteArray(devices); -@@ -117,7 +118,7 @@ void EnumerateCaptureDevices() { +@@ -107,7 +108,7 @@ void EnumerateCaptureDevices() { devices += deviceName8Bit.size() + 1; } LOG(("Audio Capture Devices: %1").arg(deviceNames.join(';'))); @@ -914,10 +914,10 @@ index 0000000..af88932 +} // namespace Platform diff --git a/Telegram/SourceFiles/platform/haiku/main_window_haiku.h b/Telegram/SourceFiles/platform/haiku/main_window_haiku.h new file mode 100644 -index 0000000..ceb89c0 +index 0000000..113ac3a --- /dev/null +++ b/Telegram/SourceFiles/platform/haiku/main_window_haiku.h -@@ -0,0 +1,75 @@ +@@ -0,0 +1,73 @@ +/* +This file is part of Telegram Desktop for Haiku, + @@ -988,8 +988,6 @@ index 0000000..ceb89c0 + int _psCheckStatusIconLeft = 100; + + QTimer _psUpdateIndicatorTimer; -+ TimeMs _psLastIndicatorUpdate = 0; -+ +}; + +} // namespace Platform @@ -1090,10 +1088,10 @@ index 0000000..b6f3490 +resource app_signature "application/x-vnd.tg-notify-gate"; diff --git a/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.cpp b/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.cpp new file mode 100644 -index 0000000..7747c72 +index 0000000..9b3a71a --- /dev/null +++ b/Telegram/SourceFiles/platform/haiku/notifications_manager_haiku.cpp -@@ -0,0 +1,217 @@ +@@ -0,0 +1,214 @@ +/* +This file is part of Telegram Desktop for Haiku, + @@ -1236,12 +1234,9 @@ index 0000000..7747c72 + auto subtitleText = subtitle; + auto msgText = msg; + -+ StorageKey key; -+ if (hideNameAndPhoto) { -+ key = StorageKey(0, 0); -+ } else { -+ key = peer->userpicUniqueKey(); -+ } ++ const auto key = hideNameAndPhoto ++ ? InMemoryKey() ++ : peer->userpicUniqueKey(); + + auto userpicPath = _cachedUserpics.get(key, peer); + BBitmap *icon = BTranslationUtils::GetBitmapFile(userpicPath.toUtf8().data()); @@ -1449,10 +1444,10 @@ index 0000000..25c8e26 +} // namespace Platform diff --git a/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp b/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp new file mode 100644 -index 0000000..5acf791 +index 0000000..c71d8b3 --- /dev/null +++ b/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp -@@ -0,0 +1,431 @@ +@@ -0,0 +1,419 @@ +/* +This file is part of Telegram Desktop for Haiku, + @@ -1519,7 +1514,7 @@ index 0000000..5acf791 +} // namespace + +QRect psDesktopRect() { -+ auto tnow = getms(); ++ auto tnow = crl::now(); + if (tnow > _monitorLastGot + 1000LL || tnow < _monitorLastGot) { + _monitorLastGot = tnow; + _monitorRect = QApplication::desktop()->availableGeometry(App::wnd()); @@ -1722,18 +1717,6 @@ index 0000000..5acf791 + +} // namespace + -+void psUserActionDone() { -+ _lastUserAction = getms(true); -+} -+ -+bool psIdleSupported() { -+ return false; -+} -+ -+TimeMs psIdleTime() { -+ return getms(true) - _lastUserAction; -+} -+ +void psActivateProcess(uint64 pid) { +// objc_activateProgram(); +} @@ -1886,7 +1869,7 @@ index 0000000..5acf791 +} diff --git a/Telegram/SourceFiles/platform/haiku/specific_haiku.h b/Telegram/SourceFiles/platform/haiku/specific_haiku.h new file mode 100644 -index 0000000..a9cc589 +index 0000000..90c58bc --- /dev/null +++ b/Telegram/SourceFiles/platform/haiku/specific_haiku.h @@ -0,0 +1,120 @@ @@ -1931,6 +1914,10 @@ index 0000000..a9cc589 + +QString CurrentExecutablePath(int argc, char *argv[]); + ++inline std::optional LastUserInputTime() { ++ return std::nullopt; ++} ++ +} // namespace Platform + +inline QString psServerPrefix() { @@ -1948,10 +1935,6 @@ index 0000000..a9cc589 + +void psDeleteDir(const QString &dir); + -+void psUserActionDone(); -+bool psIdleSupported(); -+TimeMs psIdleTime(); -+ +QStringList psInitLogs(); +void psClearInitLogs(); + @@ -2165,10 +2148,10 @@ index c01dcc8..bca6501 100644 DBIPlatform gPlatform = dbipLinux64; #elif defined Q_OS_LINUX32 diff --git a/Telegram/SourceFiles/settings/settings_notifications.cpp b/Telegram/SourceFiles/settings/settings_notifications.cpp -index 1613aee..3bdb0b5 100644 +index 154cfa9..a42b31e 100644 --- a/Telegram/SourceFiles/settings/settings_notifications.cpp +++ b/Telegram/SourceFiles/settings/settings_notifications.cpp -@@ -584,6 +584,8 @@ void SetupNotificationsContent(not_null container) { +@@ -585,6 +585,8 @@ void SetupNotificationsContent(not_null container) { return LangKey(); } else if (cPlatform() == dbipWindows) { return lng_settings_use_windows; @@ -2278,12 +2261,12 @@ index eb90fe2..b12c1d6 100644 # GYP does not support per-configuration libraries :( diff --git a/Telegram/gyp/generate.py b/Telegram/gyp/generate.py -index 2326fa6..fb515ca 100644 +index cf7b447..c21a4b1 100644 --- a/Telegram/gyp/generate.py +++ b/Telegram/gyp/generate.py -@@ -99,6 +99,11 @@ elif sys.platform == 'darwin': +@@ -98,6 +98,11 @@ elif sys.platform == 'darwin': gypScript = '../../../Libraries/gyp/gyp' - gypArguments.append('-Gxcode_upgrade_check_project_version=1010') + gypArguments.append('-Gxcode_upgrade_check_project_version=1020') gypFormats.append('xcode') +elif sys.platform == 'haiku1': + gypScript = 'gyp' @@ -2638,10 +2621,10 @@ index d9147d6..16c9d3f 100644 'variables': { 'qrc_files': [ diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt -index 84bdb90..c22f78c 100644 +index f7bd4ee..a650ce0 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt -@@ -561,6 +561,18 @@ +@@ -564,6 +564,18 @@ <(src_loc)/platform/linux/notifications_manager_linux.h <(src_loc)/platform/linux/specific_linux.cpp <(src_loc)/platform/linux/specific_linux.h @@ -2679,86 +2662,5 @@ index 622462e..e3ba800 100644 'include_dirs': [ '<(libs_loc)/openssl/include' -- -2.19.1 - - -From cb3e651cfa584d042081612d969dab1a97683506 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 20 Mar 2019 23:58:20 +1000 -Subject: Fix build for new API - - -diff --git a/Telegram/SourceFiles/platform/haiku/main_window_haiku.h b/Telegram/SourceFiles/platform/haiku/main_window_haiku.h -index ceb89c0..113ac3a 100644 ---- a/Telegram/SourceFiles/platform/haiku/main_window_haiku.h -+++ b/Telegram/SourceFiles/platform/haiku/main_window_haiku.h -@@ -68,8 +68,6 @@ private: - int _psCheckStatusIconLeft = 100; - - QTimer _psUpdateIndicatorTimer; -- TimeMs _psLastIndicatorUpdate = 0; -- - }; - - } // namespace Platform -diff --git a/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp b/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp -index 5acf791..c71d8b3 100644 ---- a/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp -+++ b/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp -@@ -64,7 +64,7 @@ auto _monitorLastGot = 0LL; - } // namespace - - QRect psDesktopRect() { -- auto tnow = getms(); -+ auto tnow = crl::now(); - if (tnow > _monitorLastGot + 1000LL || tnow < _monitorLastGot) { - _monitorLastGot = tnow; - _monitorRect = QApplication::desktop()->availableGeometry(App::wnd()); -@@ -267,18 +267,6 @@ auto _lastUserAction = 0LL; - - } // namespace - --void psUserActionDone() { -- _lastUserAction = getms(true); --} -- --bool psIdleSupported() { -- return false; --} -- --TimeMs psIdleTime() { -- return getms(true) - _lastUserAction; --} -- - void psActivateProcess(uint64 pid) { - // objc_activateProgram(); - } -diff --git a/Telegram/SourceFiles/platform/haiku/specific_haiku.h b/Telegram/SourceFiles/platform/haiku/specific_haiku.h -index a9cc589..90c58bc 100644 ---- a/Telegram/SourceFiles/platform/haiku/specific_haiku.h -+++ b/Telegram/SourceFiles/platform/haiku/specific_haiku.h -@@ -39,6 +39,10 @@ inline void ReInitOnTopPanel(QWidget *panel) { - - QString CurrentExecutablePath(int argc, char *argv[]); - -+inline std::optional LastUserInputTime() { -+ return std::nullopt; -+} -+ - } // namespace Platform - - inline QString psServerPrefix() { -@@ -56,10 +60,6 @@ QString psPrepareCrashDump(const QByteArray &crashdump, QString dumpfile); - - void psDeleteDir(const QString &dir); - --void psUserActionDone(); --bool psIdleSupported(); --TimeMs psIdleTime(); -- - QStringList psInitLogs(); - void psClearInitLogs(); - --- -2.19.1 +2.21.0 diff --git a/net-im/telegram-desktop/telegram_desktop-1.6.2.recipe b/net-im/telegram-desktop/telegram_desktop-1.6.7.recipe similarity index 97% rename from net-im/telegram-desktop/telegram_desktop-1.6.2.recipe rename to net-im/telegram-desktop/telegram_desktop-1.6.7.recipe index 9e1ce9398..54e596951 100644 --- a/net-im/telegram-desktop/telegram_desktop-1.6.2.recipe +++ b/net-im/telegram-desktop/telegram_desktop-1.6.7.recipe @@ -5,12 +5,12 @@ COPYRIGHT="2013-2019 Telegram" LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/telegramdesktop/tdesktop/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="cb13c8c2f368c412e4efd755651e7c3f7299801f2fe1ec4d0922024a483e3e9a" +CHECKSUM_SHA256="77f4cf6507d1ebc26eaef472aa4817cc57a77c5e3065f6b2afa294530f0633a1" SOURCE_FILENAME="tdesktop-$portVersion.tar.gz" SOURCE_DIR="tdesktop-$portVersion" -srcGitRev_2="16711e202393ae7e1b160436f4291c5f06a3d375" +srcGitRev_2="e7010506210fbb3a6704d7ac1276b3334f9ab6c9" SOURCE_URI_2="https://github.com/telegramdesktop/libtgvoip/archive/$srcGitRev_2.tar.gz" -CHECKSUM_SHA256_2="f35e6714ae3e57d78480d9d736e94f68176194becc3d67231bb9257d3c164cf4" +CHECKSUM_SHA256_2="9c250f24c0f1775daefb2967c2a25be1d10ea35e72928256aec3f469e576bac4" SOURCE_FILENAME_2="libtgvoip-$srcGitRev_2.tar.gz" srcGitRev_3="550ac2f159ca883d360c196149b466955c77a573" SOURCE_URI_3="https://github.com/mapbox/variant/archive/$srcGitRev_3.tar.gz"