diff --git a/net-im/telegram-desktop/patches/telegram_desktop-2.5.8-owt.patchset b/net-im/telegram-desktop/patches/telegram_desktop-2.5.9-owt.patchset similarity index 100% rename from net-im/telegram-desktop/patches/telegram_desktop-2.5.8-owt.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-2.5.9-owt.patchset diff --git a/net-im/telegram-desktop/patches/telegram_desktop-2.5.8.patchset b/net-im/telegram-desktop/patches/telegram_desktop-2.5.9.patchset similarity index 98% rename from net-im/telegram-desktop/patches/telegram_desktop-2.5.8.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-2.5.9.patchset index 48de9ee91..0822fe1b2 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-2.5.8.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-2.5.9.patchset @@ -1,14 +1,14 @@ -From afa0d75be24ad6e3b9fb490876b0b7e7699eb246 Mon Sep 17 00:00:00 2001 +From 8d6196668c8a25cdd359fda508973d0b07fec133 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sun, 31 Jan 2021 12:26:28 +1000 +Date: Thu, 18 Feb 2021 09:41:18 +1000 Subject: Add Haiku support diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt -index 663453b..87ecdeb 100644 +index 85f8277..03e3292 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt -@@ -906,6 +906,18 @@ PRIVATE +@@ -908,6 +908,18 @@ PRIVATE platform/win/windows_dlls.h platform/win/windows_event_filter.cpp platform/win/windows_event_filter.h @@ -27,7 +27,7 @@ index 663453b..87ecdeb 100644 platform/platform_audio.h platform/platform_file_utilities.h platform/platform_launcher.h -@@ -1119,7 +1131,7 @@ PRIVATE +@@ -1121,7 +1133,7 @@ PRIVATE stdafx.h ) @@ -37,10 +37,10 @@ index 663453b..87ecdeb 100644 window/window_title_qt.cpp window/window_title_qt.h diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h -index 67ffc1f..064c189 100644 +index 76320ad..e2f3147 100644 --- a/Telegram/SourceFiles/core/core_settings.h +++ b/Telegram/SourceFiles/core/core_settings.h -@@ -576,7 +576,7 @@ private: +@@ -599,7 +599,7 @@ private: rpl::variable _dialogsWidthRatio; // per-window rpl::variable _thirdColumnWidth = kDefaultThirdColumnWidth; // p-w bool _notifyFromAll = true; @@ -76,10 +76,10 @@ index bcc4392..6e838e6 100644 if (wasVersion >= 1007011 && wasVersion < 1007015) { _bigFileCache->clear(); diff --git a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp -index 75fff52..b4b0431 100644 +index 7607cd2..f906b23 100644 --- a/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp +++ b/Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp -@@ -367,7 +367,7 @@ OverlayWidget::OverlayWidget() +@@ -374,7 +374,7 @@ OverlayWidget::OverlayWidget() hide(); createWinId(); @@ -1430,7 +1430,7 @@ index cd6b3a6..e08f0bd 100644 #include "platform/win/window_title_win.h" #elif defined Q_OS_UNIX // Q_OS_MAC || Q_OS_WIN diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp -index 9bbbdad..c672d21 100644 +index 6ed2698..56259f4 100644 --- a/Telegram/SourceFiles/window/main_window.cpp +++ b/Telegram/SourceFiles/window/main_window.cpp @@ -118,7 +118,7 @@ QIcon CreateOfficialIcon(Main::Session *session) { @@ -2321,10 +2321,10 @@ index 0bc42eb..c87cde9 100644 typedef pid_t PlatformThreadId; typedef pthread_t PlatformThreadRef; diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake -index cde4f61..f353179 100644 +index 7a7e68e..7619a4e 100644 --- a/Telegram/cmake/lib_tgcalls.cmake +++ b/Telegram/cmake/lib_tgcalls.cmake -@@ -134,6 +134,11 @@ if (WIN32) +@@ -132,6 +132,11 @@ if (WIN32) PRIVATE WEBRTC_WIN ) @@ -2337,7 +2337,7 @@ index cde4f61..f353179 100644 target_compile_options(lib_tgcalls PRIVATE diff --git a/Telegram/cmake/lib_tgvoip.cmake b/Telegram/cmake/lib_tgvoip.cmake -index 684f927..96811ce 100644 +index 74d4f26..ec89ac7 100644 --- a/Telegram/cmake/lib_tgvoip.cmake +++ b/Telegram/cmake/lib_tgvoip.cmake @@ -120,6 +120,14 @@ if (NOT TGVOIP_FOUND) @@ -2355,11 +2355,16 @@ index 684f927..96811ce 100644 # POSIX os/posix/NetworkSocketPosix.cpp os/posix/NetworkSocketPosix.h -@@ -157,6 +165,15 @@ if (NOT TGVOIP_FOUND) +@@ -157,6 +165,20 @@ if (NOT TGVOIP_FOUND) TGVOIP_NO_OSX_PRIVATE_API ) endif() + elseif (HAIKU) ++ target_compile_definitions(lib_tgvoip_bundled ++ PUBLIC ++ WEBRTC_POSIX ++ WEBRTC_HAIKU ++ ) + target_compile_options(lib_tgvoip_bundled + PRIVATE + -Wno-unknown-pragmas @@ -2371,19 +2376,6 @@ index 684f927..96811ce 100644 else() target_compile_options(lib_tgvoip_bundled PRIVATE -@@ -805,6 +822,12 @@ if (NOT TGVOIP_FOUND) - WEBRTC_POSIX - WEBRTC_MAC - ) -+ elseif (HAIKU) -+ target_compile_definitions(lib_tgvoip_bundled -+ PUBLIC -+ WEBRTC_POSIX -+ WEBRTC_HAIKU -+ ) - else() - target_compile_definitions(lib_tgvoip_bundled - PUBLIC diff --git a/Telegram/lib_base/CMakeLists.txt b/Telegram/lib_base/CMakeLists.txt index 6330f68..79b4d51 100644 --- a/Telegram/lib_base/CMakeLists.txt @@ -3013,10 +3005,10 @@ index 0000000..f682740 + +#endif // CRL_USE_LINUX_TIME diff --git a/Telegram/lib_ui/CMakeLists.txt b/Telegram/lib_ui/CMakeLists.txt -index 770ba1a..cb50b55 100644 +index b48b8f9..579b66a 100644 --- a/Telegram/lib_ui/CMakeLists.txt +++ b/Telegram/lib_ui/CMakeLists.txt -@@ -95,6 +95,10 @@ PRIVATE +@@ -97,6 +97,10 @@ PRIVATE ui/platform/win/ui_window_win.h ui/platform/win/ui_utility_win.cpp ui/platform/win/ui_utility_win.h @@ -3024,15 +3016,15 @@ index 770ba1a..cb50b55 100644 + ui/platform/haiku/ui_window_haiku.h + ui/platform/haiku/ui_utility_haiku.cpp + ui/platform/haiku/ui_utility_haiku.h + ui/platform/ui_platform_window_title.cpp + ui/platform/ui_platform_window_title.h ui/platform/ui_platform_window.cpp - ui/platform/ui_platform_window.h - ui/platform/ui_platform_utility.h diff --git a/Telegram/lib_ui/ui/platform/haiku/ui_utility_haiku.cpp b/Telegram/lib_ui/ui/platform/haiku/ui_utility_haiku.cpp new file mode 100644 -index 0000000..b152b0f +index 0000000..62cdebf --- /dev/null +++ b/Telegram/lib_ui/ui/platform/haiku/ui_utility_haiku.cpp -@@ -0,0 +1,29 @@ +@@ -0,0 +1,41 @@ +/* +This file is part of Telegram Desktop for Haiku, + @@ -3043,6 +3035,8 @@ index 0000000..b152b0f +*/ + +#include "ui/platform/haiku/ui_utility_haiku.h" ++#include "ui/platform/ui_platform_window_title.h" ++#include "base/platform/base_platform_info.h" + +#include + @@ -3060,14 +3054,24 @@ index 0000000..b152b0f +void IgnoreAllActivation(not_null widget) { +} + ++TitleControls::Layout TitleControlsLayout() { ++ return TitleControls::Layout{ ++ .right = { ++ TitleControls::Control::Minimize, ++ TitleControls::Control::Maximize, ++ TitleControls::Control::Close, ++ } ++ }; ++} ++ +} // namespace Platform +} // namespace Ui diff --git a/Telegram/lib_ui/ui/platform/haiku/ui_utility_haiku.h b/Telegram/lib_ui/ui/platform/haiku/ui_utility_haiku.h new file mode 100644 -index 0000000..e72220e +index 0000000..97eab8f --- /dev/null +++ b/Telegram/lib_ui/ui/platform/haiku/ui_utility_haiku.h -@@ -0,0 +1,44 @@ +@@ -0,0 +1,60 @@ +/* +This file is part of Telegram Desktop for Haiku, + @@ -3106,6 +3110,22 @@ index 0000000..e72220e +inline void BringToBack(not_null widget) { +} + ++inline bool WindowExtentsSupported() { ++ return false; ++} ++ ++inline bool SetWindowExtents(QWindow *window, const QMargins &extents) { ++ return false; ++} ++ ++inline bool UnsetWindowExtents(QWindow *window) { ++ return false; ++} ++ ++inline bool ShowWindowMenu(QWindow *window) { ++ return false; ++} ++ +inline constexpr bool UseMainQueueGeneric() { + return true; +} @@ -3158,10 +3178,10 @@ index 0000000..ecb1277 + +#include "ui/platform/ui_platform_window.h" diff --git a/Telegram/lib_ui/ui/platform/ui_platform_utility.h b/Telegram/lib_ui/ui/platform/ui_platform_utility.h -index a8eaedd..3340f20 100644 +index e8629a1..01cff34 100644 --- a/Telegram/lib_ui/ui/platform/ui_platform_utility.h +++ b/Telegram/lib_ui/ui/platform/ui_platform_utility.h -@@ -37,6 +37,8 @@ void DrainMainQueue(); // Needed only if UseMainQueueGeneric() is false. +@@ -45,6 +45,8 @@ bool ShowWindowMenu(QWindow *window); #ifdef Q_OS_MAC #include "ui/platform/mac/ui_utility_mac.h" @@ -3290,10 +3310,10 @@ index 81f9a7b..3b55109 100644 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/cmake/options.cmake b/cmake/options.cmake -index 89eea38..e9e8ec9 100644 +index 28521b2..c162955 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake -@@ -86,6 +86,8 @@ if (WIN32) +@@ -79,6 +79,8 @@ if (WIN32) include(cmake/options_win.cmake) elseif (APPLE) include(cmake/options_mac.cmake) @@ -3356,10 +3376,10 @@ index 97f61be..f08430d 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 c30a1ca..74bcb5e 100644 +index e429c00..f2b6689 100644 --- a/cmake/variables.cmake +++ b/cmake/variables.cmake -@@ -63,6 +63,7 @@ set(build_winstore 0) # 32 or 64 bit +@@ -62,6 +62,7 @@ set(build_winstore 0) # 32 or 64 bit set(build_linux32 0) set(build_win64 0) # normal or uwp set(build_winstore64 0) @@ -3367,7 +3387,7 @@ index c30a1ca..74bcb5e 100644 if (WIN32) if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "win64") -@@ -80,6 +81,12 @@ elseif (APPLE) +@@ -79,6 +80,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.5.8.recipe b/net-im/telegram-desktop/telegram_desktop-2.5.9.recipe similarity index 98% rename from net-im/telegram-desktop/telegram_desktop-2.5.8.recipe rename to net-im/telegram-desktop/telegram_desktop-2.5.9.recipe index bd71bc832..2d7615876 100644 --- a/net-im/telegram-desktop/telegram_desktop-2.5.8.recipe +++ b/net-im/telegram-desktop/telegram_desktop-2.5.9.recipe @@ -5,7 +5,7 @@ COPYRIGHT="2013-2021 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="9c89cb31f8ba8a26821fe3c2769b04162e8d7629d327f9cd25a892e88878417e" +CHECKSUM_SHA256="82eefd342d8ba380e08a8606ac59a34bfacfb2f501408a0385884696966a218c" SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz" SOURCE_DIR="tdesktop-$portVersion-full" srcGitRev_2="be23804afce3bb2e80a1d57a7c1318c71b82b7de" @@ -164,8 +164,6 @@ BUILD() -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \ -DTDESKTOP_API_ID=$TELEGRAM_API_ID \ -DTDESKTOP_API_HASH=$TELEGRAM_API_HASH - - # multi-job takes too much memory make $jobArgs #build notify gate tool