diff --git a/net-im/telegram-desktop/patches/libtgvoip-4.2.0.patchset b/net-im/telegram-desktop/patches/libtgvoip-4.2.3.patchset similarity index 99% rename from net-im/telegram-desktop/patches/libtgvoip-4.2.0.patchset rename to net-im/telegram-desktop/patches/libtgvoip-4.2.3.patchset index 68e9438a3..5fd75eca4 100644 --- a/net-im/telegram-desktop/patches/libtgvoip-4.2.0.patchset +++ b/net-im/telegram-desktop/patches/libtgvoip-4.2.3.patchset @@ -1,6 +1,6 @@ -From a0b954a81b226a0c3984c0d48e602007a28a273a Mon Sep 17 00:00:00 2001 +From c6865804e7c90324c6e71ff2b6e84af428c3d003 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sat, 17 Sep 2022 22:10:38 +1000 +Date: Fri, 30 Sep 2022 20:40:37 +1000 Subject: Add Haiku support diff --git a/net-im/telegram-desktop/patches/telegram_desktop-4.2.0.patchset b/net-im/telegram-desktop/patches/telegram_desktop-4.2.3.patchset similarity index 94% rename from net-im/telegram-desktop/patches/telegram_desktop-4.2.0.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-4.2.3.patchset index 5356bba27..d051a0569 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-4.2.0.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-4.2.3.patchset @@ -1,6 +1,6 @@ -From 12c13fb435a88da846ae0acb10aafffa0f9b3ef8 Mon Sep 17 00:00:00 2001 +From 633307ef93dc9e0bdfdf5a7a48bc5646e4805af2 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sat, 17 Sep 2022 22:16:29 +1000 +Date: Fri, 30 Sep 2022 20:45:05 +1000 Subject: Add Haiku support @@ -51,10 +51,10 @@ index fb2bf37..779ac20 100644 else() set(output_name "Telegram") diff --git a/Telegram/SourceFiles/calls/group/calls_group_menu.cpp b/Telegram/SourceFiles/calls/group/calls_group_menu.cpp -index 4fe0137..88829bf 100644 +index 9b97c34..b1e54ee 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_menu.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_menu.cpp -@@ -571,6 +571,7 @@ void FillMenu( +@@ -572,6 +572,7 @@ void FillMenu( real->recordStartDateValue(), handler)); } @@ -62,7 +62,7 @@ index 4fe0137..88829bf 100644 if (addScreenCast) { const auto sharing = call->isSharingScreen(); const auto toggle = [=] { -@@ -588,6 +589,7 @@ void FillMenu( +@@ -589,6 +590,7 @@ void FillMenu( : tr::lng_group_call_screen_share_start(tr::now)), toggle); } @@ -474,7 +474,7 @@ index 0000000..8605b28 +} // namespace Notifications +} // namespace Platform diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -index fd9118b..3088311 100644 +index 636c753..a730b35 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -31,6 +31,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL @@ -488,7 +488,7 @@ index fd9118b..3088311 100644 #include #include #include -@@ -55,8 +59,36 @@ using namespace Platform; +@@ -58,8 +62,36 @@ using namespace Platform; using Platform::internal::WaylandIntegration; namespace Platform { @@ -523,21 +523,21 @@ index fd9118b..3088311 100644 +#endif // Q_OS_HAIKU + constexpr auto kDesktopFile = ":/misc/telegramdesktop.desktop"_cs; - constexpr auto kIconName = "telegram"_cs; -@@ -389,7 +421,11 @@ bool AutostartSupported() { + #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION +@@ -335,7 +367,11 @@ bool AutostartSupported() { // in folders with names started with a dot // and doesn't provide any api to add an app to autostart // thus, autostart isn't supported in snap +#ifdef Q_OS_HAIKU + return true; +#else - return !InSnap(); + return !KSandbox::isSnap(); +#endif } void AutostartToggle(bool enabled, Fn done) { -@@ -398,7 +434,10 @@ void AutostartToggle(bool enabled, Fn done) { +@@ -344,7 +380,10 @@ void AutostartToggle(bool enabled, Fn done) { done(enabled); } }); @@ -547,9 +547,9 @@ index fd9118b..3088311 100644 + return; +#else const auto silent = !done; - if (InFlatpak()) { + if (KSandbox::isFlatpak()) { #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION -@@ -415,6 +454,7 @@ void AutostartToggle(bool enabled, Fn done) { +@@ -361,6 +400,7 @@ void AutostartToggle(bool enabled, Fn done) { QFile::remove(autostart + QGuiApplication::desktopFileName()); } } @@ -557,7 +557,7 @@ index fd9118b..3088311 100644 } bool AutostartSkip() { -@@ -460,8 +500,11 @@ QString psAppDataPath() { +@@ -406,8 +446,11 @@ QString psAppDataPath() { return oldPath; } } @@ -570,7 +570,7 @@ index fd9118b..3088311 100644 } void psDoCleanup() { -@@ -626,6 +669,7 @@ bool OpenSystemSettings(SystemSettingsType type) { +@@ -572,6 +615,7 @@ bool OpenSystemSettings(SystemSettingsType type) { add("mate-volume-control"); } } @@ -579,7 +579,7 @@ index fd9118b..3088311 100644 add("pavucontrol"); add("alsamixergui"); diff --git a/Telegram/SourceFiles/platform/linux/tray_linux.cpp b/Telegram/SourceFiles/platform/linux/tray_linux.cpp -index 80108b1..f4fa0f8 100644 +index ba2a6b7..a13b40d 100644 --- a/Telegram/SourceFiles/platform/linux/tray_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/tray_linux.cpp @@ -300,7 +300,7 @@ void Tray::createIcon() { @@ -787,7 +787,7 @@ index 434cb1f..f25cb90 100644 #include diff --git a/Telegram/lib_base/base/platform/linux/base_url_scheme_linux.cpp b/Telegram/lib_base/base/platform/linux/base_url_scheme_linux.cpp -index 2d11264..0c322f2 100644 +index e1b8d74..5cc156c 100644 --- a/Telegram/lib_base/base/platform/linux/base_url_scheme_linux.cpp +++ b/Telegram/lib_base/base/platform/linux/base_url_scheme_linux.cpp @@ -13,6 +13,10 @@ @@ -798,9 +798,9 @@ index 2d11264..0c322f2 100644 +#include +#endif + - #include #include #include + diff --git a/Telegram/lib_ui/ui/ui_utility.cpp b/Telegram/lib_ui/ui/ui_utility.cpp index 283b340..fd01c34 100644 --- a/Telegram/lib_ui/ui/ui_utility.cpp @@ -848,29 +848,21 @@ index bb6d91a..3c4a188 100644 #include "webrtc/webrtc_audio_input_tester.h" #include "webrtc/webrtc_create_adm.h" --- -2.36.1 - - -From e957bb8dcf3f345c357ed999dc7cfa65e7c04cf6 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Sat, 17 Sep 2022 23:01:23 +1000 -Subject: Disable kcoreaddons - - -diff --git a/cmake/external/kcoreaddons/CMakeLists.txt b/cmake/external/kcoreaddons/CMakeLists.txt -index 528a487..7061e07 100644 ---- a/cmake/external/kcoreaddons/CMakeLists.txt -+++ b/cmake/external/kcoreaddons/CMakeLists.txt -@@ -4,7 +4,7 @@ - # For license and copyright information please follow this link: - # https://github.com/desktop-app/legal/blob/master/LEGAL - --if (NOT LINUX) -+if (NOT LINUX OR HAIKU) - add_library(external_kcoreaddons INTERFACE IMPORTED GLOBAL) - add_library(desktop-app::external_kcoreaddons ALIAS external_kcoreaddons) - +diff --git a/Telegram/lib_ui/ui/widgets/popup_menu.cpp b/Telegram/lib_ui/ui/widgets/popup_menu.cpp +index db6a97d..47b8a69 100644 +--- a/Telegram/lib_ui/ui/widgets/popup_menu.cpp ++++ b/Telegram/lib_ui/ui/widgets/popup_menu.cpp +@@ -18,6 +18,10 @@ + #include "base/invoke_queued.h" + #include "base/platform/base_platform_info.h" + ++#ifdef Q_OS_HAIKU ++#include ++#endif ++ + #include + #include + #include -- 2.36.1 diff --git a/net-im/telegram-desktop/telegram_desktop-4.2.0.recipe b/net-im/telegram-desktop/telegram_desktop-4.2.3.recipe similarity index 98% rename from net-im/telegram-desktop/telegram_desktop-4.2.0.recipe rename to net-im/telegram-desktop/telegram_desktop-4.2.3.recipe index f4f5dd995..e43920569 100644 --- a/net-im/telegram-desktop/telegram_desktop-4.2.0.recipe +++ b/net-im/telegram-desktop/telegram_desktop-4.2.3.recipe @@ -3,9 +3,9 @@ DESCRIPTION="Unofficial build of the original Telegram client for Haiku." HOMEPAGE="https://www.telegram.org/" COPYRIGHT="2013-2022 Telegram" LICENSE="GNU GPL v3" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v$portVersion/tdesktop-$portVersion-full.tar.gz" -CHECKSUM_SHA256="d3c78c6daa5b4e336d55dd1dd2dc0003e34dad501e6d212719b51ea8cad71dde" +CHECKSUM_SHA256="16e11bf4a12037c0db46662b3f1002cdeec7433dae9c470217f7c2a760a4b9da" SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz" SOURCE_DIR="tdesktop-$portVersion-full" srcGitRev_2="2b383fe05f8ae78ac99470b9a2b9ea22b3ee5a92"