From 8abe49f57682b4afe1a6748a780992270e27cf93 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Thu, 1 Oct 2020 11:05:25 +1000 Subject: [PATCH] Telegram: bump version --- ...et => telegram_desktop-2.4.0-owt.patchset} | 177 +++++++++--------- ...tchset => telegram_desktop-2.4.0.patchset} | 103 ++++++---- ...2.recipe => telegram_desktop-2.4.0.recipe} | 6 +- 3 files changed, 158 insertions(+), 128 deletions(-) rename net-im/telegram-desktop/patches/{telegram_desktop-2.3.2-owt.patchset => telegram_desktop-2.4.0-owt.patchset} (77%) rename net-im/telegram-desktop/patches/{telegram_desktop-2.3.2.patchset => telegram_desktop-2.4.0.patchset} (98%) rename net-im/telegram-desktop/{telegram_desktop-2.3.2.recipe => telegram_desktop-2.4.0.recipe} (96%) diff --git a/net-im/telegram-desktop/patches/telegram_desktop-2.3.2-owt.patchset b/net-im/telegram-desktop/patches/telegram_desktop-2.4.0-owt.patchset similarity index 77% rename from net-im/telegram-desktop/patches/telegram_desktop-2.3.2-owt.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-2.4.0-owt.patchset index 298c6020a..e384d3b46 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-2.3.2-owt.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-2.4.0-owt.patchset @@ -1,13 +1,13 @@ -From ad6dad2305aa619f65151a00be75813305ced1c3 Mon Sep 17 00:00:00 2001 +From a0da97293081d53afb74195a5dc182493f6011ce Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 25 Aug 2020 09:18:26 +1000 -Subject: Fix for Haiku +Date: Thu, 1 Oct 2020 10:18:46 +1000 +Subject: Add Haiku support -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/CMakeLists.txt b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/CMakeLists.txt -index cbd13ff..587ffd7 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/CMakeLists.txt -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/CMakeLists.txt +diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/CMakeLists.txt b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/CMakeLists.txt +index 6fbc0da..c8ca5ef 100644 +--- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/CMakeLists.txt ++++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/CMakeLists.txt @@ -42,7 +42,7 @@ include(cmake/libusrsctp.cmake) include(cmake/libvpx.cmake) include(cmake/libwebrtcbuild.cmake) @@ -17,16 +17,16 @@ index cbd13ff..587ffd7 100644 include(cmake/libevent.cmake) endif() if (APPLE) -@@ -77,7 +77,7 @@ PUBLIC +@@ -94,7 +94,7 @@ PRIVATE ${libopenh264_yasm_objects} ) -if (NOT WIN32 AND NOT APPLE) +if (NOT WIN32 AND NOT APPLE AND NOT HAIKU) - target_link_libraries(tg_owt PUBLIC tg_owt::libevent) + target_link_libraries(tg_owt PRIVATE tg_owt::libevent) endif() if (APPLE) -@@ -313,6 +313,8 @@ PRIVATE +@@ -336,6 +336,8 @@ PRIVATE rtc_base/task_queue.cc rtc_base/task_queue_gcd.cc rtc_base/task_queue_gcd.h @@ -35,7 +35,7 @@ index cbd13ff..587ffd7 100644 rtc_base/task_queue_libevent.cc rtc_base/task_queue_libevent.h rtc_base/task_queue_win.cc -@@ -388,6 +390,7 @@ PRIVATE +@@ -411,6 +413,7 @@ PRIVATE api/stats_types.cc api/task_queue/default_task_queue_factory.h api/task_queue/default_task_queue_factory_gcd.cc @@ -43,7 +43,7 @@ index cbd13ff..587ffd7 100644 api/task_queue/default_task_queue_factory_libevent.cc api/task_queue/default_task_queue_factory_win.cc api/task_queue/task_queue_base.cc -@@ -1238,6 +1241,8 @@ PRIVATE +@@ -1268,6 +1271,8 @@ PRIVATE modules/video_capture/device_info_impl.cc modules/video_capture/linux/device_info_linux.cc modules/video_capture/linux/video_capture_linux.cc @@ -52,7 +52,7 @@ index cbd13ff..587ffd7 100644 modules/video_capture/windows/device_info_ds.cc modules/video_capture/windows/device_info_ds.h modules/video_capture/windows/help_functions_ds.cc -@@ -1722,7 +1727,7 @@ else() +@@ -1793,7 +1798,7 @@ else() ) endif() @@ -61,10 +61,19 @@ index cbd13ff..587ffd7 100644 remove_target_sources(tg_owt ${webrtc_loc} rtc_base/task_queue_libevent.cc rtc_base/task_queue_libevent.h -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/cmake/libusrsctp.cmake b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/cmake/libusrsctp.cmake +@@ -1809,7 +1814,7 @@ else() + endif() + + set(platform_export) +-if (NOT WIN32 AND NOT APPLE) ++if (NOT WIN32 AND NOT APPLE AND NOT HAIKU) + set(platform_export + libevent + ) +diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/libusrsctp.cmake b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/libusrsctp.cmake index caa0529..1bb82e9 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/cmake/libusrsctp.cmake -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/cmake/libusrsctp.cmake +--- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/libusrsctp.cmake ++++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/libusrsctp.cmake @@ -25,6 +25,11 @@ elseif (APPLE) PRIVATE -U__APPLE__ @@ -77,10 +86,10 @@ index caa0529..1bb82e9 100644 else() target_compile_definitions(libusrsctp PRIVATE -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/cmake/libwebrtcbuild.cmake b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/cmake/libwebrtcbuild.cmake +diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/libwebrtcbuild.cmake b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/libwebrtcbuild.cmake index c3520b8..9c0d9c2 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/cmake/libwebrtcbuild.cmake -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/cmake/libwebrtcbuild.cmake +--- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/libwebrtcbuild.cmake ++++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/libwebrtcbuild.cmake @@ -17,8 +17,8 @@ INTERFACE WEBRTC_USE_H264 WEBRTC_LIBRARY_IMPL @@ -105,10 +114,10 @@ index c3520b8..9c0d9c2 100644 else() target_compile_definitions(libwebrtcbuild INTERFACE -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/cmake/nice_target_sources.cmake b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/cmake/nice_target_sources.cmake +diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/nice_target_sources.cmake b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/nice_target_sources.cmake index cfc6aeb..699d0e6 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/cmake/nice_target_sources.cmake -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/cmake/nice_target_sources.cmake +--- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/cmake/nice_target_sources.cmake ++++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/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 "") @@ -147,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-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/api/task_queue/BUILD.gn b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/api/task_queue/BUILD.gn +diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/api/task_queue/BUILD.gn b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/api/task_queue/BUILD.gn index 4c9f591..e93c715 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/api/task_queue/BUILD.gn -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/api/task_queue/BUILD.gn +--- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/api/task_queue/BUILD.gn ++++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/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" ] @@ -160,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-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/modules/video_capture/haiku/device_info_haiku.cc b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/modules/video_capture/haiku/device_info_haiku.cc +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 new file mode 100644 index 0000000..6f1c551 --- /dev/null -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/modules/video_capture/haiku/device_info_haiku.cc ++++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/modules/video_capture/haiku/device_info_haiku.cc @@ -0,0 +1,69 @@ +#include "modules/video_capture/haiku/device_info_haiku.h" + @@ -235,11 +244,11 @@ index 0000000..6f1c551 + +} // namespace videocapturemodule +} // namespace webrtc -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/modules/video_capture/haiku/device_info_haiku.h b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/modules/video_capture/haiku/device_info_haiku.h +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 new file mode 100644 index 0000000..96352fa --- /dev/null -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/modules/video_capture/haiku/device_info_haiku.h ++++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/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_ @@ -277,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-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/modules/video_capture/haiku/video_capture_haiku.cc b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/modules/video_capture/haiku/video_capture_haiku.cc +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 new file mode 100644 index 0000000..94a79df --- /dev/null -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/modules/video_capture/haiku/video_capture_haiku.cc ++++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/modules/video_capture/haiku/video_capture_haiku.cc @@ -0,0 +1,29 @@ +#include "modules/video_capture/haiku/video_capture_haiku.h" + @@ -312,11 +321,11 @@ index 0000000..94a79df +} +} // namespace videocapturemodule +} // namespace webrtc -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/modules/video_capture/haiku/video_capture_haiku.h b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/modules/video_capture/haiku/video_capture_haiku.h +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 new file mode 100644 index 0000000..55a27fc --- /dev/null -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/modules/video_capture/haiku/video_capture_haiku.h ++++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/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_ @@ -338,10 +347,10 @@ index 0000000..55a27fc +} // namespace webrtc + +#endif // MODULES_VIDEO_CAPTURE_MAIN_SOURCE_HAIKU_VIDEO_CAPTURE_HAIKU_H_ -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/BUILD.gn b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/BUILD.gn +diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/BUILD.gn b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/BUILD.gn index d078482..fe48338 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/BUILD.gn -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/BUILD.gn +--- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/BUILD.gn ++++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/BUILD.gn @@ -450,7 +450,7 @@ rtc_source_set("rtc_operations_chain") { ] } @@ -351,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-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/ip_address.cc b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/ip_address.cc +diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/ip_address.cc b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/ip_address.cc index 9dd534c..aadf0fd 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/ip_address.cc -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/ip_address.cc +--- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/ip_address.cc ++++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/ip_address.cc @@ -11,6 +11,9 @@ #if defined(WEBRTC_POSIX) #include @@ -389,10 +398,10 @@ index 9dd534c..aadf0fd 100644 static bool IPIsHelper(const IPAddress& ip, const in6_addr& tomatch, -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/logging.cc b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/logging.cc +diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/logging.cc b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/logging.cc index ff7369d..1208f3e 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/logging.cc -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/logging.cc +--- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/logging.cc ++++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/logging.cc @@ -114,7 +114,11 @@ LogMessage::LogMessage(const char* file, if (thread_) { @@ -405,10 +414,10 @@ index ff7369d..1208f3e 100644 } if (file != nullptr) { -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/network.cc b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/network.cc +diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/network.cc b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/network.cc index ffa8f94..29b50ab 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/network.cc -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/network.cc +--- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/network.cc ++++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/network.cc @@ -483,7 +483,7 @@ void BasicNetworkManager::ConvertIfAddrs(struct ifaddrs* interfaces, continue; } @@ -418,10 +427,10 @@ index ffa8f94..29b50ab 100644 continue; } // Skip unknown family. -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/physical_socket_server.cc b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/physical_socket_server.cc +diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/physical_socket_server.cc b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/physical_socket_server.cc index 0cbcb81..c0347f1 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/physical_socket_server.cc -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/physical_socket_server.cc +--- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/physical_socket_server.cc ++++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/physical_socket_server.cc @@ -70,7 +70,7 @@ typedef void* SockOptArg; #endif // WEBRTC_POSIX @@ -458,10 +467,10 @@ index 0cbcb81..c0347f1 100644 if (family_ == AF_INET6) { *slevel = IPPROTO_IPV6; *sopt = IPV6_TCLASS; -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/platform_thread_types.h b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/platform_thread_types.h +diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/platform_thread_types.h b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/platform_thread_types.h index 6b9101e..0ae52e5 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/platform_thread_types.h -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/platform_thread_types.h +--- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/platform_thread_types.h ++++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/platform_thread_types.h @@ -38,6 +38,9 @@ typedef DWORD PlatformThreadRef; #elif defined(WEBRTC_FUCHSIA) typedef zx_handle_t PlatformThreadId; @@ -472,10 +481,10 @@ index 6b9101e..0ae52e5 100644 #elif defined(WEBRTC_POSIX) typedef pid_t PlatformThreadId; typedef pthread_t PlatformThreadRef; -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/system/rtc_export.h b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/system/rtc_export.h +diff --git a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/system/rtc_export.h b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/system/rtc_export.h index d1eb60a..9dc761d 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/system/rtc_export.h -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/system/rtc_export.h +--- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/system/rtc_export.h ++++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/system/rtc_export.h @@ -28,7 +28,7 @@ #else // WEBRTC_WIN @@ -485,10 +494,10 @@ index d1eb60a..9dc761d 100644 #define RTC_EXPORT __attribute__((visibility("default"))) #endif -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/system/rtc_export_template.h b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/system/rtc_export_template.h +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 index 4ac7043..5fe950f 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/system/rtc_export_template.h -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/rtc_base/system/rtc_export_template.h +--- a/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/system/rtc_export_template.h ++++ b/tg_owt-7a9d4bd6d9a147d15e3c8fa818a716c31f65606a/src/rtc_base/system/rtc_export_template.h @@ -185,7 +185,7 @@ RTC_EXPORT_TEMPLATE_TEST(DEFAULT, ); // NOLINT @@ -498,10 +507,10 @@ index 4ac7043..5fe950f 100644 RTC_EXPORT_TEMPLATE_TEST(DEFAULT, __declspec(dllimport)); #undef RTC_EXPORT_TEMPLATE_TEST -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/abseil-cpp/absl/base/options.h b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/abseil-cpp/absl/base/options.h +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 index 230bf1e..6e1b9e5 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/abseil-cpp/absl/base/options.h -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/abseil-cpp/absl/base/options.h +--- 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 @@ -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. @@ -538,10 +547,10 @@ index 230bf1e..6e1b9e5 100644 // ABSL_OPTION_USE_INLINE_NAMESPACE -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/abseil-cpp/absl/strings/match.cc b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/abseil-cpp/absl/strings/match.cc +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 index 8127cb0..40a23b6 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/abseil-cpp/absl/strings/match.cc -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/abseil-cpp/absl/strings/match.cc +--- 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 @@ -19,22 +19,5 @@ namespace absl { ABSL_NAMESPACE_BEGIN @@ -565,10 +574,10 @@ index 8127cb0..40a23b6 100644 - ABSL_NAMESPACE_END } // namespace absl -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/abseil-cpp/absl/strings/match.h b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/abseil-cpp/absl/strings/match.h +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 index 90fca98..53ada13 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/abseil-cpp/absl/strings/match.h -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/abseil-cpp/absl/strings/match.h +--- 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 @@ -35,7 +35,9 @@ #include @@ -613,10 +622,10 @@ index 90fca98..53ada13 100644 ABSL_NAMESPACE_END } // namespace absl -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp +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 index 8aa67f1..5c2b6e1 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/openh264/src/codec/common/src/WelsThreadLib.cpp +--- 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 @@ -48,7 +48,7 @@ #include #include @@ -646,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-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h +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 index 9847624..82409dd 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp.h +--- 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 @@ -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_ @@ -659,10 +668,10 @@ index 9847624..82409dd 100644 #include #endif -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c +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 index 5afe781..e1d99a7 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_input.c +--- 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 @@ -6304,7 +6304,7 @@ sctp_input(i_pak, va_alist) #if defined(__Windows__) NTOHS(ip->ip_len); @@ -681,10 +690,10 @@ index 5afe781..e1d99a7 100644 length = ip->ip_len; #else length = ip->ip_len + iphlen; -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h +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 index f09cb8d..c26fad1 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_os_userspace.h +--- 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 @@ -277,7 +277,7 @@ typedef char* caddr_t; #else /* !defined(Userspace_os_Windows) */ @@ -703,10 +712,10 @@ index f09cb8d..c26fad1 100644 int timingsafe_bcmp(const void *, const void *, size_t); #endif -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c +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 index 28922b6..dba15fd 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/netinet/sctp_userspace.c +--- 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 @@ -94,7 +94,7 @@ sctp_userspace_set_threadname(const char *name) #endif } @@ -734,10 +743,10 @@ index 28922b6..dba15fd 100644 int timingsafe_bcmp(const void *b1, const void *b2, size_t n) { -diff --git a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c +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 index 146a6d9..63a6240 100644 ---- a/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c -+++ b/tg_owt-102b5e7eb15af02531f6ae07eb6ba935a8e0a348/src/third_party/usrsctp/usrsctplib/usrsctplib/user_socket.c +--- 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 @@ -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.3.2.patchset b/net-im/telegram-desktop/patches/telegram_desktop-2.4.0.patchset similarity index 98% rename from net-im/telegram-desktop/patches/telegram_desktop-2.3.2.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-2.4.0.patchset index f1da20bda..8ff09cf3c 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-2.3.2.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-2.4.0.patchset @@ -1,14 +1,14 @@ -From 6f8c054743e72fabdec1a4533ca1eccdde6bd03d Mon Sep 17 00:00:00 2001 +From 85adc68f9ef667d15154ebc37c77408df0ccf270 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 25 Aug 2020 09:16:39 +1000 +Date: Thu, 1 Oct 2020 10:18:04 +1000 Subject: Add Haiku support diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt -index 600e38a..91398c1 100644 +index 8e3ea3e..c3f2345 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt -@@ -931,6 +931,16 @@ PRIVATE +@@ -930,6 +930,16 @@ PRIVATE platform/win/windows_event_filter.cpp platform/win/windows_event_filter.h platform/win/wrapper_wrl_implements_h.h @@ -26,7 +26,7 @@ index 600e38a..91398c1 100644 platform/platform_file_utilities.h platform/platform_launcher.h @@ -1144,7 +1154,7 @@ PRIVATE - settings.h + stdafx.h ) -if (NOT LINUX) @@ -57,10 +57,10 @@ index a774db0..f0e38d2 100644 rpl::variable _systemDarkModeEnabled = false; rpl::variable _windowControlsLayout; diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp -index 46066bf..1dd944e 100644 +index ee01d01..ba1f418 100644 --- a/Telegram/SourceFiles/core/launcher.cpp +++ b/Telegram/SourceFiles/core/launcher.cpp -@@ -297,7 +297,7 @@ void Launcher::init() { +@@ -300,7 +300,7 @@ void Launcher::init() { QApplication::setApplicationName(qsl("TelegramDesktop")); @@ -70,10 +70,10 @@ index 46066bf..1dd944e 100644 #endif diff --git a/Telegram/SourceFiles/core/update_checker.cpp b/Telegram/SourceFiles/core/update_checker.cpp -index c291bd2..6f8a482 100644 +index 2c4fb47..5c61bf0 100644 --- a/Telegram/SourceFiles/core/update_checker.cpp +++ b/Telegram/SourceFiles/core/update_checker.cpp -@@ -1551,7 +1551,7 @@ bool checkReadyUpdate() { +@@ -1552,7 +1552,7 @@ bool checkReadyUpdate() { ClearAll(); return false; } @@ -83,10 +83,10 @@ index c291bd2..6f8a482 100644 ClearAll(); return false; diff --git a/Telegram/SourceFiles/data/data_session.cpp b/Telegram/SourceFiles/data/data_session.cpp -index 2b3b9d6..056110d 100644 +index 1a1e286..b2bcdf7 100644 --- a/Telegram/SourceFiles/data/data_session.cpp +++ b/Telegram/SourceFiles/data/data_session.cpp -@@ -231,7 +231,7 @@ Session::Session(not_null session) +@@ -232,7 +232,7 @@ Session::Session(not_null session) _cache->open(_session->local().cacheKey()); _bigFileCache->open(_session->local().cacheBigFileKey()); @@ -96,10 +96,10 @@ index 2b3b9d6..056110d 100644 if (wasVersion >= 1007011 && wasVersion < 1007015) { _bigFileCache->clear(); diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp -index 3bafea1..8bb7bff 100644 +index 5e20476..7f687f2 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp -@@ -625,7 +625,7 @@ void MainWindow::updateTrayMenu(bool force) { +@@ -632,7 +632,7 @@ void MainWindow::updateTrayMenu(bool force) { minimizeAction->setEnabled(isVisible()); } else { updateIsActive(); @@ -108,9 +108,9 @@ index 3bafea1..8bb7bff 100644 auto toggleAction = actions.at(0); disconnect(toggleAction, SIGNAL(triggered(bool)), this, SLOT(minimizeToTray())); disconnect(toggleAction, SIGNAL(triggered(bool)), this, SLOT(showFromTray())); -@@ -759,7 +759,7 @@ void MainWindow::handleTrayIconActication( - updateTrayMenu(true); - QTimer::singleShot(1, this, SLOT(psShowTrayMenu())); +@@ -768,7 +768,7 @@ void MainWindow::handleTrayIconActication( + psShowTrayMenu(); + }); } else if (!skipTrayClick()) { - if (Platform::IsWayland() ? isVisible() : isActive()) { + if ((Platform::IsWayland() || Platform::IsHaiku()) ? isVisible() : isActive()) { @@ -118,10 +118,10 @@ index 3bafea1..8bb7bff 100644 } else { showFromTray(reason); diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp -index 0c22481..e64f232 100644 +index 99edec4..2374287 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp -@@ -353,7 +353,7 @@ OverlayWidget::OverlayWidget() +@@ -357,7 +357,7 @@ OverlayWidget::OverlayWidget() hide(); createWinId(); @@ -886,10 +886,10 @@ index 0000000..34b6aaf +} // 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..fefc57d +index 0000000..a1df976 --- /dev/null +++ b/Telegram/SourceFiles/platform/haiku/specific_haiku.cpp -@@ -0,0 +1,247 @@ +@@ -0,0 +1,259 @@ +/* +This file is part of Telegram Desktop for Haiku, + @@ -924,6 +924,14 @@ index 0000000..fefc57d +using namespace Platform; + +namespace Platform { ++namespace DesktopEnvironment { ++enum class Type { ++ Other ++}; ++Type Get() { ++ return Type::Other; ++} ++} + +QString CurrentExecutablePath(int argc, char *argv[]) { + return argc ? QFile::decodeName(argv[0]) : QString(); @@ -946,6 +954,10 @@ index 0000000..fefc57d + return false; +} + ++bool UnsetWindowExtents(QWindow *window) { ++ return false; ++} ++ +std::optional IsDarkMode() { + return std::nullopt; +} @@ -1313,10 +1325,10 @@ index 4afeadf..7e4398a 100644 #include "platform/linux/notifications_manager_linux.h" #elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_UNIX diff --git a/Telegram/SourceFiles/platform/platform_specific.h b/Telegram/SourceFiles/platform/platform_specific.h -index ec419ba..14f99ee 100644 +index cbdbb2e..1f01e94 100644 --- a/Telegram/SourceFiles/platform/platform_specific.h +++ b/Telegram/SourceFiles/platform/platform_specific.h -@@ -68,6 +68,8 @@ void finish(); +@@ -71,6 +71,8 @@ void finish(); #ifdef Q_OS_MAC #include "platform/mac/specific_mac.h" @@ -1339,10 +1351,10 @@ index 19ce0db..7597438 100644 } return QString(); diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp -index e567d93..34162a6 100644 +index 8fe85f3..03a482d 100644 --- a/Telegram/SourceFiles/window/main_window.cpp +++ b/Telegram/SourceFiles/window/main_window.cpp -@@ -114,7 +114,7 @@ QIcon CreateOfficialIcon(Main::Session *session) { +@@ -116,7 +116,7 @@ QIcon CreateOfficialIcon(Main::Session *session) { QIcon CreateIcon(Main::Session *session) { auto result = CreateOfficialIcon(session); @@ -2294,7 +2306,7 @@ index 4fe3e26..f0d3d2e 100644 target_compile_definitions(lib_tgvoip_bundled PUBLIC diff --git a/Telegram/lib_base/CMakeLists.txt b/Telegram/lib_base/CMakeLists.txt -index 540662f..84af89f 100644 +index 6330908..418d567 100644 --- a/Telegram/lib_base/CMakeLists.txt +++ b/Telegram/lib_base/CMakeLists.txt @@ -58,6 +58,18 @@ PRIVATE @@ -3045,21 +3057,30 @@ index 8dfa916..01ece83 100644 #include "api/task_queue/default_task_queue_factory.h" #include "crl/crl_object_on_thread.h" diff --git a/cmake/external/webrtc/CMakeLists.txt b/cmake/external/webrtc/CMakeLists.txt -index 1273291..7f19110 100644 +index a354057..ba0928c 100644 --- a/cmake/external/webrtc/CMakeLists.txt +++ b/cmake/external/webrtc/CMakeLists.txt -@@ -44,6 +44,11 @@ else() - INTERFACE - WEBRTC_MAC - ) -+ elseif (HAIKU) -+ target_compile_definitions(external_webrtc -+ INTERFACE -+ WEBRTC_HAIKU -+ ) - else() - target_compile_definitions(external_webrtc - INTERFACE +@@ -7,7 +7,7 @@ + add_library(external_webrtc INTERFACE IMPORTED GLOBAL) + add_library(desktop-app::external_webrtc ALIAS external_webrtc) + +-if (DESKTOP_APP_USE_PACKAGED) ++if (DESKTOP_APP_USE_PACKAGED AND NOT HAIKU) + find_package(tg_owt REQUIRED) + target_link_libraries(external_webrtc INTERFACE tg_owt::tg_owt) + else() +@@ -43,6 +43,11 @@ else() + INTERFACE + WEBRTC_MAC + ) ++ elseif (HAIKU) ++ target_compile_definitions(external_webrtc ++ INTERFACE ++ WEBRTC_HAIKU ++ ) + else() + target_compile_definitions(external_webrtc + INTERFACE diff --git a/cmake/nice_target_sources.cmake b/cmake/nice_target_sources.cmake index 81f9a7b..3b55109 100644 --- a/cmake/nice_target_sources.cmake @@ -3169,10 +3190,10 @@ index c87b135..5b488bf 100644 if (NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "linux" AND NOT DESKTOP_APP_SPECIAL_TARGET STREQUAL "linux32") diff --git a/cmake/variables.cmake b/cmake/variables.cmake -index 92141bc..ec52697 100644 +index 9e7f41f..ab58186 100644 --- a/cmake/variables.cmake +++ b/cmake/variables.cmake -@@ -65,6 +65,7 @@ set(build_osx 0) +@@ -59,6 +59,7 @@ set(build_osx 0) set(build_macstore 0) set(build_winstore 0) set(build_linux32 0) @@ -3180,7 +3201,7 @@ index 92141bc..ec52697 100644 if (WIN32) if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "uwp") -@@ -76,6 +77,12 @@ elseif (APPLE) +@@ -70,6 +71,12 @@ elseif (APPLE) elseif (DESKTOP_APP_SPECIAL_TARGET STREQUAL "macstore") set(build_macstore 1) endif() diff --git a/net-im/telegram-desktop/telegram_desktop-2.3.2.recipe b/net-im/telegram-desktop/telegram_desktop-2.4.0.recipe similarity index 96% rename from net-im/telegram-desktop/telegram_desktop-2.3.2.recipe rename to net-im/telegram-desktop/telegram_desktop-2.4.0.recipe index bf31b7f97..8afe6b452 100644 --- a/net-im/telegram-desktop/telegram_desktop-2.3.2.recipe +++ b/net-im/telegram-desktop/telegram_desktop-2.4.0.recipe @@ -6,12 +6,12 @@ LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v$portVersion/tdesktop-$portVersion-full.tar.gz" -CHECKSUM_SHA256="292631bcac4b30f778879ecd2cebf4c6f569ab5be01230c8e62b924b4211a259" +CHECKSUM_SHA256="4e50be1067fe75aeab29cb0f5e937decccd97deeda4368fcb6f48ec92230ac2e" SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz" SOURCE_DIR="tdesktop-$portVersion-full" -srcGitRev_2="102b5e7eb15af02531f6ae07eb6ba935a8e0a348" +srcGitRev_2="7a9d4bd6d9a147d15e3c8fa818a716c31f65606a" SOURCE_URI_2="https://github.com/desktop-app/tg_owt/archive/$srcGitRev_2.tar.gz" -CHECKSUM_SHA256_2="86f9a312c38443af370b1ccabd22928ba219c32df2c47f29d76df022c687ed08" +CHECKSUM_SHA256_2="0c3d2476b218333ea5051b4a5364545a4a27a1d04001b1ce4843e038fba45130" 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"