diff --git a/net-im/telegram-desktop/patches/gcc8fixes-2.9.2.patchset b/net-im/telegram-desktop/patches/gcc8fixes-3.0.0.patchset similarity index 63% rename from net-im/telegram-desktop/patches/gcc8fixes-2.9.2.patchset rename to net-im/telegram-desktop/patches/gcc8fixes-3.0.0.patchset index 4890e1619..c78923492 100644 --- a/net-im/telegram-desktop/patches/gcc8fixes-2.9.2.patchset +++ b/net-im/telegram-desktop/patches/gcc8fixes-3.0.0.patchset @@ -1,14 +1,14 @@ -From 96256edd594cc4a8318606215c60c1a9b70b599d Mon Sep 17 00:00:00 2001 +From 2a9700595eeab126ae1a4d73e59477b790f3a793 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 11 Aug 2021 21:34:28 +1000 +Date: Wed, 1 Sep 2021 20:10:23 +1000 Subject: Workaround build issues on GCC8 diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp -index 3f3d431..9990a7d 100644 +index 6772573..ae26766 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp -@@ -161,10 +161,10 @@ void Panel::showToast(TextWithEntities &&text, crl::time duration) { +@@ -160,10 +160,10 @@ void Panel::showToast(TextWithEntities &&text, crl::time duration) { if (const auto strong = _lastToast.get()) { strong->hideAnimated(); } @@ -80,11 +80,80 @@ index 593c292..af8222a 100644 .title = (type == SendMenu::Type::Reminder ? tr::lng_remind_title() : tr::lng_schedule_title()), +diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp +index ad36bb4..2024006 100644 +--- a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp ++++ b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp +@@ -70,9 +70,10 @@ SendDataCommon::SentMessageFields SendText::getSentMessageFields() const { + } + + SendDataCommon::SentMessageFields SendGeo::getSentMessageFields() const { ++ SentMessageFields result; + if (_period) { + using Flag = MTPDmessageMediaGeoLive::Flag; +- return { .media = MTP_messageMediaGeoLive( ++ result.media = MTP_messageMediaGeoLive( + MTP_flags((_heading ? Flag::f_heading : Flag(0)) + | (_proximityNotificationRadius + ? Flag::f_proximity_notification_radius +@@ -80,29 +81,35 @@ SendDataCommon::SentMessageFields SendGeo::getSentMessageFields() const { + _location.toMTP(), + MTP_int(_heading.value_or(0)), + MTP_int(*_period), +- MTP_int(_proximityNotificationRadius.value_or(0))) }; ++ MTP_int(_proximityNotificationRadius.value_or(0))); ++ return result; + } +- return { .media = MTP_messageMediaGeo(_location.toMTP()) }; ++ result.media = MTP_messageMediaGeo(_location.toMTP()); ++ return result; + } + + SendDataCommon::SentMessageFields SendVenue::getSentMessageFields() const { ++ SentMessageFields result; + const auto venueType = QString(); +- return { .media = MTP_messageMediaVenue( ++ result.media = MTP_messageMediaVenue( + _location.toMTP(), + MTP_string(_title), + MTP_string(_address), + MTP_string(_provider), + MTP_string(_venueId), +- MTP_string(QString())) }; // venue_type ++ MTP_string(QString())); // venue_type ++ return result; + } + + SendDataCommon::SentMessageFields SendContact::getSentMessageFields() const { +- return { .media = MTP_messageMediaContact( ++ SentMessageFields result; ++ result.media = MTP_messageMediaContact( + MTP_string(_phoneNumber), + MTP_string(_firstName), + MTP_string(_lastName), + MTP_string(), // vcard +- MTP_int(0)) }; // user_id ++ MTP_int(0)); // user_id ++ return result; + } + + QString SendContact::getLayoutDescription(const Result *owner) const { +@@ -226,7 +233,9 @@ QString SendGame::getErrorOnSend( + } + + SendDataCommon::SentMessageFields SendInvoice::getSentMessageFields() const { +- return { .media = _media }; ++ SentMessageFields result; ++ result.media = _media; ++ return result; + } + + QString SendInvoice::getLayoutDescription(const Result *owner) const { diff --git a/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp b/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp -index 6736255..ab53ed3 100644 +index 07a9fe5..2a73278 100644 --- a/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp +++ b/Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp -@@ -1141,13 +1141,13 @@ FrameWithInfo VideoTrack::frameWithInfo(const Instance *instance) { +@@ -1171,13 +1171,13 @@ FrameWithInfo VideoTrack::frameWithInfo(const Instance *instance) { const auto data = _shared->frameForPaintWithIndex(); const auto i = data.frame->prepared.find(instance); const auto none = (i == data.frame->prepared.end()); @@ -238,75 +307,6 @@ index a9f27fe..704c94e 100644 .title = tr::lng_group_invite_expire_after(), .submit = tr::lng_settings_save(), .done = save, -diff --git a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp -index ad36bb4..2024006 100644 ---- a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp -+++ b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp -@@ -70,9 +70,10 @@ SendDataCommon::SentMessageFields SendText::getSentMessageFields() const { - } - - SendDataCommon::SentMessageFields SendGeo::getSentMessageFields() const { -+ SentMessageFields result; - if (_period) { - using Flag = MTPDmessageMediaGeoLive::Flag; -- return { .media = MTP_messageMediaGeoLive( -+ result.media = MTP_messageMediaGeoLive( - MTP_flags((_heading ? Flag::f_heading : Flag(0)) - | (_proximityNotificationRadius - ? Flag::f_proximity_notification_radius -@@ -80,29 +81,35 @@ SendDataCommon::SentMessageFields SendGeo::getSentMessageFields() const { - _location.toMTP(), - MTP_int(_heading.value_or(0)), - MTP_int(*_period), -- MTP_int(_proximityNotificationRadius.value_or(0))) }; -+ MTP_int(_proximityNotificationRadius.value_or(0))); -+ return result; - } -- return { .media = MTP_messageMediaGeo(_location.toMTP()) }; -+ result.media = MTP_messageMediaGeo(_location.toMTP()); -+ return result; - } - - SendDataCommon::SentMessageFields SendVenue::getSentMessageFields() const { -+ SentMessageFields result; - const auto venueType = QString(); -- return { .media = MTP_messageMediaVenue( -+ result.media = MTP_messageMediaVenue( - _location.toMTP(), - MTP_string(_title), - MTP_string(_address), - MTP_string(_provider), - MTP_string(_venueId), -- MTP_string(QString())) }; // venue_type -+ MTP_string(QString())); // venue_type -+ return result; - } - - SendDataCommon::SentMessageFields SendContact::getSentMessageFields() const { -- return { .media = MTP_messageMediaContact( -+ SentMessageFields result; -+ result.media = MTP_messageMediaContact( - MTP_string(_phoneNumber), - MTP_string(_firstName), - MTP_string(_lastName), - MTP_string(), // vcard -- MTP_int(0)) }; // user_id -+ MTP_int(0)); // user_id -+ return result; - } - - QString SendContact::getLayoutDescription(const Result *owner) const { -@@ -226,7 +233,9 @@ QString SendGame::getErrorOnSend( - } - - SendDataCommon::SentMessageFields SendInvoice::getSentMessageFields() const { -- return { .media = _media }; -+ SentMessageFields result; -+ result.media = _media; -+ return result; - } - - QString SendInvoice::getLayoutDescription(const Result *owner) const { diff --git a/Telegram/SourceFiles/ui/toasts/common_toasts.h b/Telegram/SourceFiles/ui/toasts/common_toasts.h index 7384c0a..12d4e17 100644 --- a/Telegram/SourceFiles/ui/toasts/common_toasts.h @@ -337,7 +337,173 @@ index ccc7559..2b37bc2 100644 + .parentOverride = this, }); } + +diff --git a/Telegram/SourceFiles/countries/countries_manager.cpp b/Telegram/SourceFiles/countries/countries_manager.cpp +index 2355208..807d270 100644 +--- a/Telegram/SourceFiles/countries/countries_manager.cpp ++++ b/Telegram/SourceFiles/countries/countries_manager.cpp +@@ -221,6 +221,8 @@ void Manager::request() { + auto info = Info(ProcessAlternativeName({ + .name = countryData.vdefault_name().v, + .iso2 = countryData.viso2().v, ++ .alternativeName = "", ++ .codes = {}, + .isHidden = countryData.is_hidden(), + })); + for (const auto &code : countryData.vcountry_codes().v) { +diff --git a/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp b/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp +index 9100631..2e3a64b 100644 +--- a/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp ++++ b/Telegram/SourceFiles/editor/photo_editor_layer_widget.cpp +@@ -82,6 +82,8 @@ void PrepareProfilePhoto( + auto image = Images::Read({ + .path = result.paths.isEmpty() ? QString() : result.paths.front(), + .content = result.remoteContent, ++ .maxSize = QSize(), ++ .gzipSvg = false, + .forceOpaque = true, + }).image; + if (image.isNull() +diff --git a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp +index 8748916..1646d9e 100644 +--- a/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp ++++ b/Telegram/SourceFiles/history/admin_log/history_admin_log_inner.cpp +@@ -926,6 +926,7 @@ void InnerWidget::paintEvent(QPaintEvent *e) { + .theme = _theme.get(), + .visibleAreaTop = _visibleTop, + .visibleAreaTopGlobal = mapToGlobal(QPoint(0, _visibleTop)).y(), ++ .visibleAreaWidth = 0, + .clip = clip, + }).translated(0, -top); + p.translate(0, top); +diff --git a/Telegram/SourceFiles/history/history_inner_widget.cpp b/Telegram/SourceFiles/history/history_inner_widget.cpp +index 3d6b6e1..672faf1 100644 +--- a/Telegram/SourceFiles/history/history_inner_widget.cpp ++++ b/Telegram/SourceFiles/history/history_inner_widget.cpp +@@ -628,6 +628,7 @@ void HistoryInner::paintEvent(QPaintEvent *e) { + .theme = _theme.get(), + .visibleAreaTop = _visibleAreaTop, + .visibleAreaTopGlobal = visibleAreaTopGlobal, ++ .visibleAreaWidth = 0, + .clip = clip, + }).translated(0, -top); + p.translate(0, top); +diff --git a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp +index bfb4b18..3730d31 100644 +--- a/Telegram/SourceFiles/history/view/history_view_list_widget.cpp ++++ b/Telegram/SourceFiles/history/view/history_view_list_widget.cpp +@@ -1621,6 +1621,7 @@ void ListWidget::paintEvent(QPaintEvent *e) { + .theme = _delegate->listChatTheme(), + .visibleAreaTop = _visibleTop, + .visibleAreaTopGlobal = mapToGlobal(QPoint(0, _visibleTop)).y(), ++ .visibleAreaWidth = 0, + .clip = clip, + }).translated(0, -top); + p.translate(0, top); +diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp +index ef34eb3..6fdd28e 100644 +--- a/Telegram/SourceFiles/media/audio/media_audio.cpp ++++ b/Telegram/SourceFiles/media/audio/media_audio.cpp +@@ -1615,7 +1615,10 @@ public: + (const char*)packet.data, + packet.size); + auto read = Images::Read({ ++ .path = QString(), + .content = coverBytes, ++ .maxSize = QSize(), ++ .gzipSvg = false, + .forceOpaque = true, + }); + if (!read.image.isNull()) { +diff --git a/Telegram/SourceFiles/passport/passport_form_controller.cpp b/Telegram/SourceFiles/passport/passport_form_controller.cpp +index 11ee2a0..7836277 100644 +--- a/Telegram/SourceFiles/passport/passport_form_controller.cpp ++++ b/Telegram/SourceFiles/passport/passport_form_controller.cpp +@@ -75,9 +75,12 @@ std::map GetTexts(const ValueMap &map) { + QImage ReadImage(bytes::const_span buffer) { + return Images::Read({ ++ .path = QString(), + .content = QByteArray::fromRawData( + reinterpret_cast(buffer.data()), + buffer.size()), ++ .maxSize = QSize(), ++ .gzipSvg = false, + .forceOpaque = true, + }).image; + } +diff --git a/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp b/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp +index ed291b5..f3be4a8 100644 +--- a/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp ++++ b/Telegram/SourceFiles/passport/passport_panel_edit_scans.cpp +@@ -40,7 +40,10 @@ static_assert(kMaxSize <= Storage::kUseBigFilesFrom); + + std::variant ProcessImage(QByteArray &&bytes) { + auto read = Images::Read({ ++ .path = QString(), + .content = base::take(bytes), ++ .maxSize = QSize(), ++ .gzipSvg = false, + .forceOpaque = true, + }); + +diff --git a/Telegram/SourceFiles/settings/settings_chat.cpp b/Telegram/SourceFiles/settings/settings_chat.cpp +index cff8a29..0ec8396 100644 +--- a/Telegram/SourceFiles/settings/settings_chat.cpp ++++ b/Telegram/SourceFiles/settings/settings_chat.cpp +@@ -650,6 +650,8 @@ void ChooseFromFile( + auto image = Images::Read({ + .path = result.paths.isEmpty() ? QString() : result.paths.front(), + .content = result.remoteContent, ++ .maxSize = QSize(), ++ .gzipSvg = false, + .forceOpaque = true, + }).image; + if (image.isNull() || image.width() <= 0 || image.height() <= 0) { +diff --git a/Telegram/SourceFiles/ui/chat/chat_theme.h b/Telegram/SourceFiles/ui/chat/chat_theme.h +index d27d057..fc78f4b 100644 +--- a/Telegram/SourceFiles/ui/chat/chat_theme.h ++++ b/Telegram/SourceFiles/ui/chat/chat_theme.h +@@ -21,8 +21,8 @@ struct ChatPaintContext { + const BubblePattern *bubblesPattern = nullptr; + QRect viewport; + QRect clip; +- TextSelection selection; + crl::time now = 0; ++ TextSelection selection; + + void translate(int x, int y) { + viewport.translate(x, y); +diff --git a/Telegram/SourceFiles/window/themes/window_theme.cpp b/Telegram/SourceFiles/window/themes/window_theme.cpp +index 8d96974..2dbfb24 100644 +--- a/Telegram/SourceFiles/window/themes/window_theme.cpp ++++ b/Telegram/SourceFiles/window/themes/window_theme.cpp +@@ -323,7 +323,10 @@ bool LoadTheme( + return false; + } + auto background = Images::Read({ ++ .path = QString(), + .content = backgroundContent, ++ .maxSize = QSize(), ++ .gzipSvg = false, + .forceOpaque = true, + }).image; + if (background.isNull()) { +diff --git a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp +index 3261ae3..e997cfe 100644 +--- a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp ++++ b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp +@@ -791,7 +791,10 @@ void Editor::importTheme() { + _inner->recreateRows(); + updateControlsGeometry(); + auto image = Images::Read({ ++ .path = QString(), + .content = parsed.background, ++ .maxSize = QSize(), ++ .gzipSvg = false, + .forceOpaque = true, + }).image; + if (!image.isNull() && !image.size().isEmpty()) { -- 2.30.2 diff --git a/net-im/telegram-desktop/patches/libtgvoip-2.9.2.patchset b/net-im/telegram-desktop/patches/libtgvoip-3.0.0.patchset similarity index 99% rename from net-im/telegram-desktop/patches/libtgvoip-2.9.2.patchset rename to net-im/telegram-desktop/patches/libtgvoip-3.0.0.patchset index ed1c0183c..6a5c9ba78 100644 --- a/net-im/telegram-desktop/patches/libtgvoip-2.9.2.patchset +++ b/net-im/telegram-desktop/patches/libtgvoip-3.0.0.patchset @@ -1,6 +1,6 @@ -From cd466188c4e53e739a8959e98343ba878225a418 Mon Sep 17 00:00:00 2001 +From da4e25202862577e7b0cd12c39a7cc3e0063a553 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 11 Aug 2021 21:31:52 +1000 +Date: Wed, 1 Sep 2021 20:07:12 +1000 Subject: Add Haiku support @@ -883,7 +883,7 @@ index 0bc42eb..c87cde9 100644 typedef pid_t PlatformThreadId; typedef pthread_t PlatformThreadRef; diff --git a/Telegram/cmake/lib_tgvoip.cmake b/Telegram/cmake/lib_tgvoip.cmake -index f7007c4..5811c57 100644 +index f332b18..73c1930 100644 --- a/Telegram/cmake/lib_tgvoip.cmake +++ b/Telegram/cmake/lib_tgvoip.cmake @@ -123,6 +123,14 @@ if (NOT TGVOIP_FOUND) diff --git a/net-im/telegram-desktop/patches/telegram_desktop-2.9.2.patchset b/net-im/telegram-desktop/patches/telegram_desktop-3.0.0.patchset similarity index 93% rename from net-im/telegram-desktop/patches/telegram_desktop-2.9.2.patchset rename to net-im/telegram-desktop/patches/telegram_desktop-3.0.0.patchset index 3a9e59b7b..2538d2ff0 100644 --- a/net-im/telegram-desktop/patches/telegram_desktop-2.9.2.patchset +++ b/net-im/telegram-desktop/patches/telegram_desktop-3.0.0.patchset @@ -1,11 +1,11 @@ -From 71961666dc03aa36d8fafd2a877dc800a62699e2 Mon Sep 17 00:00:00 2001 +From f5d75c8e58e3cc89db257caf603391067354af4b Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Wed, 11 Aug 2021 21:33:47 +1000 +Date: Wed, 1 Sep 2021 20:09:40 +1000 Subject: Add Haiku support diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt -index 473121d..d7de8b1 100644 +index c2dca3c..a6ef863 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -82,6 +82,15 @@ PRIVATE @@ -24,7 +24,7 @@ index 473121d..d7de8b1 100644 target_precompile_headers(Telegram PRIVATE ${src_loc}/stdafx.h) nice_target_sources(Telegram ${src_loc} PRIVATE -@@ -1154,6 +1163,16 @@ else() +@@ -1153,6 +1162,16 @@ else() ) endif() @@ -41,7 +41,7 @@ index 473121d..d7de8b1 100644 if (DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION) remove_target_sources(Telegram ${src_loc} platform/linux/linux_wayland_integration.cpp -@@ -1324,7 +1343,7 @@ elseif (build_osx) +@@ -1301,7 +1320,7 @@ if (build_macstore) else() set(bundle_identifier "com.tdesktop.Telegram$<$:Debug>") set(bundle_entitlements "Telegram.entitlements") @@ -51,10 +51,10 @@ index 473121d..d7de8b1 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 b523cc2..7f29cd2 100644 +index 6334421..7f2b89a 100644 --- a/Telegram/SourceFiles/calls/group/calls_group_menu.cpp +++ b/Telegram/SourceFiles/calls/group/calls_group_menu.cpp -@@ -635,6 +635,7 @@ void FillMenu( +@@ -654,6 +654,7 @@ void FillMenu( real->recordStartDateValue(), handler)); } @@ -62,7 +62,7 @@ index b523cc2..7f29cd2 100644 if (addScreenCast) { const auto sharing = call->isSharingScreen(); const auto toggle = [=] { -@@ -652,6 +653,7 @@ void FillMenu( +@@ -671,6 +672,7 @@ void FillMenu( : tr::lng_group_call_screen_share_start(tr::now)), toggle); } @@ -70,6 +70,34 @@ index b523cc2..7f29cd2 100644 menu->addAction(tr::lng_group_call_settings(tr::now), [=] { if (const auto strong = weak.get()) { showBox(Box(SettingsBox, strong)); +diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp +index 5fed7d9..6772573 100644 +--- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp ++++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp +@@ -1905,7 +1905,9 @@ void Panel::updateButtonsGeometry() { + const auto muteSize = _mute->innerSize().width() + 2 * addSkip; + const auto skip = st::groupCallButtonSkipSmall; + const auto fullWidth = (_video->width() + skip) ++#ifndef Q_OS_HAIKU + + (_screenShare->width() + skip) ++#endif + + (muteSize + skip) + + (_settings ->width() + skip) + + _hangup->width(); +@@ -1916,9 +1918,13 @@ void Panel::updateButtonsGeometry() { + - membersWidth + - membersSkip + - fullWidth) / 2; ++#ifndef Q_OS_HAIKU + toggle(_screenShare, !hidden); + _screenShare->moveToLeft(left, buttonsTop); + left += _screenShare->width() + skip; ++#else ++ toggle(_screenShare, false); ++#endif + toggle(_video, !hidden); + _video->moveToLeft(left, buttonsTop); + left += _video->width() + skip; diff --git a/Telegram/SourceFiles/core/core_settings.h b/Telegram/SourceFiles/core/core_settings.h index 7eac1ff..9833154 100644 --- a/Telegram/SourceFiles/core/core_settings.h @@ -84,10 +112,10 @@ index 7eac1ff..9833154 100644 rpl::variable _systemDarkModeEnabled = false; WindowPosition _windowPosition; // per-window diff --git a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp -index a692a70..495cd54 100644 +index b4494bf..fb4bd26 100644 --- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp -@@ -15,6 +15,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL +@@ -12,6 +12,15 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "platform/linux/linux_xdp_open_with_dialog.h" #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION @@ -103,7 +131,7 @@ index a692a70..495cd54 100644 #include #include -@@ -47,6 +56,23 @@ void UnsafeOpenEmailLink(const QString &email) { +@@ -42,6 +51,23 @@ void UnsafeOpenEmailLink(const QString &email) { } bool UnsafeShowOpenWith(const QString &filepath) { @@ -448,12 +476,12 @@ index 0000000..72bda83 +} // namespace Notifications +} // namespace Platform diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -index eda7c00..aafbb4a 100644 +index 581077e..ccfd4e4 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp -@@ -35,6 +35,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #include "base/platform/linux/base_linux_xcb_utilities.h" - #endif // !DESKTOP_APP_DISABLE_X11_INTEGRATION +@@ -39,6 +39,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #include "webview/platform/linux/webview_linux_webkit2gtk.h" + #endif // !DESKTOP_APP_DISABLE_WEBKITGTK +#ifdef Q_OS_HAIKU +#include @@ -462,7 +490,7 @@ index eda7c00..aafbb4a 100644 #include #include #include -@@ -45,7 +49,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL +@@ -49,7 +53,9 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include #include #include @@ -472,7 +500,7 @@ index eda7c00..aafbb4a 100644 #include #include -@@ -571,7 +577,7 @@ QString GetHomeDir() { +@@ -568,7 +574,7 @@ QString GetHomeDir() { return home; } @@ -481,7 +509,7 @@ index eda7c00..aafbb4a 100644 void HaikuAutostart(bool start) { const auto home = GetHomeDir(); if (home.isEmpty()) { -@@ -596,7 +602,7 @@ void HaikuAutostart(bool start) { +@@ -593,7 +599,7 @@ void HaikuAutostart(bool start) { file.remove(); } } @@ -490,7 +518,7 @@ index eda7c00..aafbb4a 100644 } // namespace -@@ -613,8 +619,11 @@ QString psAppDataPath() { +@@ -610,8 +616,11 @@ QString psAppDataPath() { return oldPath; } } @@ -503,7 +531,7 @@ index eda7c00..aafbb4a 100644 } void psDoCleanup() { -@@ -642,8 +651,9 @@ namespace Platform { +@@ -639,8 +648,9 @@ namespace Platform { void start() { auto backgroundThread = true; @@ -514,7 +542,7 @@ index eda7c00..aafbb4a 100644 LOG(("Launcher filename: %1").arg(QGuiApplication::desktopFileName())); #ifndef DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION -@@ -770,7 +780,7 @@ bool OpenSystemSettings(SystemSettingsType type) { +@@ -771,7 +781,7 @@ bool OpenSystemSettings(SystemSettingsType type) { } else if (DesktopEnvironment::IsMATE()) { add("mate-volume-control"); } @@ -537,10 +565,10 @@ index fd81ab1..73cdc47 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 64de6d4..3bf895b 100644 +index c6a3a34..66e1a05 100644 --- a/Telegram/ThirdParty/tgcalls/tgcalls/group/GroupInstanceCustomImpl.cpp +++ b/Telegram/ThirdParty/tgcalls/tgcalls/group/GroupInstanceCustomImpl.cpp -@@ -2882,7 +2882,7 @@ public: +@@ -2792,7 +2792,7 @@ public: } void setAudioOutputDevice(const std::string &id) { @@ -549,7 +577,7 @@ index 64de6d4..3bf895b 100644 _threads->getWorkerThread()->Invoke(RTC_FROM_HERE, [&] { SetAudioOutputDeviceById(_audioDeviceModule.get(), id); }); -@@ -2890,7 +2890,7 @@ public: +@@ -2800,7 +2800,7 @@ public: } void setAudioInputDevice(const std::string &id) { @@ -751,7 +779,7 @@ index 8d95acc..f49568c 100644 } // namespace Platform diff --git a/Telegram/lib_webrtc/webrtc/details/webrtc_openal_adm.cpp b/Telegram/lib_webrtc/webrtc/details/webrtc_openal_adm.cpp -index 4823b86..b0f22ff 100644 +index 8aa87d7..19deeff 100644 --- a/Telegram/lib_webrtc/webrtc/details/webrtc_openal_adm.cpp +++ b/Telegram/lib_webrtc/webrtc/details/webrtc_openal_adm.cpp @@ -4,6 +4,11 @@ @@ -796,11 +824,11 @@ index 118178c..fd3fde1 100644 endif() add_checked_subdirectory(jpeg) diff --git a/cmake/options_linux.cmake b/cmake/options_linux.cmake -index 73ce72a..11c61cf 100644 +index f3569bd..5095eef 100644 --- a/cmake/options_linux.cmake +++ b/cmake/options_linux.cmake -@@ -45,10 +45,12 @@ if (DESKTOP_APP_SPECIAL_TARGET) - endif() +@@ -40,10 +40,12 @@ if (DESKTOP_APP_SPECIAL_TARGET) + target_link_options(common_options INTERFACE $,,-g -flto -fuse-linker-plugin>) endif() +if (NOT HAIKU) @@ -815,41 +843,3 @@ index 73ce72a..11c61cf 100644 -- 2.30.2 - -From 2db7d320612d389b0abee0c0247bee4b118857a9 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Thu, 12 Aug 2021 21:02:19 +1000 -Subject: Remove ShareScreen button - - -diff --git a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp -index 9990a7d..965fc11 100644 ---- a/Telegram/SourceFiles/calls/group/calls_group_panel.cpp -+++ b/Telegram/SourceFiles/calls/group/calls_group_panel.cpp -@@ -1889,7 +1889,9 @@ void Panel::updateButtonsGeometry() { - const auto muteSize = _mute->innerSize().width() + 2 * addSkip; - const auto skip = st::groupCallButtonSkipSmall; - const auto fullWidth = (_video->width() + skip) -+#ifndef Q_OS_HAIKU - + (_screenShare->width() + skip) -+#endif - + (muteSize + skip) - + (_settings ->width() + skip) - + _hangup->width(); -@@ -1900,9 +1902,13 @@ void Panel::updateButtonsGeometry() { - - membersWidth - - membersSkip - - fullWidth) / 2; -+#ifndef Q_OS_HAIKU - toggle(_screenShare, !hidden); - _screenShare->moveToLeft(left, buttonsTop); - left += _screenShare->width() + skip; -+#else -+ toggle(_screenShare, false); -+#endif - toggle(_video, !hidden); - _video->moveToLeft(left, buttonsTop); - left += _video->width() + skip; --- -2.30.2 - diff --git a/net-im/telegram-desktop/telegram_desktop-2.9.2.recipe b/net-im/telegram-desktop/telegram_desktop-3.0.0.recipe similarity index 98% rename from net-im/telegram-desktop/telegram_desktop-2.9.2.recipe rename to net-im/telegram-desktop/telegram_desktop-3.0.0.recipe index 2a95a9a1d..c4b8e2ee6 100644 --- a/net-im/telegram-desktop/telegram_desktop-2.9.2.recipe +++ b/net-im/telegram-desktop/telegram_desktop-3.0.0.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="9c674745f0beb6d77c916fd37141a3fb105cb91091f9bb6b718b410ae238ceb9" +CHECKSUM_SHA256="09c495015d91d0ce335527427525a8a0a72328c645d56a22d59988e27f2defd5" SOURCE_FILENAME="tdesktop-$portVersion-full.tar.gz" SOURCE_DIR="tdesktop-$portVersion-full" srcGitRev_2="2b383fe05f8ae78ac99470b9a2b9ea22b3ee5a92"