diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.2.21-libtgvoip.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.2.24-libtgvoip.patchset similarity index 60% rename from net-im/telegram-desktop/patches/telegram_desktop-1.2.21-libtgvoip.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-1.2.24-libtgvoip.patchset index 37bdb2289..2683f81cc 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-1.2.21-libtgvoip.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-1.2.24-libtgvoip.patchset @@ -1,13 +1,13 @@ -From 5eb650e32842dd21d764aad9ea8f9977b4b11477 Mon Sep 17 00:00:00 2001 +From 03e063f72e9495ce1974aa41b4e708abf3695796 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 21 May 2018 20:18:03 +1000 +Date: Fri, 25 May 2018 22:46:39 +1000 Subject: Fix opus header path -diff --git a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/OpusDecoder.h b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/OpusDecoder.h -index 1a88ce5..e8389f5 100644 ---- a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/OpusDecoder.h -+++ b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/OpusDecoder.h +diff --git a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/OpusDecoder.h b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/OpusDecoder.h +index 69346ee..5cd00dc 100644 +--- a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/OpusDecoder.h ++++ b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/OpusDecoder.h @@ -9,7 +9,11 @@ @@ -20,10 +20,10 @@ index 1a88ce5..e8389f5 100644 #include "threading.h" #include "BlockingQueue.h" #include "BufferPool.h" -diff --git a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/OpusEncoder.h b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/OpusEncoder.h -index 9329f89..b2a9305 100644 ---- a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/OpusEncoder.h -+++ b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/OpusEncoder.h +diff --git a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/OpusEncoder.h b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/OpusEncoder.h +index aaf3da1..b86d6f6 100644 +--- a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/OpusEncoder.h ++++ b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/OpusEncoder.h @@ -9,7 +9,11 @@ @@ -40,16 +40,16 @@ index 9329f89..b2a9305 100644 2.16.2 -From 19836869446c2ef6c5883caab8e748801963c952 Mon Sep 17 00:00:00 2001 +From d135d442d303ba2cf2ed93256c2833205c31e7de Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 21 May 2018 20:19:19 +1000 -Subject: Add haiku +Date: Fri, 25 May 2018 22:49:20 +1000 +Subject: Add haiku support -diff --git a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/audio/AudioInput.cpp b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/audio/AudioInput.cpp -index cc552ab..5b7b8eb 100644 ---- a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/audio/AudioInput.cpp -+++ b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/audio/AudioInput.cpp +diff --git a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/audio/AudioInput.cpp b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/audio/AudioInput.cpp +index 062ca06..348d13c 100644 +--- a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/audio/AudioInput.cpp ++++ b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/audio/AudioInput.cpp @@ -22,6 +22,8 @@ #elif defined(__linux__) #include "../os/linux/AudioInputALSA.h" @@ -59,11 +59,11 @@ index cc552ab..5b7b8eb 100644 #else #error "Unsupported operating system" #endif -diff --git a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/audio/AudioOutput.cpp b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/audio/AudioOutput.cpp -index a6364bc..0e5516a 100644 ---- a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/audio/AudioOutput.cpp -+++ b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/audio/AudioOutput.cpp -@@ -23,6 +23,8 @@ +diff --git a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/audio/AudioOutput.cpp b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/audio/AudioOutput.cpp +index da964ec..b19c5ce 100644 +--- a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/audio/AudioOutput.cpp ++++ b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/audio/AudioOutput.cpp +@@ -25,6 +25,8 @@ #elif defined(__linux__) #include "../os/linux/AudioOutputALSA.h" #include "../os/linux/AudioOutputPulse.h" @@ -72,10 +72,10 @@ index a6364bc..0e5516a 100644 #else #error "Unsupported operating system" #endif -diff --git a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/libtgvoip.gyp b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/libtgvoip.gyp +diff --git a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/libtgvoip.gyp b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/libtgvoip.gyp index 5ff19f6..9523ea3 100644 ---- a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/libtgvoip.gyp -+++ b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/libtgvoip.gyp +--- a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/libtgvoip.gyp ++++ b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/libtgvoip.gyp @@ -87,18 +87,12 @@ '<(tgvoip_src_loc)/os/darwin/AudioUnitIO.h', '<(tgvoip_src_loc)/os/darwin/DarwinSpecific.mm', @@ -136,100 +136,11 @@ index 5ff19f6..9523ea3 100644 [ '"<(OS)" == "linux"', { 'defines': [ -diff --git a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/os/posix/NetworkSocketPosix.cpp b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/os/posix/NetworkSocketPosix.cpp -index a0ddd5f..f55f054 100644 ---- a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/os/posix/NetworkSocketPosix.cpp -+++ b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/os/posix/NetworkSocketPosix.cpp -@@ -40,6 +40,7 @@ NetworkSocketPosix::~NetworkSocketPosix(){ - } - - void NetworkSocketPosix::SetMaxPriority(){ -+#ifndef __HAIKU__ - #ifdef __APPLE__ - int prio=NET_SERVICE_TYPE_VO; - int res=setsockopt(fd, SOL_SOCKET, SO_NET_SERVICE_TYPE, &prio, sizeof(prio)); -@@ -58,6 +59,7 @@ void NetworkSocketPosix::SetMaxPriority(){ - LOGE("error setting ip tos: %d / %s", errno, strerror(errno)); - } - #endif -+#endif - } - - void NetworkSocketPosix::Send(NetworkPacket *packet){ -@@ -299,6 +301,10 @@ void NetworkSocketPosix::OnActiveInterfaceChanged(){ - } - - std::string NetworkSocketPosix::GetLocalInterfaceInfo(IPv4Address *v4addr, IPv6Address *v6addr){ -+#ifdef __HAIKU__ -+ std::string name=""; -+ return name; -+#else - struct ifconf ifc; - struct ifreq* ifr; - char buf[16384]; -@@ -348,6 +354,7 @@ std::string NetworkSocketPosix::GetLocalInterfaceInfo(IPv4Address *v4addr, IPv6A - } - close(sd); - return name; -+#endif - } - - uint16_t NetworkSocketPosix::GetLocalPort(){ -diff --git a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/threading.h b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/threading.h -index 8a6f438..c45d3fb 100644 ---- a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/threading.h -+++ b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/threading.h -@@ -7,7 +7,7 @@ - #ifndef __THREADING_H - #define __THREADING_H - --#if defined(_POSIX_THREADS) || defined(_POSIX_VERSION) || defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__)) -+#if defined(_POSIX_THREADS) || defined(_POSIX_VERSION) || defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__)) || defined(__HAIKU__) - - #include - #include -@@ -19,7 +19,7 @@ typedef pthread_cond_t tgvoip_lock_t; - - #define start_thread(ref, entry, arg) pthread_create(&ref, NULL, entry, arg) - #define join_thread(thread) pthread_join(thread, NULL) --#ifndef __APPLE__ -+#if !defined(__APPLE__) && !defined(__HAIKU__) - #define set_thread_name(thread, name) pthread_setname_np(thread, name) - #else - #define set_thread_name(thread, name) -diff --git a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/webrtc_dsp/webrtc/common_audio/signal_processing/spl_init.c b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/webrtc_dsp/webrtc/common_audio/signal_processing/spl_init.c -index c9c4e65..9d93596 100644 ---- a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/webrtc_dsp/webrtc/common_audio/signal_processing/spl_init.c -+++ b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/webrtc_dsp/webrtc/common_audio/signal_processing/spl_init.c -@@ -99,7 +99,12 @@ static void once(void (*func)(void)) { - static pthread_once_t lock = PTHREAD_ONCE_INIT; - pthread_once(&lock, func); - } -- -+#elif defined(__HAIKU__) -+#include -+static void once(void (*func)(void)) { -+ static pthread_once_t lock = PTHREAD_ONCE_INIT; -+ pthread_once(&lock, func); -+} - #elif defined(_WIN32) - #include - --- -2.16.2 - - -From 8a0e51e26e7f6452f5b1d047703dd0acdeb9958c Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 21 May 2018 20:20:19 +1000 -Subject: Add haiku audio input/output module - - -diff --git a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/os/haiku/AudioInputHaiku.cpp b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/os/haiku/AudioInputHaiku.cpp +diff --git a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/os/haiku/AudioInputHaiku.cpp b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/os/haiku/AudioInputHaiku.cpp new file mode 100644 -index 0000000..0bf2433 +index 0000000..7651b3d --- /dev/null -+++ b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/os/haiku/AudioInputHaiku.cpp ++++ b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/os/haiku/AudioInputHaiku.cpp @@ -0,0 +1,52 @@ +// +// libtgvoip is free and unencumbered public domain software. @@ -275,7 +186,7 @@ index 0000000..0bf2433 + isRecording=false; +} + -+void AudioInputHaiku::RunThread(){ ++void AudioInputHaiku::RunThread(void* arg){ +} + +void AudioInputHaiku::SetCurrentDevice(std::string devID){ @@ -283,12 +194,12 @@ index 0000000..0bf2433 + +void AudioInputHaiku::EnumerateDevices(std::vector& devs){ +} -diff --git a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/os/haiku/AudioInputHaiku.h b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/os/haiku/AudioInputHaiku.h +diff --git a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/os/haiku/AudioInputHaiku.h b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/os/haiku/AudioInputHaiku.h new file mode 100644 -index 0000000..e268ee5 +index 0000000..2980e71 --- /dev/null -+++ b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/os/haiku/AudioInputHaiku.h -@@ -0,0 +1,36 @@ ++++ b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/os/haiku/AudioInputHaiku.h +@@ -0,0 +1,35 @@ +// +// libtgvoip is free and unencumbered public domain software. +// For more information, see http://unlicense.org or the UNLICENSE file @@ -316,8 +227,7 @@ index 0000000..e268ee5 + static void EnumerateDevices(std::vector& devs); + +private: -+ void RunThread(); -+ tgvoip_thread_t thread; ++ void RunThread(void* arg); + bool isRecording; +}; + @@ -325,11 +235,11 @@ index 0000000..e268ee5 +} + +#endif //LIBTGVOIP_AUDIOINPUTALSA_H -diff --git a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/os/haiku/AudioOutputHaiku.cpp b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/os/haiku/AudioOutputHaiku.cpp +diff --git a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/os/haiku/AudioOutputHaiku.cpp b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/os/haiku/AudioOutputHaiku.cpp new file mode 100644 -index 0000000..c5d88b4 +index 0000000..2233257 --- /dev/null -+++ b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/os/haiku/AudioOutputHaiku.cpp ++++ b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/os/haiku/AudioOutputHaiku.cpp @@ -0,0 +1,54 @@ +// +// libtgvoip is free and unencumbered public domain software. @@ -377,7 +287,7 @@ index 0000000..c5d88b4 + return isPlaying; +} + -+void AudioOutputHaiku::RunThread(){ ++void AudioOutputHaiku::RunThread(void* arg){ +} + +void AudioOutputHaiku::SetCurrentDevice(std::string devID){ @@ -385,12 +295,12 @@ index 0000000..c5d88b4 + +void AudioOutputHaiku::EnumerateDevices(std::vector& devs){ +} -diff --git a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/os/haiku/AudioOutputHaiku.h b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/os/haiku/AudioOutputHaiku.h +diff --git a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/os/haiku/AudioOutputHaiku.h b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/os/haiku/AudioOutputHaiku.h new file mode 100644 -index 0000000..759e867 +index 0000000..e368b05 --- /dev/null -+++ b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/os/haiku/AudioOutputHaiku.h -@@ -0,0 +1,36 @@ ++++ b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/os/haiku/AudioOutputHaiku.h +@@ -0,0 +1,35 @@ +// +// libtgvoip is free and unencumbered public domain software. +// For more information, see http://unlicense.org or the UNLICENSE file @@ -418,8 +328,7 @@ index 0000000..759e867 + static void EnumerateDevices(std::vector& devs); + +private: -+ void RunThread(); -+ tgvoip_thread_t thread; ++ void RunThread(void* arg); + bool isPlaying; +}; + @@ -427,36 +336,90 @@ index 0000000..759e867 +} + +#endif //LIBTGVOIP_AudioOutputHaiku_H --- -2.16.2 - - -From 6eccbdda41ac648e2dcb6efc851e35a78cb86e5f Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 21 May 2018 20:20:37 +1000 -Subject: Fix for crash when calls - - -diff --git a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/VoIPController.cpp b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/VoIPController.cpp -index 2f793f3..7c2b523 100644 ---- a/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/VoIPController.cpp -+++ b/libtgvoip-ed3a899bbe26c56dc25e40730ca6d0e95f59717d/VoIPController.cpp -@@ -291,6 +291,7 @@ VoIPController::~VoIPController(){ - sendQueue->Put(PendingOutgoingPacket{0}); - if(openingTcpSocket) - openingTcpSocket->Close(); +diff --git a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/os/posix/NetworkSocketPosix.cpp b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/os/posix/NetworkSocketPosix.cpp +index 2bacfa4..a2e160f 100644 +--- a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/os/posix/NetworkSocketPosix.cpp ++++ b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/os/posix/NetworkSocketPosix.cpp +@@ -47,6 +47,7 @@ NetworkSocketPosix::~NetworkSocketPosix(){ + } + + void NetworkSocketPosix::SetMaxPriority(){ +#ifndef __HAIKU__ - LOGD("before join sendThread"); - join_thread(sendThread); - LOGD("before join recvThread"); -@@ -299,6 +300,7 @@ VoIPController::~VoIPController(){ - join_thread(tickThread); - free_mutex(sendBufferMutex); - LOGD("before close socket"); + #ifdef __APPLE__ + int prio=NET_SERVICE_TYPE_VO; + int res=setsockopt(fd, SOL_SOCKET, SO_NET_SERVICE_TYPE, &prio, sizeof(prio)); +@@ -65,6 +66,7 @@ void NetworkSocketPosix::SetMaxPriority(){ + LOGE("error setting ip tos: %d / %s", errno, strerror(errno)); + } + #endif ++#endif //__HAIKU__ + } + + void NetworkSocketPosix::Send(NetworkPacket *packet){ +@@ -306,6 +308,10 @@ void NetworkSocketPosix::OnActiveInterfaceChanged(){ + } + + std::string NetworkSocketPosix::GetLocalInterfaceInfo(IPv4Address *v4addr, IPv6Address *v6addr){ ++#ifdef __HAIKU__ ++ std::string name=""; ++ return name; ++#else + #ifdef __ANDROID__ + char sdkNum[PROP_VALUE_MAX]; + __system_property_get("ro.build.version.sdk", sdkNum); +@@ -397,6 +403,7 @@ std::string NetworkSocketPosix::GetLocalInterfaceInfo(IPv4Address *v4addr, IPv6A + close(sd); + } + return name; +#endif - if(udpSocket) - delete udpSocket; - if(udpSocket!=realUdpSocket) + } + + uint16_t NetworkSocketPosix::GetLocalPort(){ +diff --git a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/threading.h b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/threading.h +index 0b4933c..adc69b5 100644 +--- a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/threading.h ++++ b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/threading.h +@@ -33,7 +33,7 @@ namespace tgvoip{ + }; + } + +-#if defined(_POSIX_THREADS) || defined(_POSIX_VERSION) || defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__)) ++#if defined(_POSIX_THREADS) || defined(_POSIX_VERSION) || defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__)) || defined(__HAIKU__) + + #include + #include +@@ -94,11 +94,13 @@ namespace tgvoip{ + static void* ActualEntryPoint(void* arg){ + Thread* self=reinterpret_cast(arg); + if(self->name){ ++#ifndef __HAIKU__ + #ifndef __APPLE__ + pthread_setname_np(self->thread, self->name); + #else + pthread_setname_np(self->name); + #endif ++#endif //__HAIKU__ + } + self->entry->Invoke(self->arg); + return NULL; +diff --git a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/webrtc_dsp/webrtc/common_audio/signal_processing/spl_init.c b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/webrtc_dsp/webrtc/common_audio/signal_processing/spl_init.c +index c9c4e65..9d93596 100644 +--- a/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/webrtc_dsp/webrtc/common_audio/signal_processing/spl_init.c ++++ b/libtgvoip-00851dc6346d9c1e02d09885029e5ba32a4094e8/webrtc_dsp/webrtc/common_audio/signal_processing/spl_init.c +@@ -99,7 +99,12 @@ static void once(void (*func)(void)) { + static pthread_once_t lock = PTHREAD_ONCE_INIT; + pthread_once(&lock, func); + } +- ++#elif defined(__HAIKU__) ++#include ++static void once(void (*func)(void)) { ++ static pthread_once_t lock = PTHREAD_ONCE_INIT; ++ pthread_once(&lock, func); ++} + #elif defined(_WIN32) + #include + -- 2.16.2 diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.2.21-systemqt.patch b/net-im/telegram-desktop/patches/telegram_desktop-1.2.24-systemqt.patch similarity index 100% rename from net-im/telegram-desktop/patches/telegram_desktop-1.2.21-systemqt.patch rename to net-im/telegram-desktop/patches/telegram_desktop-1.2.24-systemqt.patch diff --git a/net-im/telegram-desktop/patches/telegram_desktop-1.2.21.patchset b/net-im/telegram-desktop/patches/telegram_desktop-1.2.24.patchset similarity index 99% rename from net-im/telegram-desktop/patches/telegram_desktop-1.2.21.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-1.2.24.patchset index 30bfc4ea6..01022604c 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-1.2.21.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-1.2.24.patchset @@ -1,4 +1,4 @@ -From 80505fb50b88d21bfa48423eee6e755d6cbdefa0 Mon Sep 17 00:00:00 2001 +From 23f7a2917ad776a989f4ef9d019171db5057d3cf Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 22 May 2018 23:50:00 +1000 Subject: Add haiku support @@ -179,7 +179,7 @@ index 386801a..9d856c8 100644 } diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp -index a773f37..9ca86b7 100644 +index a773f37..f3264ea 100644 --- a/Telegram/SourceFiles/core/launcher.cpp +++ b/Telegram/SourceFiles/core/launcher.cpp @@ -54,6 +54,10 @@ int Launcher::exec() { @@ -1690,7 +1690,7 @@ index 7aed20b..dc0212c 100644 namespace Platform { diff --git a/Telegram/SourceFiles/rpl/operators_tests.cpp b/Telegram/SourceFiles/rpl/operators_tests.cpp -index 704c447..9024600 100644 +index f7d141a..cef212b 100644 --- a/Telegram/SourceFiles/rpl/operators_tests.cpp +++ b/Telegram/SourceFiles/rpl/operators_tests.cpp @@ -5,7 +5,11 @@ the official desktop application for the Telegram messaging service. @@ -2207,7 +2207,7 @@ index 622462e..e3ba800 100644 2.16.2 -From 931c088bf9ae6e2d31c77fe8c3347aa1098023d2 Mon Sep 17 00:00:00 2001 +From bf76d5367894f06fc58f2feb94e6eb02fbd3c225 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 24 May 2018 08:30:00 +1000 Subject: gypi files templating diff --git a/net-im/telegram-desktop/telegram_desktop-1.2.21.recipe b/net-im/telegram-desktop/telegram_desktop-1.2.24.recipe similarity index 95% rename from net-im/telegram-desktop/telegram_desktop-1.2.21.recipe rename to net-im/telegram-desktop/telegram_desktop-1.2.24.recipe index 2be12d602..669b13899 100644 --- a/net-im/telegram-desktop/telegram_desktop-1.2.21.recipe +++ b/net-im/telegram-desktop/telegram_desktop-1.2.24.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="8baf4287f4f86acb83f199a69ff417c18d18ac56371f5bf8f6c0c27fdcf4e05e" +CHECKSUM_SHA256="3d3e2382e0e27fb6fad261407ade71f98e700933c6a542c10e6b05e273cf8fc3" -COMMIT_2="ed3a899bbe26c56dc25e40730ca6d0e95f59717d" +COMMIT_2="00851dc6346d9c1e02d09885029e5ba32a4094e8" SOURCE_URI_2="https://github.com/telegramdesktop/libtgvoip/archive/$COMMIT_2.zip" -CHECKSUM_SHA256_2="d9f5a2b462c0d3a6ae25004cbedf363df0d105b17c54f8e00351c034d027156b" +CHECKSUM_SHA256_2="ac0846131af3fb61649d1a1c74e75e89681427ddefc508debb143010475f769e" COMMIT_3="550ac2f159ca883d360c196149b466955c77a573" SOURCE_URI_3="https://github.com/mapbox/variant/archive/$COMMIT_3.zip"