From a5749858794a44df24050c372e0eef18901a012a Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Fri, 9 Oct 2020 13:29:01 +1000 Subject: [PATCH] Telegram: bump version --- ...et => telegram_desktop-2.4.3-owt.patchset} | 148 +++++++++--------- ...tchset => telegram_desktop-2.4.3.patchset} | 0 ...2.recipe => telegram_desktop-2.4.3.recipe} | 7 +- 3 files changed, 77 insertions(+), 78 deletions(-) rename net-im/telegram-desktop/patches/{telegram_desktop-2.4.2-owt.patchset => telegram_desktop-2.4.3-owt.patchset} (79%) rename net-im/telegram-desktop/patches/{telegram_desktop-2.4.2.patchset => telegram_desktop-2.4.3.patchset} (100%) rename net-im/telegram-desktop/{telegram_desktop-2.4.2.recipe => telegram_desktop-2.4.3.recipe} (96%) diff --git a/net-im/telegram-desktop/patches/telegram_desktop-2.4.2-owt.patchset b/net-im/telegram-desktop/patches/telegram_desktop-2.4.3-owt.patchset similarity index 79% rename from net-im/telegram-desktop/patches/telegram_desktop-2.4.2-owt.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-2.4.3-owt.patchset index e384d3b46..332c97a5a 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-2.4.2-owt.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-2.4.3-owt.patchset @@ -4,10 +4,10 @@ Date: Thu, 1 Oct 2020 10:18:46 +1000 Subject: Add Haiku support -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/CMakeLists.txt b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/CMakeLists.txt +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/CMakeLists.txt b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/CMakeLists.txt index 6fbc0da..c8ca5ef 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/CMakeLists.txt -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/CMakeLists.txt +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/CMakeLists.txt ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/CMakeLists.txt @@ -42,7 +42,7 @@ include(cmake/libusrsctp.cmake) include(cmake/libvpx.cmake) include(cmake/libwebrtcbuild.cmake) @@ -70,10 +70,10 @@ index 6fbc0da..c8ca5ef 100644 set(platform_export libevent ) -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/libusrsctp.cmake b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/libusrsctp.cmake +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/cmake/libusrsctp.cmake b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/cmake/libusrsctp.cmake index caa0529..1bb82e9 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/libusrsctp.cmake -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/libusrsctp.cmake +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/cmake/libusrsctp.cmake ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/cmake/libusrsctp.cmake @@ -25,6 +25,11 @@ elseif (APPLE) PRIVATE -U__APPLE__ @@ -86,10 +86,10 @@ index caa0529..1bb82e9 100644 else() target_compile_definitions(libusrsctp PRIVATE -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/libwebrtcbuild.cmake b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/libwebrtcbuild.cmake +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/cmake/libwebrtcbuild.cmake b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/cmake/libwebrtcbuild.cmake index c3520b8..9c0d9c2 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/libwebrtcbuild.cmake -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/libwebrtcbuild.cmake +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/cmake/libwebrtcbuild.cmake ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/cmake/libwebrtcbuild.cmake @@ -17,8 +17,8 @@ INTERFACE WEBRTC_USE_H264 WEBRTC_LIBRARY_IMPL @@ -114,10 +114,10 @@ index c3520b8..9c0d9c2 100644 else() target_compile_definitions(libwebrtcbuild INTERFACE -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/nice_target_sources.cmake b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/nice_target_sources.cmake +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/cmake/nice_target_sources.cmake b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/cmake/nice_target_sources.cmake index cfc6aeb..699d0e6 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/nice_target_sources.cmake -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/nice_target_sources.cmake +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/cmake/nice_target_sources.cmake ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/cmake/nice_target_sources.cmake @@ -15,6 +15,7 @@ function(nice_target_sources target_name src_loc) set(not_win_sources "") set(not_mac_sources "") @@ -156,10 +156,10 @@ index cfc6aeb..699d0e6 100644 else() set_source_files_properties(${not_linux_sources} PROPERTIES HEADER_FILE_ONLY TRUE) set_source_files_properties(${not_linux_sources} PROPERTIES SKIP_AUTOGEN TRUE) -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/api/task_queue/BUILD.gn b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/api/task_queue/BUILD.gn +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/api/task_queue/BUILD.gn b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/api/task_queue/BUILD.gn index 4c9f591..e93c715 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/api/task_queue/BUILD.gn -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/api/task_queue/BUILD.gn +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/api/task_queue/BUILD.gn ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/api/task_queue/BUILD.gn @@ -76,7 +76,7 @@ rtc_library("default_task_queue_factory") { sources = [ "default_task_queue_factory.h" ] deps = [ ":task_queue" ] @@ -169,11 +169,11 @@ index 4c9f591..e93c715 100644 sources += [ "default_task_queue_factory_libevent.cc" ] deps += [ "../../rtc_base:rtc_task_queue_libevent" ] } else if (is_mac || is_ios) { -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/modules/video_capture/haiku/device_info_haiku.cc b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/modules/video_capture/haiku/device_info_haiku.cc +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/modules/video_capture/haiku/device_info_haiku.cc b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/modules/video_capture/haiku/device_info_haiku.cc new file mode 100644 index 0000000..6f1c551 --- /dev/null -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/modules/video_capture/haiku/device_info_haiku.cc ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/modules/video_capture/haiku/device_info_haiku.cc @@ -0,0 +1,69 @@ +#include "modules/video_capture/haiku/device_info_haiku.h" + @@ -244,11 +244,11 @@ index 0000000..6f1c551 + +} // namespace videocapturemodule +} // namespace webrtc -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/modules/video_capture/haiku/device_info_haiku.h b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/modules/video_capture/haiku/device_info_haiku.h +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/modules/video_capture/haiku/device_info_haiku.h b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/modules/video_capture/haiku/device_info_haiku.h new file mode 100644 index 0000000..96352fa --- /dev/null -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/modules/video_capture/haiku/device_info_haiku.h ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/modules/video_capture/haiku/device_info_haiku.h @@ -0,0 +1,36 @@ +#ifndef MODULES_VIDEO_CAPTURE_MAIN_SOURCE_HAIKU_DEVICE_INFO_HAIKU_H_ +#define MODULES_VIDEO_CAPTURE_MAIN_SOURCE_HAIKU_DEVICE_INFO_HAIKU_H_ @@ -286,11 +286,11 @@ index 0000000..96352fa +} // namespace videocapturemodule +} // namespace webrtc +#endif // MODULES_VIDEO_CAPTURE_MAIN_SOURCE_HAIKU_DEVICE_INFO_HAIKU_H_ -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/modules/video_capture/haiku/video_capture_haiku.cc b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/modules/video_capture/haiku/video_capture_haiku.cc +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/modules/video_capture/haiku/video_capture_haiku.cc b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/modules/video_capture/haiku/video_capture_haiku.cc new file mode 100644 index 0000000..94a79df --- /dev/null -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/modules/video_capture/haiku/video_capture_haiku.cc ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/modules/video_capture/haiku/video_capture_haiku.cc @@ -0,0 +1,29 @@ +#include "modules/video_capture/haiku/video_capture_haiku.h" + @@ -321,11 +321,11 @@ index 0000000..94a79df +} +} // namespace videocapturemodule +} // namespace webrtc -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/modules/video_capture/haiku/video_capture_haiku.h b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/modules/video_capture/haiku/video_capture_haiku.h +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/modules/video_capture/haiku/video_capture_haiku.h b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/modules/video_capture/haiku/video_capture_haiku.h new file mode 100644 index 0000000..55a27fc --- /dev/null -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/modules/video_capture/haiku/video_capture_haiku.h ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/modules/video_capture/haiku/video_capture_haiku.h @@ -0,0 +1,20 @@ +#ifndef MODULES_VIDEO_CAPTURE_MAIN_SOURCE_HAIKU_VIDEO_CAPTURE_HAIKU_H_ +#define MODULES_VIDEO_CAPTURE_MAIN_SOURCE_HAIKU_VIDEO_CAPTURE_HAIKU_H_ @@ -347,10 +347,10 @@ index 0000000..55a27fc +} // namespace webrtc + +#endif // MODULES_VIDEO_CAPTURE_MAIN_SOURCE_HAIKU_VIDEO_CAPTURE_HAIKU_H_ -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/BUILD.gn b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/BUILD.gn +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/BUILD.gn b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/BUILD.gn index d078482..fe48338 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/BUILD.gn -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/BUILD.gn +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/BUILD.gn ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/BUILD.gn @@ -450,7 +450,7 @@ rtc_source_set("rtc_operations_chain") { ] } @@ -360,10 +360,10 @@ index d078482..fe48338 100644 rtc_library("rtc_task_queue_libevent") { visibility = [ "../api/task_queue:default_task_queue_factory" ] sources = [ -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/ip_address.cc b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/ip_address.cc +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/ip_address.cc b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/ip_address.cc index 9dd534c..aadf0fd 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/ip_address.cc -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/ip_address.cc +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/ip_address.cc ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/ip_address.cc @@ -11,6 +11,9 @@ #if defined(WEBRTC_POSIX) #include @@ -398,10 +398,10 @@ index 9dd534c..aadf0fd 100644 static bool IPIsHelper(const IPAddress& ip, const in6_addr& tomatch, -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/logging.cc b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/logging.cc +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/logging.cc b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/logging.cc index ff7369d..1208f3e 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/logging.cc -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/logging.cc +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/logging.cc ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/logging.cc @@ -114,7 +114,11 @@ LogMessage::LogMessage(const char* file, if (thread_) { @@ -414,10 +414,10 @@ index ff7369d..1208f3e 100644 } if (file != nullptr) { -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/network.cc b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/network.cc +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/network.cc b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/network.cc index ffa8f94..29b50ab 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/network.cc -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/network.cc +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/network.cc ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/network.cc @@ -483,7 +483,7 @@ void BasicNetworkManager::ConvertIfAddrs(struct ifaddrs* interfaces, continue; } @@ -427,10 +427,10 @@ index ffa8f94..29b50ab 100644 continue; } // Skip unknown family. -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/physical_socket_server.cc b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/physical_socket_server.cc +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/physical_socket_server.cc b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/physical_socket_server.cc index 0cbcb81..c0347f1 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/physical_socket_server.cc -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/physical_socket_server.cc +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/physical_socket_server.cc ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/physical_socket_server.cc @@ -70,7 +70,7 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX @@ -467,10 +467,10 @@ index 0cbcb81..c0347f1 100644 if (family_ == AF_INET6) { *slevel = IPPROTO_IPV6; *sopt = IPV6_TCLASS; -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/platform_thread_types.h b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/platform_thread_types.h +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/platform_thread_types.h b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/platform_thread_types.h index 6b9101e..0ae52e5 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/platform_thread_types.h -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/platform_thread_types.h +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/platform_thread_types.h ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/platform_thread_types.h @@ -38,6 +38,9 @@ typedef DWORD PlatformThreadRef; #elif defined(WEBRTC_FUCHSIA) typedef zx_handle_t PlatformThreadId; @@ -481,10 +481,10 @@ index 6b9101e..0ae52e5 100644 #elif defined(WEBRTC_POSIX) typedef pid_t PlatformThreadId; typedef pthread_t PlatformThreadRef; -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/system/rtc_export.h b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/system/rtc_export.h +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/system/rtc_export.h b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/system/rtc_export.h index d1eb60a..9dc761d 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/system/rtc_export.h -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/system/rtc_export.h +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/system/rtc_export.h ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/system/rtc_export.h @@ -28,7 +28,7 @@ #else // WEBRTC_WIN @@ -494,10 +494,10 @@ index d1eb60a..9dc761d 100644 #define RTC_EXPORT __attribute__((visibility("default"))) #endif -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/system/rtc_export_template.h b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/system/rtc_export_template.h +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/system/rtc_export_template.h b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/system/rtc_export_template.h index 4ac7043..5fe950f 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/system/rtc_export_template.h -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/system/rtc_export_template.h +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/system/rtc_export_template.h ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/rtc_base/system/rtc_export_template.h @@ -185,7 +185,7 @@ RTC_EXPORT_TEMPLATE_TEST(DEFAULT, ); // NOLINT @@ -507,10 +507,10 @@ index 4ac7043..5fe950f 100644 RTC_EXPORT_TEMPLATE_TEST(DEFAULT, __declspec(dllimport)); #undef RTC_EXPORT_TEMPLATE_TEST -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/abseil-cpp/absl/base/options.h b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/abseil-cpp/absl/base/options.h +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/abseil-cpp/absl/base/options.h b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/abseil-cpp/absl/base/options.h index 230bf1e..6e1b9e5 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/abseil-cpp/absl/base/options.h -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/abseil-cpp/absl/base/options.h +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/abseil-cpp/absl/base/options.h ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/abseil-cpp/absl/base/options.h @@ -100,7 +100,7 @@ // User code should not inspect this macro. To check in the preprocessor if // absl::any is a typedef of std::any, use the feature macro ABSL_USES_STD_ANY. @@ -547,10 +547,10 @@ index 230bf1e..6e1b9e5 100644 // ABSL_OPTION_USE_INLINE_NAMESPACE -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/abseil-cpp/absl/strings/match.cc b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/abseil-cpp/absl/strings/match.cc +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/abseil-cpp/absl/strings/match.cc b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/abseil-cpp/absl/strings/match.cc index 8127cb0..40a23b6 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/abseil-cpp/absl/strings/match.cc -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/abseil-cpp/absl/strings/match.cc +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/abseil-cpp/absl/strings/match.cc ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/abseil-cpp/absl/strings/match.cc @@ -19,22 +19,5 @@ namespace absl { ABSL_NAMESPACE_BEGIN @@ -574,10 +574,10 @@ index 8127cb0..40a23b6 100644 - ABSL_NAMESPACE_END } // namespace absl -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/abseil-cpp/absl/strings/match.h b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/abseil-cpp/absl/strings/match.h +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/abseil-cpp/absl/strings/match.h b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/abseil-cpp/absl/strings/match.h index 90fca98..53ada13 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/abseil-cpp/absl/strings/match.h -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/abseil-cpp/absl/strings/match.h +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/abseil-cpp/absl/strings/match.h ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/abseil-cpp/absl/strings/match.h @@ -35,7 +35,9 @@ #include @@ -622,10 +622,10 @@ index 90fca98..53ada13 100644 ABSL_NAMESPACE_END } // namespace absl -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp index 8aa67f1..5c2b6e1 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp @@ -48,7 +48,7 @@ #include #include @@ -655,10 +655,10 @@ index 8aa67f1..5c2b6e1 100644 #elif defined(__EMSCRIPTEN__) // There is not yet a way to determine CPU count in emscripten JS environment. -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h index 9847624..82409dd 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD: head/sys/netinet/sctp.h 356357 2020-01-04 20:33:12Z tuexen $ #ifndef _NETINET_SCTP_H_ #define _NETINET_SCTP_H_ @@ -668,10 +668,10 @@ index 9847624..82409dd 100644 #include #endif -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c index 5afe781..e1d99a7 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c @@ -6304,7 +6304,7 @@ sctp_input(i_pak, va_alist) #if defined(__Windows__) NTOHS(ip->ip_len); @@ -690,10 +690,10 @@ index 5afe781..e1d99a7 100644 length = ip->ip_len; #else length = ip->ip_len + iphlen; -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h index f09cb8d..c26fad1 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h @@ -277,7 +277,7 @@ typedef char* caddr_t; #else /* !defined(Userspace_os_Windows) */ @@ -712,10 +712,10 @@ index f09cb8d..c26fad1 100644 int timingsafe_bcmp(const void *, const void *, size_t); #endif -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c index 28922b6..dba15fd 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c @@ -94,7 +94,7 @@ sctp_userspace_set_threadname(const char *name) #endif } @@ -743,10 +743,10 @@ index 28922b6..dba15fd 100644 int timingsafe_bcmp(const void *b1, const void *b2, size_t n) { -diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c +diff --git a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c index 146a6d9..63a6240 100644 ---- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c -+++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c +--- a/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c ++++ b/tg_owt-c73a4718cbff7048373a63db32068482e5fd11ef/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c @@ -50,6 +50,9 @@ #if defined(__Userspace_os_Linux) #define __FAVOR_BSD /* (on Ubuntu at least) enables UDP header field names like BSD in RFC 768 */ diff --git a/net-im/telegram-desktop/patches/telegram_desktop-2.4.2.patchset b/net-im/telegram-desktop/patches/telegram_desktop-2.4.3.patchset similarity index 100% rename from net-im/telegram-desktop/patches/telegram_desktop-2.4.2.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-2.4.3.patchset diff --git a/net-im/telegram-desktop/telegram_desktop-2.4.2.recipe b/net-im/telegram-desktop/telegram_desktop-2.4.3.recipe similarity index 96% rename from net-im/telegram-desktop/telegram_desktop-2.4.2.recipe rename to net-im/telegram-desktop/telegram_desktop-2.4.3.recipe index 1b8cdc5bc..b41effbae 100644 --- a/net-im/telegram-desktop/telegram_desktop-2.4.2.recipe +++ b/net-im/telegram-desktop/telegram_desktop-2.4.3.recipe @@ -4,14 +4,13 @@ HOMEPAGE="https://www.telegram.org/" COPYRIGHT="2013-2020 Telegram" LICENSE="GNU GPL v3" REVISION="1" - SOURCE_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v$portVersion/tdesktop-$portVersion-full.tar.gz" -CHECKSUM_SHA256="10c4d422d5d0fdac5dc0301c8a2acc828435cbf217b4574cf8d37e4323b68e59" +CHECKSUM_SHA256="56de48ea5332b3e113423e286f42a7b06e3059cadfed862c3164384ebebd4895" SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz" SOURCE_DIR="tdesktop-$portVersion-full" -srcGitRev_2="7a9d4bd6d9a147d15e3c8fa818a716c31f65606a" +srcGitRev_2="c73a4718cbff7048373a63db32068482e5fd11ef" SOURCE_URI_2="https://github.com/desktop-app/tg_owt/archive/$srcGitRev_2.tar.gz" -CHECKSUM_SHA256_2="0c3d2476b218333ea5051b4a5364545a4a27a1d04001b1ce4843e038fba45130" +CHECKSUM_SHA256_2="736fd171f198b5a88b99f2ec717c39d0396e7c45e0adf95146f4b5e66f5cd0a8" SOURCE_FILENAME_2="tg_owt-$srcGitRev_2.tar.gz" srcGitRev_3="0663103551379b958b2e79c51d51d163ec484300" SOURCE_URI_3="https://salsa.debian.org/debian/telegram-desktop/raw/$srcGitRev_3/debian/rules#noarchive"