diff --git a/net-im/telegram-desktop/patches/telegram_desktop-2.2.0-defaults.patchset b/net-im/telegram-desktop/patches/telegram_desktop-2.3.0-defaults.patchset similarity index 94% rename from net-im/telegram-desktop/patches/telegram_desktop-2.2.0-defaults.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-2.3.0-defaults.patchset index 4877730e1..e26785c77 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-2.2.0-defaults.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-2.3.0-defaults.patchset @@ -1,4 +1,4 @@ -From 8ba6fd5a0f69257af0bc9deb002a6e0329729906 Mon Sep 17 00:00:00 2001 +From f6179d9774a361a5440ae7d63e556a1d2aeeae7c Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 29 Jul 2020 10:53:43 +1000 Subject: Use native window frame & native notifications by default @@ -27,5 +27,6 @@ index 95d9b59..e6cba65 100644 rpl::variable _systemDarkModeEnabled = false; rpl::variable _windowControlsLayout; -- -2.27.0 +2.28.0 + diff --git a/net-im/telegram-desktop/patches/telegram_desktop-2.2.0.patchset b/net-im/telegram-desktop/patches/telegram_desktop-2.3.0.patchset similarity index 97% rename from net-im/telegram-desktop/patches/telegram_desktop-2.2.0.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-2.3.0.patchset index c3fce1e49..79bc5d85b 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-2.2.0.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-2.3.0.patchset @@ -1,14 +1,14 @@ -From 28d7477d246f843a5e14567da3af27df45121146 Mon Sep 17 00:00:00 2001 +From 240c2208e5835152fcbbc36721713227f84d0219 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 29 Jul 2020 10:59:07 +1000 +Date: Sun, 16 Aug 2020 16:01:45 +1000 Subject: Add Haiku support diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt -index f0bafb1..5a88ae7 100644 +index b0e6dc4..b808b2a 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt -@@ -920,6 +920,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 @@ -25,7 +25,7 @@ index f0bafb1..5a88ae7 100644 platform/platform_audio.h platform/platform_file_utilities.h platform/platform_launcher.h -@@ -1133,7 +1143,7 @@ PRIVATE +@@ -1143,7 +1153,7 @@ PRIVATE settings.h ) @@ -1113,10 +1113,10 @@ index 0000000..d168dfb +} diff --git a/Telegram/SourceFiles/platform/haiku/specific_haiku.h b/Telegram/SourceFiles/platform/haiku/specific_haiku.h new file mode 100644 -index 0000000..20d7e4a +index 0000000..3e04f46 --- /dev/null +++ b/Telegram/SourceFiles/platform/haiku/specific_haiku.h -@@ -0,0 +1,109 @@ +@@ -0,0 +1,113 @@ +/* +This file is part of Telegram Desktop for Haiku, + @@ -1164,6 +1164,10 @@ index 0000000..20d7e4a + return false; +} + ++inline bool ShowWindowMenu(QWindow *window) { ++ return false; ++} ++ +} // namespace Platform + +inline void psCheckLocalSocket(const QString &serverName) { @@ -1279,10 +1283,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 efd75cd..cf12a28 100644 +index ec419ba..14f99ee 100644 --- a/Telegram/SourceFiles/platform/platform_specific.h +++ b/Telegram/SourceFiles/platform/platform_specific.h -@@ -66,6 +66,8 @@ void finish(); +@@ -68,6 +68,8 @@ void finish(); #ifdef Q_OS_MAC #include "platform/mac/specific_mac.h" @@ -1336,7 +1340,7 @@ index e567d93..34162a6 100644 #endif return result; diff --git a/Telegram/ThirdParty/libtgvoip/VoIPController.cpp b/Telegram/ThirdParty/libtgvoip/VoIPController.cpp -index b1a513f..faebc2f 100644 +index 4f5a13e..2dea04f 100644 --- a/Telegram/ThirdParty/libtgvoip/VoIPController.cpp +++ b/Telegram/ThirdParty/libtgvoip/VoIPController.cpp @@ -8,6 +8,9 @@ @@ -2213,11 +2217,27 @@ index 0bc42eb..c87cde9 100644 #elif defined(WEBRTC_POSIX) typedef pid_t PlatformThreadId; typedef pthread_t PlatformThreadRef; +diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake +index 1928ef5..fe91855 100644 +--- a/Telegram/cmake/lib_tgcalls.cmake ++++ b/Telegram/cmake/lib_tgcalls.cmake +@@ -127,6 +127,11 @@ if (WIN32) + PRIVATE + WEBRTC_WIN + ) ++elseif (HAIKU) ++ target_compile_definitions(lib_tgcalls ++ PRIVATE ++ WEBRTC_HAIKU ++ ) + elseif (APPLE) + target_compile_options(lib_tgcalls + PRIVATE diff --git a/Telegram/cmake/lib_tgvoip.cmake b/Telegram/cmake/lib_tgvoip.cmake -index 05ad50b..b45f1cb 100644 +index 328ec03..4477916 100644 --- a/Telegram/cmake/lib_tgvoip.cmake +++ b/Telegram/cmake/lib_tgvoip.cmake -@@ -120,6 +120,14 @@ else() +@@ -116,6 +116,14 @@ else() os/linux/AudioPulse.cpp os/linux/AudioPulse.h @@ -2232,7 +2252,7 @@ index 05ad50b..b45f1cb 100644 # POSIX os/posix/NetworkSocketPosix.cpp os/posix/NetworkSocketPosix.h -@@ -776,6 +784,20 @@ else() +@@ -153,6 +161,20 @@ else() TGVOIP_NO_OSX_PRIVATE_API ) endif() @@ -2253,8 +2273,21 @@ index 05ad50b..b45f1cb 100644 else() target_compile_options(lib_tgvoip PRIVATE +@@ -801,6 +823,12 @@ else() + WEBRTC_POSIX + WEBRTC_MAC + ) ++ elseif (HAIKU) ++ target_compile_definitions(lib_tgvoip ++ PUBLIC ++ WEBRTC_POSIX ++ WEBRTC_HAIKU ++ ) + else() + target_compile_definitions(lib_tgvoip + PUBLIC diff --git a/Telegram/lib_base/CMakeLists.txt b/Telegram/lib_base/CMakeLists.txt -index 28e5f85..42e52b1 100644 +index 540662f..84af89f 100644 --- a/Telegram/lib_base/CMakeLists.txt +++ b/Telegram/lib_base/CMakeLists.txt @@ -58,6 +58,18 @@ PRIVATE @@ -2752,10 +2785,10 @@ index 0000000..6402509 + +#include "base/platform/base_platform_url_scheme.h" diff --git a/Telegram/lib_crl/CMakeLists.txt b/Telegram/lib_crl/CMakeLists.txt -index 5e8f33f..bc87ddb 100644 +index 91e32ec..7991e08 100644 --- a/Telegram/lib_crl/CMakeLists.txt +++ b/Telegram/lib_crl/CMakeLists.txt -@@ -32,6 +32,7 @@ PRIVATE +@@ -33,6 +33,7 @@ PRIVATE crl/dispatch/crl_dispatch_semaphore.h crl/mac/crl_mac_time.cpp crl/linux/crl_linux_time.cpp @@ -2814,7 +2847,7 @@ index 0000000..f682740 + +#endif // CRL_USE_LINUX_TIME diff --git a/Telegram/lib_ui/CMakeLists.txt b/Telegram/lib_ui/CMakeLists.txt -index 562ba9c..acb1f21 100644 +index ecf3f2b..292cc21 100644 --- a/Telegram/lib_ui/CMakeLists.txt +++ b/Telegram/lib_ui/CMakeLists.txt @@ -84,6 +84,10 @@ PRIVATE @@ -2825,9 +2858,9 @@ index 562ba9c..acb1f21 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.cpp ui/platform/ui_platform_window.h ui/platform/ui_platform_utility.h - ui/style/style_core.cpp 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 @@ -2915,7 +2948,7 @@ index 0000000..c1419cb +} // namespace Ui diff --git a/Telegram/lib_ui/ui/platform/haiku/ui_window_haiku.cpp b/Telegram/lib_ui/ui/platform/haiku/ui_window_haiku.cpp new file mode 100644 -index 0000000..e7a032f +index 0000000..bce8d37 --- /dev/null +++ b/Telegram/lib_ui/ui/platform/haiku/ui_window_haiku.cpp @@ -0,0 +1,21 @@ @@ -2933,7 +2966,7 @@ index 0000000..e7a032f +namespace Ui { +namespace Platform { + -+std::unique_ptr CreateWindowHelper( ++std::unique_ptr CreateSpecialWindowHelper( + not_null window) { + return nullptr; +} @@ -2986,6 +3019,22 @@ index 570d169..8644d20 100644 if (bold) { #ifdef DESKTOP_APP_USE_PACKAGED_FONTS result.setWeight(QFont::DemiBold); +diff --git a/cmake/external/webrtc/CMakeLists.txt b/cmake/external/webrtc/CMakeLists.txt +index 6b32f41..5f8af75 100644 +--- a/cmake/external/webrtc/CMakeLists.txt ++++ b/cmake/external/webrtc/CMakeLists.txt +@@ -39,6 +39,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 @@ -3029,10 +3078,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 80b7405..705de6f 100644 +index 8d1c52b..e5640cc 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake -@@ -65,6 +65,8 @@ if (WIN32) +@@ -79,6 +79,8 @@ if (WIN32) include(cmake/options_win.cmake) elseif (APPLE) include(cmake/options_mac.cmake) @@ -3095,10 +3144,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 17bb351..6f3a3f0 100644 +index eb913e6..f0b811a 100644 --- a/cmake/variables.cmake +++ b/cmake/variables.cmake -@@ -63,6 +63,7 @@ set(build_osx 0) +@@ -69,6 +69,7 @@ set(build_osx 0) set(build_macstore 0) set(build_winstore 0) set(build_linux32 0) @@ -3106,7 +3155,7 @@ index 17bb351..6f3a3f0 100644 if (WIN32) if (DESKTOP_APP_SPECIAL_TARGET STREQUAL "uwp") -@@ -74,6 +75,12 @@ elseif (APPLE) +@@ -80,6 +81,12 @@ elseif (APPLE) elseif (DESKTOP_APP_SPECIAL_TARGET STREQUAL "macstore") set(build_macstore 1) endif() @@ -3120,5 +3169,5 @@ index 17bb351..6f3a3f0 100644 if (CMAKE_SIZEOF_VOID_P EQUAL 4) set(build_linux32 1) -- -2.27.0 +2.28.0 diff --git a/net-im/telegram-desktop/telegram_desktop-2.2.0.recipe b/net-im/telegram-desktop/telegram_desktop-2.3.0.recipe similarity index 96% rename from net-im/telegram-desktop/telegram_desktop-2.2.0.recipe rename to net-im/telegram-desktop/telegram_desktop-2.3.0.recipe index f5630a4ef..b1c22b248 100644 --- a/net-im/telegram-desktop/telegram_desktop-2.2.0.recipe +++ b/net-im/telegram-desktop/telegram_desktop-2.3.0.recipe @@ -6,7 +6,7 @@ LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v$portVersion/tdesktop-$portVersion-full.tar.gz" -CHECKSUM_SHA256="005f3f8468e09104cfd552cf3a49580191cea849bdb2c9a2c598b826c09a11b2" +CHECKSUM_SHA256="bc05b13c4cb2137a15d3ecc1c201295bb0020a78c20b8cdaa8856569c625ea79" SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz" SOURCE_DIR="tdesktop-$portVersion-full" srcGitRev_2="0663103551379b958b2e79c51d51d163ec484300" @@ -124,11 +124,9 @@ BUILD() -DDESKTOP_APP_DISABLE_AUTOUPDATE=ON \ -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=ON \ -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF \ - -DDESKTOP_APP_USE_PACKAGED_GSL=OFF \ - -DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF \ - -DDESKTOP_APP_USE_PACKAGED_EXPECTED=OFF \ -DDESKTOP_APP_USE_PACKAGED_FONTS=ON \ -DDESKTOP_APP_USE_HUNSPELL_ONLY=ON \ + -DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION=ON \ -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \ -DTDESKTOP_API_ID=$TELEGRAM_API_ID \ -DTDESKTOP_API_HASH=$TELEGRAM_API_HASH