diff --git a/net-im/telegram-desktop/patches/libtgvoip-4.7.1.patchset b/net-im/telegram-desktop/patches/libtgvoip-4.8.1.patchset similarity index 99% rename from net-im/telegram-desktop/patches/libtgvoip-4.7.1.patchset rename to net-im/telegram-desktop/patches/libtgvoip-4.8.1.patchset index 33d707388..9d0cd2c9f 100644 --- a/net-im/telegram-desktop/patches/libtgvoip-4.7.1.patchset +++ b/net-im/telegram-desktop/patches/libtgvoip-4.8.1.patchset @@ -1,6 +1,6 @@ -From 709a4e177ce6f34daf347abf83580f2017d802a1 Mon Sep 17 00:00:00 2001 +From 398d7992ed1d8e9b4e9a034482d281adc916741e Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 20 Mar 2023 23:39:55 +1000 +Date: Fri, 28 Apr 2023 19:35:39 +1000 Subject: Add Haiku support diff --git a/net-im/telegram-desktop/patches/telegram_desktop-4.7.1.patchset b/net-im/telegram-desktop/patches/telegram_desktop-4.8.1.patchset similarity index 96% rename from net-im/telegram-desktop/patches/telegram_desktop-4.7.1.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-4.8.1.patchset index 709349b51..1e2b0d808 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-4.7.1.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-4.8.1.patchset @@ -1,11 +1,11 @@ -From 66b30418988748acff7d6369e62ea8d1d56b0ce7 Mon Sep 17 00:00:00 2001 +From 8b1eae4131c09b2a741790287bc8e8d2f3635050 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Mon, 20 Mar 2023 23:40:14 +1000 +Date: Fri, 28 Apr 2023 19:36:45 +1000 Subject: Add Haiku support diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt -index 8165566..c36bf55 100644 +index 008c71b..697a399 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -90,6 +90,15 @@ PRIVATE @@ -24,7 +24,7 @@ index 8165566..c36bf55 100644 target_precompile_headers(Telegram PRIVATE $<$:${src_loc}/stdafx.h>) nice_target_sources(Telegram ${src_loc} PRIVATE -@@ -1409,6 +1418,16 @@ else() +@@ -1413,6 +1422,16 @@ else() ) endif() @@ -41,7 +41,7 @@ index 8165566..c36bf55 100644 if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) remove_target_sources(Telegram ${src_loc} platform/linux/linux_wayland_integration.cpp -@@ -1564,7 +1583,7 @@ if (build_macstore) +@@ -1568,7 +1587,7 @@ if (build_macstore) else() set(bundle_identifier "com.tdesktop.Telegram$<$:Debug>") set(bundle_entitlements "Telegram.entitlements") @@ -84,10 +84,10 @@ index 111bf6c..aecadca 100644 rpl::variable _systemDarkModeEnabled = false; rpl::variable _windowTitleContent; diff --git a/Telegram/SourceFiles/core/sandbox.cpp b/Telegram/SourceFiles/core/sandbox.cpp -index 0dbe352..5df5a8e 100644 +index 741f7d0..30dc2d7 100644 --- a/Telegram/SourceFiles/core/sandbox.cpp +++ b/Telegram/SourceFiles/core/sandbox.cpp -@@ -236,7 +236,7 @@ void Sandbox::setupScreenScale() { +@@ -241,7 +241,7 @@ void Sandbox::setupScreenScale() { const auto screen = Sandbox::primaryScreen(); const auto dpi = screen->logicalDotsPerInch(); @@ -96,7 +96,7 @@ index 0dbe352..5df5a8e 100644 const auto base = (basePair.first + basePair.second) * 0.5; const auto screenScaleExact = dpi / base; const auto screenScale = int(base::SafeRound(screenScaleExact * 20)) * 5; -@@ -259,9 +259,12 @@ Sandbox::~Sandbox() = default; +@@ -264,9 +264,12 @@ Sandbox::~Sandbox() = default; bool Sandbox::event(QEvent *e) { if (e->type() == QEvent::Quit && !Quitting()) { @@ -112,7 +112,7 @@ index 0dbe352..5df5a8e 100644 } else if (e->type() == QEvent::Close) { Quit(); } -@@ -271,7 +274,7 @@ bool Sandbox::event(QEvent *e) { +@@ -276,7 +279,7 @@ bool Sandbox::event(QEvent *e) { void Sandbox::socketConnected() { LOG(("Socket connected, this is not the first application instance, sending show command...")); _secondInstance = true; @@ -508,7 +508,7 @@ index 0000000..21935f0 +} // namespace Notifications +} // namespace Platform diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -index 2f8e506..d89ca73 100644 +index a8b2c6a..c517588 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -34,6 +34,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL @@ -522,7 +522,7 @@ index 2f8e506..d89ca73 100644 #include #include #include -@@ -116,6 +120,33 @@ static void t_desktop_application_init(TDesktopApplication *application) { +@@ -124,6 +128,33 @@ static void t_desktop_application_init(TDesktopApplication *application) { namespace Platform { namespace { @@ -556,7 +556,7 @@ index 2f8e506..d89ca73 100644 constexpr auto kDesktopFile = ":/misc/org.telegram.desktop.desktop"_cs; #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION -@@ -602,6 +633,9 @@ std::optional IsDarkMode() { +@@ -625,6 +656,9 @@ std::optional IsDarkMode() { } bool AutostartSupported() { @@ -566,7 +566,7 @@ index 2f8e506..d89ca73 100644 #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION return true; #else // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION -@@ -610,6 +644,10 @@ bool AutostartSupported() { +@@ -633,6 +667,10 @@ bool AutostartSupported() { } void AutostartToggle(bool enabled, Fn done) { @@ -577,7 +577,7 @@ index 2f8e506..d89ca73 100644 #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION const auto success = [&] { const auto silent = !done; -@@ -680,7 +718,11 @@ QString psAppDataPath() { +@@ -703,7 +741,11 @@ QString psAppDataPath() { } } @@ -589,7 +589,7 @@ index 2f8e506..d89ca73 100644 } void psDoCleanup() { -@@ -822,6 +864,7 @@ bool OpenSystemSettings(SystemSettingsType type) { +@@ -845,6 +887,7 @@ bool OpenSystemSettings(SystemSettingsType type) { add("mate-volume-control"); } } @@ -598,10 +598,10 @@ index 2f8e506..d89ca73 100644 add("pavucontrol"); add("alsamixergui"); diff --git a/Telegram/SourceFiles/platform/linux/tray_linux.cpp b/Telegram/SourceFiles/platform/linux/tray_linux.cpp -index 67002f4..fba71cf 100644 +index 2a96e1f..a0a8a54 100644 --- a/Telegram/SourceFiles/platform/linux/tray_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/tray_linux.cpp -@@ -317,7 +317,7 @@ void Tray::createIcon() { +@@ -318,7 +318,7 @@ void Tray::createIcon() { const auto showXEmbed = [=] { _aboutToShowRequests.fire({}); InvokeQueued(_menuXEmbed.get(), [=] { @@ -611,7 +611,7 @@ index 67002f4..fba71cf 100644 }; diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/MediaManager.cpp b/Telegram/ThirdParty/tgcalls/tgcalls/MediaManager.cpp -index 43171fb..9f8ce5a 100644 +index 88bdd22..6431130 100644 --- a/Telegram/ThirdParty/tgcalls/tgcalls/MediaManager.cpp +++ b/Telegram/ThirdParty/tgcalls/tgcalls/MediaManager.cpp @@ -1038,7 +1038,7 @@ void MediaManager::fillCallStats(CallStats &callStats) { @@ -624,10 +624,10 @@ index 43171fb..9f8ce5a 100644 SetAudioInputDeviceById(_audioDeviceModule.get(), id); #endif diff --git a/Telegram/ThirdParty/tgcalls/tgcalls/group/GroupInstanceCustomImpl.cpp b/Telegram/ThirdParty/tgcalls/tgcalls/group/GroupInstanceCustomImpl.cpp -index 7de4709..f55e0a3 100644 +index aa2150c..ed7eb62 100644 --- a/Telegram/ThirdParty/tgcalls/tgcalls/group/GroupInstanceCustomImpl.cpp +++ b/Telegram/ThirdParty/tgcalls/tgcalls/group/GroupInstanceCustomImpl.cpp -@@ -2849,7 +2849,7 @@ public: +@@ -2846,7 +2846,7 @@ public: } void setAudioOutputDevice(const std::string &id) { @@ -636,7 +636,7 @@ index 7de4709..f55e0a3 100644 _threads->getWorkerThread()->BlockingCall([&] { SetAudioOutputDeviceById(_audioDeviceModule.get(), id); }); -@@ -2857,7 +2857,7 @@ public: +@@ -2854,7 +2854,7 @@ public: } void setAudioInputDevice(const std::string &id) { @@ -791,7 +791,7 @@ index 891cb96..a49b75a 100644 if (::Platform::IsX11()) { const auto xcbResult = XCBLastUserInputTime(); diff --git a/Telegram/lib_base/base/platform/linux/base_power_save_blocker_linux.cpp b/Telegram/lib_base/base/platform/linux/base_power_save_blocker_linux.cpp -index 3eeb0d2..da2c6f8 100644 +index 73d37e4..f4277e2 100644 --- a/Telegram/lib_base/base/platform/linux/base_power_save_blocker_linux.cpp +++ b/Telegram/lib_base/base/platform/linux/base_power_save_blocker_linux.cpp @@ -21,6 +21,10 @@ @@ -803,8 +803,8 @@ index 3eeb0d2..da2c6f8 100644 +#endif + #include - #include + namespace base::Platform { 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 2e6170f..f509ce4 100644 --- a/Telegram/lib_base/base/platform/linux/base_url_scheme_linux.cpp diff --git a/net-im/telegram-desktop/telegram_desktop-4.7.1.recipe b/net-im/telegram-desktop/telegram_desktop-4.8.1.recipe similarity index 98% rename from net-im/telegram-desktop/telegram_desktop-4.7.1.recipe rename to net-im/telegram-desktop/telegram_desktop-4.8.1.recipe index 1e1177c8b..55a0f709d 100644 --- a/net-im/telegram-desktop/telegram_desktop-4.7.1.recipe +++ b/net-im/telegram-desktop/telegram_desktop-4.8.1.recipe @@ -5,7 +5,7 @@ COPYRIGHT="2013-2023 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="c3aeb12f5f533eacc70e69e5056f46cd01245ada67fd3fbc70e161104b87f8c5" +CHECKSUM_SHA256="96660bb151c035a80c5b32a8fe043cecb54e9fe450329cf612ecb752db68c06f" SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz" SOURCE_DIR="tdesktop-$portVersion-full" srcGitRev_2="2b383fe05f8ae78ac99470b9a2b9ea22b3ee5a92"