Telegram: bump version

This commit is contained in:
Gerasim Troeglazov
2019-06-25 23:19:11 +10:00
parent 9119819b6a
commit 46368c1d89
4 changed files with 101 additions and 74 deletions

View File

@@ -1,15 +1,15 @@
From ca06e74946e133a8620f0c7392a2bd57a908d774 Mon Sep 17 00:00:00 2001
From 6c602a7f2dcce50a8ac9db790e22a85158a2d23c Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 1 Jun 2019 19:23:51 +1000
Date: Mon, 24 Jun 2019 22:45:12 +1000
Subject: Add mediakit support
diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusDecoder.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusDecoder.cpp
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/OpusDecoder.cpp b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/OpusDecoder.cpp
old mode 100755
new mode 100644
index 0ecd63e..61081f9
--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusDecoder.cpp
+++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusDecoder.cpp
--- a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/OpusDecoder.cpp
+++ b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/OpusDecoder.cpp
@@ -10,7 +10,7 @@
#include <assert.h>
#include <math.h>
@@ -19,12 +19,12 @@ index 0ecd63e..61081f9
#include <opus/opus.h>
#else
#include "opus.h"
diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusEncoder.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusEncoder.cpp
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/OpusEncoder.cpp b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/OpusEncoder.cpp
old mode 100755
new mode 100644
index 8786bf5..ab5abc4
--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusEncoder.cpp
+++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusEncoder.cpp
--- a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/OpusEncoder.cpp
+++ b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/OpusEncoder.cpp
@@ -9,7 +9,7 @@
#include <algorithm>
#include "logging.h"
@@ -34,15 +34,15 @@ index 8786bf5..ab5abc4
#include <opus/opus.h>
#else
#include "opus.h"
diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusEncoder.h b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/OpusEncoder.h
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/OpusEncoder.h b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/OpusEncoder.h
old mode 100755
new mode 100644
diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/VoIPController.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/VoIPController.cpp
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/VoIPController.cpp b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/VoIPController.cpp
old mode 100755
new mode 100644
index 618be86..672c038
--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/VoIPController.cpp
+++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/VoIPController.cpp
--- a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/VoIPController.cpp
+++ b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/VoIPController.cpp
@@ -8,6 +8,9 @@
#include <unistd.h>
#include <sys/time.h>
@@ -64,10 +64,10 @@ index 618be86..672c038
#elif defined(__APPLE__)
static pthread_once_t token = PTHREAD_ONCE_INIT;
pthread_once(&token, &initMachTimestart);
diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioIO.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioIO.cpp
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/audio/AudioIO.cpp b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/audio/AudioIO.cpp
index 2c16ca7..e00c731 100644
--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioIO.cpp
+++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioIO.cpp
--- a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/audio/AudioIO.cpp
+++ b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/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-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioInput.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioInput.cpp
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/audio/AudioInput.cpp b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/audio/AudioInput.cpp
index dae647a..4bab98c 100644
--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioInput.cpp
+++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioInput.cpp
--- a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/audio/AudioInput.cpp
+++ b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/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-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioOutput.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioOutput.cpp
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/audio/AudioOutput.cpp b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/audio/AudioOutput.cpp
index 458e8a5..1890350 100644
--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioOutput.cpp
+++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/audio/AudioOutput.cpp
--- a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/audio/AudioOutput.cpp
+++ b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/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-a19a0aff644127d8089f6a4ac18119ec5247dbd0/libtgvoip.gyp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/libtgvoip.gyp
index d0db218..0c36280 100644
--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/libtgvoip.gyp
+++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/libtgvoip.gyp
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/libtgvoip.gyp b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/libtgvoip.gyp
index b5f3b81..1d5b508 100644
--- a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/libtgvoip.gyp
+++ b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/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 d0db218..0c36280 100644
'"<(OS)" == "linux"', {
'defines': [
'WEBRTC_POSIX',
diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioInputHaiku.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioInputHaiku.cpp
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/os/haiku/AudioInputHaiku.cpp b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/os/haiku/AudioInputHaiku.cpp
new file mode 100644
index 0000000..7cce3e3
--- /dev/null
+++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioInputHaiku.cpp
+++ b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/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-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioInputHaiku.h b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioInputHaiku.h
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/os/haiku/AudioInputHaiku.h b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/os/haiku/AudioInputHaiku.h
new file mode 100644
index 0000000..1c63afe
--- /dev/null
+++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioInputHaiku.h
+++ b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/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-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioOutputHaiku.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioOutputHaiku.cpp
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/os/haiku/AudioOutputHaiku.cpp b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/os/haiku/AudioOutputHaiku.cpp
new file mode 100644
index 0000000..2fca8a1
--- /dev/null
+++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioOutputHaiku.cpp
+++ b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/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-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioOutputHaiku.h b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioOutputHaiku.h
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/os/haiku/AudioOutputHaiku.h b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/os/haiku/AudioOutputHaiku.h
new file mode 100644
index 0000000..91f2521
--- /dev/null
+++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/AudioOutputHaiku.h
+++ b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/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-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/RingBuffer.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/RingBuffer.cpp
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/os/haiku/RingBuffer.cpp b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/os/haiku/RingBuffer.cpp
new file mode 100644
index 0000000..43236d3
--- /dev/null
+++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/RingBuffer.cpp
+++ b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/os/haiku/RingBuffer.cpp
@@ -0,0 +1,130 @@
+#include <stdio.h>
+#include <stdlib.h>
@@ -803,11 +803,11 @@ index 0000000..43236d3
+{
+ return initialized?B_OK:B_ERROR;
+}
diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/RingBuffer.h b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/RingBuffer.h
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/os/haiku/RingBuffer.h b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/os/haiku/RingBuffer.h
new file mode 100644
index 0000000..4715632
--- /dev/null
+++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/haiku/RingBuffer.h
+++ b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/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-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/posix/NetworkSocketPosix.cpp b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/posix/NetworkSocketPosix.cpp
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/os/posix/NetworkSocketPosix.cpp b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/os/posix/NetworkSocketPosix.cpp
index 52eef76..c480dfb 100644
--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/posix/NetworkSocketPosix.cpp
+++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/os/posix/NetworkSocketPosix.cpp
--- a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/os/posix/NetworkSocketPosix.cpp
+++ b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/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-a19a0aff644127d8089f6a4ac18119ec5247dbd0/threading.h b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/threading.h
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/threading.h b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/threading.h
old mode 100755
new mode 100644
index 9dc2554..fc68fd4
--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/threading.h
+++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/threading.h
--- a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/threading.h
+++ b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/threading.h
@@ -9,7 +9,7 @@
#include <functional>
@@ -899,12 +899,12 @@ index 9dc2554..fc68fd4
}
self->entry();
return NULL;
diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/logging_webrtc.cc b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/logging_webrtc.cc
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/webrtc_dsp/rtc_base/logging_webrtc.cc b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/webrtc_dsp/rtc_base/logging_webrtc.cc
old mode 100755
new mode 100644
index a8d1522..991241b
--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/logging_webrtc.cc
+++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/logging_webrtc.cc
--- a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/webrtc_dsp/rtc_base/logging_webrtc.cc
+++ b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/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-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_file.h b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_file.h
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/webrtc_dsp/rtc_base/platform_file.h b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/webrtc_dsp/rtc_base/platform_file.h
old mode 100755
new mode 100644
diff --git a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_thread_types.cc b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_thread_types.cc
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/webrtc_dsp/rtc_base/platform_thread_types.cc b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/webrtc_dsp/rtc_base/platform_thread_types.cc
index 70cf237..e48948e 100644
--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_thread_types.cc
+++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_thread_types.cc
--- a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/webrtc_dsp/rtc_base/platform_thread_types.cc
+++ b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/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-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_thread_types.h b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_thread_types.h
diff --git a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/webrtc_dsp/rtc_base/platform_thread_types.h b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/webrtc_dsp/rtc_base/platform_thread_types.h
index 0bc42eb..c87cde9 100644
--- a/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_thread_types.h
+++ b/libtgvoip-a19a0aff644127d8089f6a4ac18119ec5247dbd0/webrtc_dsp/rtc_base/platform_thread_types.h
--- a/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/webrtc_dsp/rtc_base/platform_thread_types.h
+++ b/libtgvoip-0e92a22746d15157bea46faddd61b79e9964275a/webrtc_dsp/rtc_base/platform_thread_types.h
@@ -35,6 +35,9 @@ typedef DWORD PlatformThreadRef;
#elif defined(WEBRTC_FUCHSIA)
typedef zx_handle_t PlatformThreadId;

View File

@@ -1,6 +1,6 @@
From 0479cf46645731ebef710dad28d9ada4a54c8bfd Mon Sep 17 00:00:00 2001
From 1088e1c28d6ee28fc77e772fb5b555f1df199f3f Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 12 Jun 2019 22:29:33 +1000
Date: Tue, 25 Jun 2019 18:41:38 +1000
Subject: Add Haiku support
@@ -1435,7 +1435,7 @@ 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..09d6b61
index 0000000..0cc771c
--- /dev/null
+++ b/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp
@@ -0,0 +1,411 @@
@@ -1847,15 +1847,15 @@ index 0000000..09d6b61
+void psUpdateOverlayed(QWidget *widget) {
+}
+
+bool psLaunchMaps(const LocationCoords &coords) {
+bool psLaunchMaps(const Data::LocationPoint &point) {
+ return false;
+}
diff --git a/Telegram/SourceFiles/platform/haiku/specific_haiku.h b/Telegram/SourceFiles/platform/haiku/specific_haiku.h
new file mode 100644
index 0000000..90c58bc
index 0000000..6788e70
--- /dev/null
+++ b/Telegram/SourceFiles/platform/haiku/specific_haiku.h
@@ -0,0 +1,120 @@
@@ -0,0 +1,122 @@
+/*
+This file is part of Telegram Desktop for Haiku,
+
@@ -1876,7 +1876,9 @@ index 0000000..90c58bc
+
+#include <signal.h>
+
+class LocationCoords;
+namespace Data {
+class LocationPoint;
+} // namespace Data
+
+namespace Platform {
+
@@ -1975,7 +1977,7 @@ index 0000000..90c58bc
+
+//ool linuxMoveFile(const char *from, const char *to);
+
+bool psLaunchMaps(const LocationCoords &coords);
+bool psLaunchMaps(const Data::LocationPoint &point);
diff --git a/Telegram/SourceFiles/platform/linux/info_linux.h b/Telegram/SourceFiles/platform/linux/info_linux.h
index f909003..169e220 100644
--- a/Telegram/SourceFiles/platform/linux/info_linux.h
@@ -2176,18 +2178,18 @@ index 9c697fc..36ddf56 100644
#include <rpl/rpl.h>
#include <string>
diff --git a/Telegram/SourceFiles/settings/settings_notifications.cpp b/Telegram/SourceFiles/settings/settings_notifications.cpp
index 2db069b..d4c3676 100644
index 680b34d..de6f90f 100644
--- a/Telegram/SourceFiles/settings/settings_notifications.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications.cpp
@@ -602,7 +602,7 @@ void SetupNotificationsContent(not_null<Ui::VerticalLayout*> container) {
return LangKey();
return QString();
} else if (Platform::IsWindows()) {
return lng_settings_use_windows;
return tr::lng_settings_use_windows(tr::now);
- } else if (Platform::IsLinux()) {
+ } else if (Platform::IsLinux() || Platform::IsHaiku()) {
return lng_settings_use_native_notifications;
return tr::lng_settings_use_native_notifications(tr::now);
}
return LangKey();
return QString();
diff --git a/Telegram/SourceFiles/storage/storage_encrypted_file_tests.cpp b/Telegram/SourceFiles/storage/storage_encrypted_file_tests.cpp
index 4d522a9..1ca7dd0 100644
--- a/Telegram/SourceFiles/storage/storage_encrypted_file_tests.cpp
@@ -2662,10 +2664,10 @@ index d9147d6..16c9d3f 100644
'variables': {
'qrc_files': [
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
index 40351f7..3bb99bb 100644
index a6c82cb..33be044 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
@@ -576,6 +576,20 @@
@@ -588,6 +588,20 @@
<(src_loc)/platform/linux/notifications_manager_linux.h
<(src_loc)/platform/linux/specific_linux.cpp
<(src_loc)/platform/linux/specific_linux.h
@@ -2687,7 +2689,7 @@ index 40351f7..3bb99bb 100644
<(src_loc)/platform/mac/file_utilities_mac.h
<(src_loc)/platform/mac/info_mac.mm
diff --git a/Telegram/gyp/utils.gyp b/Telegram/gyp/utils.gyp
index 622462e..e3ba800 100644
index bd46332..d85a403 100644
--- a/Telegram/gyp/utils.gyp
+++ b/Telegram/gyp/utils.gyp
@@ -82,6 +82,13 @@
@@ -2707,3 +2709,28 @@ index 622462e..e3ba800 100644
--
2.21.0
From 4e3352f235a57fdbca3c807de4ce92af9fbdc5c9 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 25 Jun 2019 23:15:28 +1000
Subject: Fix for bold font
diff --git a/Telegram/SourceFiles/ui/style/style_core_font.cpp b/Telegram/SourceFiles/ui/style/style_core_font.cpp
index 060b0ab..5ed9f6f 100644
--- a/Telegram/SourceFiles/ui/style/style_core_font.cpp
+++ b/Telegram/SourceFiles/ui/style/style_core_font.cpp
@@ -59,8 +59,8 @@ FontData::FontData(int size, uint32 flags, int family, Font *other)
f.setPixelSize(size);
if (_flags & FontBold) {
f.setBold(true);
- //} else if (fontFamilies[family] == "Open Sans Semibold") {
- // f.setWeight(QFont::DemiBold);
+ } else if (fontFamilies[family] == "Open Sans Semibold") {
+ f.setWeight(QFont::DemiBold);
}
f.setItalic(_flags & FontItalic);
f.setUnderline(_flags & FontUnderline);
--
2.21.0

View File

@@ -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="80cab232f2901f740b16a54cc93d86b2eb489144353b16e78a7ef930daee5011"
CHECKSUM_SHA256="54032b9dd864424eac2a1a95f3f4254666fc99745b90be10195eb10052ed5d67"
SOURCE_FILENAME="tdesktop-$portVersion.tar.gz"
SOURCE_DIR="tdesktop-$portVersion"
srcGitRev_2="a19a0aff644127d8089f6a4ac18119ec5247dbd0"
srcGitRev_2="0e92a22746d15157bea46faddd61b79e9964275a"
SOURCE_URI_2="https://github.com/telegramdesktop/libtgvoip/archive/$srcGitRev_2.tar.gz"
CHECKSUM_SHA256_2="d839ab5a3358e171116b322e0053f441e023c9ced9aec3f0388969c2fce7ac43"
CHECKSUM_SHA256_2="ee45011d0eda61f188d9f7f077efa64551913c2c7e7250b40f3c7c3a330cd5cc"
SOURCE_FILENAME_2="libtgvoip-$srcGitRev_2.tar.gz"
srcGitRev_3="550ac2f159ca883d360c196149b466955c77a573"
SOURCE_URI_3="https://github.com/mapbox/variant/archive/$srcGitRev_3.tar.gz"
@@ -36,9 +36,9 @@ srcGitRev_8="7cc9639699f64b750c0b82333dced9ea77e8436e"
SOURCE_URI_8="https://github.com/Cyan4973/xxHash/archive/$srcGitRev_8.tar.gz"
CHECKSUM_SHA256_8="0d1e2b4ae15f98acc49084e23ba94853dba2b0f654865ecedb1072b3959421bf"
SOURCE_FILENAME_8="xxHash-$srcGitRev_8.tar.gz"
srcGitRev_9="a3fac9db920b167a5f91d678ee7968f100f6fe51"
srcGitRev_9="eeeb4edb2a087c3f8175dafafcad330864d3efc0"
SOURCE_URI_9="https://github.com/telegramdesktop/qtlottie/archive/$srcGitRev_9.tar.gz"
CHECKSUM_SHA256_9="16d4cda12e340b89007c610070c67130e87f60a85fd1206339ac92b2c71ce848"
CHECKSUM_SHA256_9="7084bceb5644a3bb07266d03a645bb66feba19eb840616e3db395036d845c0bb"
SOURCE_FILENAME_9="qtlottie-$srcGitRev_9.tar.gz"
SOURCE_URI_10="https://salsa.debian.org/debian/telegram-desktop/raw/debian/master/debian/rules#noarchive"
CHECKSUM_SHA256_10="86382a56ef7163eedbfae7e4daf491e9d3e7a8811ff2c769e6d7c143def7727f"