From 8504290ecfd21e71088ff6b00a5054e252e8967d Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 28 Jul 2018 21:08:19 +1000 Subject: [PATCH] Telegram: bump version --- ...elegram_desktop-1.3.10-libtgvoip.patchset} | 100 ++++++------- ...=> telegram_desktop-1.3.10-systemqt.patch} | 0 ...chset => telegram_desktop-1.3.10.patchset} | 131 +++++++++++++++--- ....recipe => telegram_desktop-1.3.10.recipe} | 8 +- 4 files changed, 165 insertions(+), 74 deletions(-) rename net-im/telegram-desktop/patches/{telegram_desktop-1.3.9-libtgvoip.patchset => telegram_desktop-1.3.10-libtgvoip.patchset} (83%) rename net-im/telegram-desktop/patches/{telegram_desktop-1.3.9-systemqt.patch => telegram_desktop-1.3.10-systemqt.patch} (100%) rename net-im/telegram-desktop/patches/{telegram_desktop-1.3.9.patchset => telegram_desktop-1.3.10.patchset} (95%) rename net-im/telegram-desktop/{telegram_desktop-1.3.9.recipe => telegram_desktop-1.3.10.recipe} (95%) diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.3.9-libtgvoip.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.3.10-libtgvoip.patchset similarity index 83% rename from net-im/telegram-desktop/patches/telegram_desktop-1.3.9-libtgvoip.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-1.3.10-libtgvoip.patchset index 1f41c7afa..220585afa 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-1.3.9-libtgvoip.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-1.3.10-libtgvoip.patchset @@ -4,10 +4,10 @@ Date: Sun, 10 Jun 2018 11:08:42 +1000 Subject: Fix for using external opus lib -diff --git a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/OpusDecoder.h b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/OpusDecoder.h +diff --git a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/OpusDecoder.h b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/OpusDecoder.h index 6425c97..848b930 100644 ---- a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/OpusDecoder.h -+++ b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/OpusDecoder.h +--- a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/OpusDecoder.h ++++ b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/OpusDecoder.h @@ -9,7 +9,7 @@ @@ -17,10 +17,10 @@ index 6425c97..848b930 100644 #include "threading.h" #include "BlockingQueue.h" #include "Buffers.h" -diff --git a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/OpusEncoder.h b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/OpusEncoder.h +diff --git a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/OpusEncoder.h b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/OpusEncoder.h index 4726f6b..92d8c33 100644 ---- a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/OpusEncoder.h -+++ b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/OpusEncoder.h +--- a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/OpusEncoder.h ++++ b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/OpusEncoder.h @@ -9,7 +9,7 @@ @@ -40,10 +40,10 @@ Date: Sun, 10 Jun 2018 11:10:12 +1000 Subject: Add haiku modules -diff --git a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/VoIPController.cpp b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/VoIPController.cpp -index 4a1f63d..1264b01 100644 ---- a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/VoIPController.cpp -+++ b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/VoIPController.cpp +diff --git a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/VoIPController.cpp b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/VoIPController.cpp +index 6d266a5..d08296a 100644 +--- a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/VoIPController.cpp ++++ b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/VoIPController.cpp @@ -8,6 +8,9 @@ #include #include @@ -54,7 +54,7 @@ index 4a1f63d..1264b01 100644 #include #include #include -@@ -2403,6 +2406,10 @@ double VoIPController::GetCurrentTime(){ +@@ -2404,6 +2407,10 @@ double VoIPController::GetCurrentTime(){ struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); return ts.tv_sec+(double)ts.tv_nsec/1000000000.0; @@ -65,10 +65,10 @@ index 4a1f63d..1264b01 100644 #elif defined(__APPLE__) static pthread_once_t token = PTHREAD_ONCE_INIT; pthread_once(&token, &initMachTimestart); -diff --git a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/audio/AudioInput.cpp b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/audio/AudioInput.cpp +diff --git a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/audio/AudioInput.cpp b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/audio/AudioInput.cpp index 062ca06..887889e 100644 ---- a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/audio/AudioInput.cpp -+++ b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/audio/AudioInput.cpp +--- a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/audio/AudioInput.cpp ++++ b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/audio/AudioInput.cpp @@ -22,6 +22,8 @@ #elif defined(__linux__) #include "../os/linux/AudioInputALSA.h" @@ -87,10 +87,10 @@ index 062ca06..887889e 100644 #endif } -diff --git a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/audio/AudioOutput.cpp b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/audio/AudioOutput.cpp +diff --git a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/audio/AudioOutput.cpp b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/audio/AudioOutput.cpp index 109d24d..c3cc014 100644 ---- a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/audio/AudioOutput.cpp -+++ b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/audio/AudioOutput.cpp +--- a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/audio/AudioOutput.cpp ++++ b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/audio/AudioOutput.cpp @@ -25,6 +25,8 @@ #elif defined(__linux__) #include "../os/linux/AudioOutputALSA.h" @@ -110,10 +110,10 @@ index 109d24d..c3cc014 100644 #endif } -diff --git a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/libtgvoip.gyp b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/libtgvoip.gyp +diff --git a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/libtgvoip.gyp b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/libtgvoip.gyp index f236987..24f017b 100644 ---- a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/libtgvoip.gyp -+++ b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/libtgvoip.gyp +--- a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/libtgvoip.gyp ++++ b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/libtgvoip.gyp @@ -100,6 +100,14 @@ '<(tgvoip_src_loc)/os/linux/PulseAudioLoader.cpp', '<(tgvoip_src_loc)/os/linux/PulseAudioLoader.h', @@ -163,11 +163,11 @@ index f236987..24f017b 100644 '"<(OS)" == "linux"', { 'defines': [ 'WEBRTC_POSIX', -diff --git a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioInputHaiku.cpp b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioInputHaiku.cpp +diff --git a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioInputHaiku.cpp b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioInputHaiku.cpp new file mode 100644 index 0000000..ce54b6e --- /dev/null -+++ b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioInputHaiku.cpp ++++ b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioInputHaiku.cpp @@ -0,0 +1,198 @@ +// +// libtgvoip is free and unencumbered public domain software. @@ -367,11 +367,11 @@ index 0000000..ce54b6e + snooze(100); + } +} -diff --git a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioInputHaiku.h b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioInputHaiku.h +diff --git a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioInputHaiku.h b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioInputHaiku.h new file mode 100644 index 0000000..80573df --- /dev/null -+++ b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioInputHaiku.h ++++ b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioInputHaiku.h @@ -0,0 +1,57 @@ +// +// libtgvoip is free and unencumbered public domain software. @@ -430,11 +430,11 @@ index 0000000..80573df +} + +#endif //LIBTGVOIP_AUDIOINPUTALSA_H -diff --git a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioOutputHaiku.cpp b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioOutputHaiku.cpp +diff --git a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioOutputHaiku.cpp b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioOutputHaiku.cpp new file mode 100644 index 0000000..4454323 --- /dev/null -+++ b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioOutputHaiku.cpp ++++ b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioOutputHaiku.cpp @@ -0,0 +1,101 @@ +// +// libtgvoip is free and unencumbered public domain software. @@ -537,11 +537,11 @@ index 0000000..4454323 +float AudioOutputHaiku::GetLevel(){ + return 0; +} -diff --git a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioOutputHaiku.h b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioOutputHaiku.h +diff --git a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioOutputHaiku.h b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioOutputHaiku.h new file mode 100644 index 0000000..6880709 --- /dev/null -+++ b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioOutputHaiku.h ++++ b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioOutputHaiku.h @@ -0,0 +1,36 @@ +// +// libtgvoip is free and unencumbered public domain software. @@ -579,11 +579,11 @@ index 0000000..6880709 +} + +#endif //LIBTGVOIP_AudioOutputHaiku_H -diff --git a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/RingBuffer.cpp b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/RingBuffer.cpp +diff --git a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/RingBuffer.cpp b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/RingBuffer.cpp new file mode 100644 index 0000000..43236d3 --- /dev/null -+++ b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/RingBuffer.cpp ++++ b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/RingBuffer.cpp @@ -0,0 +1,130 @@ +#include +#include @@ -715,11 +715,11 @@ index 0000000..43236d3 +{ + return initialized?B_OK:B_ERROR; +} -diff --git a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/RingBuffer.h b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/RingBuffer.h +diff --git a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/RingBuffer.h b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/RingBuffer.h new file mode 100644 index 0000000..4715632 --- /dev/null -+++ b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/RingBuffer.h ++++ b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/RingBuffer.h @@ -0,0 +1,31 @@ +#ifndef __RING_BUFFER_H__ +#define __RING_BUFFER_H__ @@ -752,10 +752,10 @@ index 0000000..4715632 +}; + +#endif -diff --git a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/posix/NetworkSocketPosix.cpp b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/posix/NetworkSocketPosix.cpp +diff --git a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/posix/NetworkSocketPosix.cpp b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/posix/NetworkSocketPosix.cpp index 05ddbb9..fcf7580 100644 ---- a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/posix/NetworkSocketPosix.cpp -+++ b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/posix/NetworkSocketPosix.cpp +--- a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/posix/NetworkSocketPosix.cpp ++++ b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/posix/NetworkSocketPosix.cpp @@ -47,6 +47,7 @@ NetworkSocketPosix::~NetworkSocketPosix(){ } @@ -792,10 +792,10 @@ index 05ddbb9..fcf7580 100644 #else struct ifaddrs* interfaces; if(!getifaddrs(&interfaces)){ -diff --git a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/threading.h b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/threading.h +diff --git a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/threading.h b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/threading.h index 0b4933c..87ea3b7 100644 ---- a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/threading.h -+++ b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/threading.h +--- a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/threading.h ++++ b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/threading.h @@ -33,7 +33,7 @@ namespace tgvoip{ }; } @@ -829,10 +829,10 @@ Date: Sun, 10 Jun 2018 22:01:28 +1000 Subject: Add mix and resample for haiku audio input -diff --git a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioInputHaiku.cpp b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioInputHaiku.cpp +diff --git a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioInputHaiku.cpp b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioInputHaiku.cpp index ce54b6e..d7cc39a 100644 ---- a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioInputHaiku.cpp -+++ b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioInputHaiku.cpp +--- a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioInputHaiku.cpp ++++ b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioInputHaiku.cpp @@ -10,32 +10,104 @@ #include #include "AudioInputHaiku.h" @@ -971,10 +971,10 @@ index ce54b6e..d7cc39a 100644 } bool AudioInputHaiku::IsRecording(){ -diff --git a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioInputHaiku.h b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioInputHaiku.h +diff --git a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioInputHaiku.h b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioInputHaiku.h index 80573df..746d7df 100644 ---- a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioInputHaiku.h -+++ b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioInputHaiku.h +--- a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioInputHaiku.h ++++ b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioInputHaiku.h @@ -22,6 +22,8 @@ #include "RingBuffer.h" @@ -1016,10 +1016,10 @@ index 80573df..746d7df 100644 -#endif //LIBTGVOIP_AUDIOINPUTALSA_H +#endif //LIBTGVOIP_AUDIOINPUTHAIKU_H -diff --git a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioOutputHaiku.cpp b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioOutputHaiku.cpp +diff --git a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioOutputHaiku.cpp b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioOutputHaiku.cpp index 4454323..11650da 100644 ---- a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioOutputHaiku.cpp -+++ b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioOutputHaiku.cpp +--- a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioOutputHaiku.cpp ++++ b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioOutputHaiku.cpp @@ -44,7 +44,7 @@ void AudioOutputHaiku::Configure(uint32_t sampleRate, uint32_t bitsPerSample, ui (uint32)channels, media_raw_audio_format::B_AUDIO_SHORT, @@ -1037,10 +1037,10 @@ index 4454323..11650da 100644 return; } -diff --git a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioOutputHaiku.h b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioOutputHaiku.h +diff --git a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioOutputHaiku.h b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioOutputHaiku.h index 6880709..6a463fa 100644 ---- a/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioOutputHaiku.h -+++ b/libtgvoip-6ba1241cfef6c3ddf4e50e82f67afde0abc02285/os/haiku/AudioOutputHaiku.h +--- a/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioOutputHaiku.h ++++ b/libtgvoip-697eea96aa90205db4fc368df4127eef56b2a5c6/os/haiku/AudioOutputHaiku.h @@ -33,4 +33,4 @@ private: } } diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.3.9-systemqt.patch b/net-im/telegram-desktop/patches/telegram_desktop-1.3.10-systemqt.patch similarity index 100% rename from net-im/telegram-desktop/patches/telegram_desktop-1.3.9-systemqt.patch rename to net-im/telegram-desktop/patches/telegram_desktop-1.3.10-systemqt.patch diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.3.9.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.3.10.patchset similarity index 95% rename from net-im/telegram-desktop/patches/telegram_desktop-1.3.9.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-1.3.10.patchset index 0f9411022..adf756bd6 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-1.3.9.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-1.3.10.patchset @@ -1,4 +1,4 @@ -From 0a32fa61b36de7504e77573deb3c2c07dfdddec3 Mon Sep 17 00:00:00 2001 +From 4c432f6ea92d2591aca0ccc40af13e450bc8df5d Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 10 Jun 2018 10:41:50 +1000 Subject: Add haiku support @@ -157,10 +157,10 @@ index dfc7fa0..38c6308 100644 namespace base { diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp -index 1a70da9..4b7f531 100644 +index 872cebb..a6c90e5 100644 --- a/Telegram/SourceFiles/core/launcher.cpp +++ b/Telegram/SourceFiles/core/launcher.cpp -@@ -60,6 +60,10 @@ int Launcher::exec() { +@@ -61,6 +61,10 @@ int Launcher::exec() { // I don't know why path is not in QT_PLUGIN_PATH by default QCoreApplication::addLibraryPath("/usr/lib/qt/plugins"); @@ -171,7 +171,7 @@ index 1a70da9..4b7f531 100644 // without this Telegram doesn't start on Ubuntu 17.04 due GTK errors setenv("QT_STYLE_OVERRIDE", "qwerty", false); // Telegram doesn't start when extraordinary theme is set, see launchpad.net/bugs/1680943 -@@ -143,6 +147,9 @@ void Launcher::prepareSettings() { +@@ -141,6 +145,9 @@ void Launcher::prepareSettings() { case dbipMacOld: gPlatformString = qsl("MacOSold"); break; @@ -182,10 +182,10 @@ index 1a70da9..4b7f531 100644 gPlatformString = qsl("Linux64bit"); break; diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp -index e8236c4..c2858d6 100644 +index 6b4a324..cc19eb8 100644 --- a/Telegram/SourceFiles/core/update_checker.cpp +++ b/Telegram/SourceFiles/core/update_checker.cpp -@@ -630,6 +630,7 @@ bool ParseCommonMap( +@@ -633,6 +633,7 @@ bool ParseCommonMap( case dbipWindows: return "win"; case dbipMac: return "mac"; case dbipMacOld: return "mac32"; @@ -1754,7 +1754,7 @@ index 7f5c191..649255c 100644 #define FOPEN_FUNC(filename, mode) fopen(filename, mode) #define FTELLO_FUNC(stream) ftello(stream) diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp -index d91e55c..221ef96 100644 +index 1460aca..2810a1b 100644 --- a/Telegram/gyp/Telegram.gyp +++ b/Telegram/gyp/Telegram.gyp @@ -61,6 +61,7 @@ @@ -2198,7 +2198,7 @@ index 622462e..e3ba800 100644 2.16.4 -From f1400359aa156ebcc48f2568d0baec36044a2389 Mon Sep 17 00:00:00 2001 +From 5912a51cb8db843b75e99e7aea1612ee6d5ed512 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sun, 10 Jun 2018 14:50:46 +1000 Subject: Adapt code to new API @@ -2260,17 +2260,17 @@ index b303e1d..1928257 100644 2.16.4 -From b2b3c15725e59b8d127ebead6db2b8021717f0e2 Mon Sep 17 00:00:00 2001 +From 9ea33b942ed72a8dcaf2c63cd02f0db2925c4b89 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 28 Jun 2018 00:02:04 +1000 Subject: Fix range include path diff --git a/Telegram/gyp/lib_export.gyp b/Telegram/gyp/lib_export.gyp -index 0d368e2..847f82b 100644 +index 2d1ac6c..d26d7c4 100644 --- a/Telegram/gyp/lib_export.gyp +++ b/Telegram/gyp/lib_export.gyp -@@ -44,7 +44,7 @@ +@@ -48,7 +48,7 @@ 'include_dirs': [ '<(src_loc)', '<(SHARED_INTERMEDIATE_DIR)', @@ -2283,17 +2283,17 @@ index 0d368e2..847f82b 100644 2.16.4 -From ca597937ca31a50c3dd800c385f457219ba4da92 Mon Sep 17 00:00:00 2001 +From 5d20154caa716393e5ae89ecd3114173743abdc5 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 2 Jul 2018 17:24:39 +1000 Subject: gcc7 segfault on this code. export is broken now. diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp -index 0cc79f7..22d0f16 100644 +index f835dc2..cb8cd96 100644 --- a/Telegram/SourceFiles/export/data/export_data_types.cpp +++ b/Telegram/SourceFiles/export/data/export_data_types.cpp -@@ -168,6 +168,8 @@ Image ParseMaxImage( +@@ -210,6 +210,8 @@ Image ParseMaxImage( const MTPVector &data, const QString &suggestedPath) { auto result = Image(); @@ -2302,7 +2302,7 @@ index 0cc79f7..22d0f16 100644 result.file.suggestedPath = suggestedPath; auto maxArea = int64(0); -@@ -190,6 +192,7 @@ Image ParseMaxImage( +@@ -232,6 +234,7 @@ Image ParseMaxImage( } }); } @@ -2311,10 +2311,10 @@ index 0cc79f7..22d0f16 100644 } diff --git a/Telegram/SourceFiles/export/export_api_wrap.cpp b/Telegram/SourceFiles/export/export_api_wrap.cpp -index 34ddd1b..afcfc67 100644 +index b618937..272f1dc 100644 --- a/Telegram/SourceFiles/export/export_api_wrap.cpp +++ b/Telegram/SourceFiles/export/export_api_wrap.cpp -@@ -709,6 +709,8 @@ void ApiWrap::requestUserpics( +@@ -708,6 +708,8 @@ void ApiWrap::requestUserpics( void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) { Expects(_userpicsProcess != nullptr); @@ -2323,7 +2323,7 @@ index 34ddd1b..afcfc67 100644 result.match([&](const auto &data) { if constexpr (MTPDphotos_photos::Is()) { _userpicsProcess->lastSlice = true; -@@ -717,6 +719,7 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) { +@@ -716,6 +718,7 @@ void ApiWrap::handleUserpicsSlice(const MTPphotos_Photos &result) { data.vphotos, _userpicsProcess->processed)); }); @@ -2331,7 +2331,7 @@ index 34ddd1b..afcfc67 100644 } void ApiWrap::loadUserpicsFiles(Data::UserpicsSlice &&slice) { -@@ -1116,7 +1119,8 @@ void ApiWrap::appendChatsSlice( +@@ -1129,7 +1132,8 @@ void ApiWrap::appendChatsSlice( void ApiWrap::requestMessagesSlice() { Expects(_chatProcess != nullptr); @@ -2341,7 +2341,7 @@ index 34ddd1b..afcfc67 100644 requestChatMessages( _chatProcess->info.splits[_chatProcess->localSplitIndex], _chatProcess->largestIdPlusOne, -@@ -1139,6 +1143,7 @@ void ApiWrap::requestMessagesSlice() { +@@ -1152,6 +1156,7 @@ void ApiWrap::requestMessagesSlice() { _chatProcess->info.relativePath)); }); }); @@ -2352,3 +2352,94 @@ index 34ddd1b..afcfc67 100644 -- 2.16.4 + +From f34764e69791334618186bc5413cccd3152e371f Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sat, 28 Jul 2018 15:08:08 +1000 +Subject: gcc7 segfault on this code. export is broken now. + + +diff --git a/Telegram/SourceFiles/export/data/export_data_types.cpp b/Telegram/SourceFiles/export/data/export_data_types.cpp +index cb8cd96..2cb86b9 100644 +--- a/Telegram/SourceFiles/export/data/export_data_types.cpp ++++ b/Telegram/SourceFiles/export/data/export_data_types.cpp +@@ -389,6 +389,7 @@ Document ParseDocument( + const MTPDocument &data, + const QString &suggestedFolder) { + auto result = Document(); ++#ifndef __HAIKU__ + data.match([&](const MTPDdocument &data) { + result.id = data.vid.v; + result.date = data.vdate.v; +@@ -425,6 +426,7 @@ Document ParseDocument( + }, [&](const MTPDdocumentEmpty &data) { + result.id = data.vid.v; + }); ++#endif + return result; + } + +@@ -1018,6 +1020,7 @@ Message ParseMessage( + const MTPMessage &data, + const QString &mediaFolder) { + auto result = Message(); ++#ifndef __HAIKU__ + data.match([&](const auto &data) { + result.id = data.vid.v; + if constexpr (!MTPDmessageEmpty::Is()) { +@@ -1104,6 +1107,7 @@ Message ParseMessage( + }, [&](const MTPDmessageEmpty &data) { + result.id = data.vid.v; + }); ++#endif + return result; + } + +-- +2.16.4 + + +From 18e78b2819f9e23b56844aefa4844cce23c799f6 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sat, 28 Jul 2018 20:58:12 +1000 +Subject: Add updater paths for haiku + + +diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp +index cc19eb8..2725edd 100644 +--- a/Telegram/SourceFiles/core/update_checker.cpp ++++ b/Telegram/SourceFiles/core/update_checker.cpp +@@ -2069,6 +2069,9 @@ bool checkReadyUpdate() { + #elif defined Q_OS_LINUX // Q_OS_MAC + QString curUpdater = (cExeDir() + qsl("Updater")); + QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater")); ++#elif defined Q_OS_HAIKU // Q_OS_LINUX ++ QString curUpdater = (cExeDir() + qsl("Updater")); ++ QFileInfo updater(cWorkingDir() + qsl("tupdates/temp/Updater")); + #endif // Q_OS_LINUX + if (!updater.exists()) { + QFileInfo current(curUpdater); +-- +2.16.4 + + +From 14d4c9c645a1b1b3cabbff9dad7f9e8fef4a85e9 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Sat, 28 Jul 2018 20:59:18 +1000 +Subject: Add lzma library + + +diff --git a/Telegram/gyp/telegram_haiku.gypi b/Telegram/gyp/telegram_haiku.gypi +index 96b6190..171c216 100644 +--- a/Telegram/gyp/telegram_haiku.gypi ++++ b/Telegram/gyp/telegram_haiku.gypi +@@ -45,6 +45,7 @@ + 'minizip', + 'opus', + 'network', ++ 'lzma', + 'z', + # ' /dev/null --libs <@(pkgconfig_libs))', + ], +-- +2.16.4 diff --git a/net-im/telegram-desktop/telegram_desktop-1.3.9.recipe b/net-im/telegram-desktop/telegram_desktop-1.3.10.recipe similarity index 95% rename from net-im/telegram-desktop/telegram_desktop-1.3.9.recipe rename to net-im/telegram-desktop/telegram_desktop-1.3.10.recipe index 87277420f..f0308cefe 100644 --- a/net-im/telegram-desktop/telegram_desktop-1.3.9.recipe +++ b/net-im/telegram-desktop/telegram_desktop-1.3.10.recipe @@ -3,15 +3,15 @@ DESCRIPTION="Official desktop version of Telegram messaging app." HOMEPAGE="https://www.telegram.org/" COPYRIGHT="2013-2018 Telegram" LICENSE="GNU GPL v3" -REVISION="3" +REVISION="1" SOURCE_URI="https://github.com/telegramdesktop/tdesktop/archive/v$portVersion.tar.gz" SOURCE_DIR="tdesktop-$portVersion" -CHECKSUM_SHA256="fd52433dac14a6643114e8f5ff9d38c709141bfca8461cce47fa93e9ef8b45b2" +CHECKSUM_SHA256="2cdf89859be93196def45145fabbbbeff6c54743f84fe2a1809d66644aac243c" -COMMIT_2="6ba1241cfef6c3ddf4e50e82f67afde0abc02285" +COMMIT_2="697eea96aa90205db4fc368df4127eef56b2a5c6" SOURCE_URI_2="https://github.com/telegramdesktop/libtgvoip/archive/$COMMIT_2.zip" -CHECKSUM_SHA256_2="24d75490fcd405a90a56074d396189f75dd0c859bee74de1c01478685ba634c0" +CHECKSUM_SHA256_2="3028061037a181c1ae9088a1f8e6ae8524858b647f218370323dff33fcfeebb9" COMMIT_3="550ac2f159ca883d360c196149b466955c77a573" SOURCE_URI_3="https://github.com/mapbox/variant/archive/$COMMIT_3.zip"