From cd0afa49d90e098829f022449681877b15f7f93d Mon Sep 17 00:00:00 2001 From: Sergey Kiselev Date: Wed, 26 Apr 2023 15:51:02 +0500 Subject: [PATCH] Version 4.8.1, port revision 2 --- net-im/telegram-desktop/Makefile | 7 +++--- net-im/telegram-desktop/distinfo | 2 +- ...egram_SourceFiles_api_api_chat_filters_cpp | 14 +++++++++++ ...eFiles_boxes_filters_edit_filter_links_cpp | 23 +++++++++++++++++++ ..._SourceFiles_settings_settings_folders_cpp | 14 +++++++++++ ...SourceFiles_window_window_filters_menu_cpp | 14 +++++++++++ 6 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 net-im/telegram-desktop/files/patch-Telegram_SourceFiles_api_api_chat_filters_cpp create mode 100644 net-im/telegram-desktop/files/patch-Telegram_SourceFiles_boxes_filters_edit_filter_links_cpp create mode 100644 net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings_folders_cpp create mode 100644 net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_window_filters_menu_cpp diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index cd8749a..8435b88 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -1,5 +1,6 @@ PORTNAME= telegram-desktop DISTVERSION= 4.8.1 +PORTREVISION= 2 CATEGORIES= net-im MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ DISTNAME= tdesktop-${DISTVERSION}-full @@ -86,15 +87,15 @@ OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA PULSEAUDIO AUDIO_DESC= Audio backend for voice calls -SYSTEM_FONTS_DESC= Use system fonts instead of bundled patches ones +SYSTEM_FONTS_DESC= Use system fonts instead of bundled patched ones ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio ALSA_CMAKE_BOOL_OFF= LIBTGVOIP_DISABLE_ALSA PULSEAUDIO_CMAKE_BOOL_OFF= LIBTGVOIP_DISABLE_PULSEAUDIO SYSTEM_FONTS_CMAKE_BOOL_OFF= DESKTOP_APP_USE_PACKAGED_FONTS -WAYLAND_CMAKE_BOOL_OFF= DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION -WAYLAND_USE= qt=wayland +WAYLAND_CMAKE_BOOL_OFF= DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION +WAYLAND_USE= qt=wayland # Telegram asks each custom build to have its own API ID and hash. TELEGRAM_API_HASH= 20a3432aab43f24bb4460fceac5ba38d diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo index ec6609f..ac71115 100644 --- a/net-im/telegram-desktop/distinfo +++ b/net-im/telegram-desktop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1682392557 +TIMESTAMP = 1682388062 SHA256 (tdesktop-4.8.1-full.tar.gz) = 96660bb151c035a80c5b32a8fe043cecb54e9fe450329cf612ecb752db68c06f SIZE (tdesktop-4.8.1-full.tar.gz) = 63997319 diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_api_api_chat_filters_cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_api_api_chat_filters_cpp new file mode 100644 index 0000000..267e419 --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_api_api_chat_filters_cpp @@ -0,0 +1,14 @@ +unbreak clang 13 build + +Index: Telegram/SourceFiles/api/api_chat_filters.cpp +--- Telegram/SourceFiles/api/api_chat_filters.cpp.orig ++++ Telegram/SourceFiles/api/api_chat_filters.cpp +@@ -227,7 +227,7 @@ void ImportInvite( + }; + auto inputs = peers | ranges::views::transform([](auto peer) { + return MTPInputPeer(peer->input); +- }) | ranges::to(); ++ }) | ranges::to>(); + if (!slug.isEmpty()) { + api->request(MTPchatlists_JoinChatlistInvite( + MTP_string(slug), diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_boxes_filters_edit_filter_links_cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_boxes_filters_edit_filter_links_cpp new file mode 100644 index 0000000..f9cf358 --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_boxes_filters_edit_filter_links_cpp @@ -0,0 +1,23 @@ +unbreak clang 13 build + +Index: Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp +--- Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp.orig ++++ Telegram/SourceFiles/boxes/filters/edit_filter_links.cpp +@@ -1028,7 +1028,7 @@ void ExportFilterLink( + const auto session = &front->session(); + auto mtpPeers = peers | ranges::views::transform( + [](not_null peer) { return MTPInputPeer(peer->input); } +- ) | ranges::to(); ++ ) | ranges::to>(); + session->api().request(MTPchatlists_ExportChatlistInvite( + MTP_inputChatlistDialogFilter(MTP_int(id)), + MTP_string(), // title +@@ -1061,7 +1061,7 @@ void EditLinkChats( + const auto session = &front->session(); + auto mtpPeers = peers | ranges::views::transform( + [](not_null peer) { return MTPInputPeer(peer->input); } +- ) | ranges::to(); ++ ) | ranges::to>(); + session->api().request(MTPchatlists_EditExportedInvite( + MTP_flags(MTPchatlists_EditExportedInvite::Flag::f_peers), + MTP_inputChatlistDialogFilter(MTP_int(link.id)), diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings_folders_cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings_folders_cpp new file mode 100644 index 0000000..bb4b01d --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings_folders_cpp @@ -0,0 +1,14 @@ +unbreak clang 13 build + +Index: Telegram/SourceFiles/settings/settings_folders.cpp +--- Telegram/SourceFiles/settings/settings_folders.cpp.orig ++++ Telegram/SourceFiles/settings/settings_folders.cpp +@@ -696,7 +696,7 @@ void FilterRowButton::paintEvent(QPaintEvent *e) { + row.removePeers + ) | ranges::views::transform([](not_null peer) { + return MTPInputPeer(peer->input); +- }) | ranges::to(); ++ }) | ranges::to>(); + removeChatlistRequests.push_back( + MTPchatlists_LeaveChatlist( + MTP_inputChatlistDialogFilter(MTP_int(newId)), diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_window_filters_menu_cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_window_filters_menu_cpp new file mode 100644 index 0000000..931f5b6 --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_window_filters_menu_cpp @@ -0,0 +1,14 @@ +unbreak clang 13 build + +Index: Telegram/SourceFiles/window/window_filters_menu.cpp +--- Telegram/SourceFiles/window/window_filters_menu.cpp.orig ++++ Telegram/SourceFiles/window/window_filters_menu.cpp +@@ -494,7 +494,7 @@ void FiltersMenu::remove( + leave + ) | ranges::views::transform([](not_null peer) { + return MTPInputPeer(peer->input); +- }) | ranges::to()) ++ }) | ranges::to>()) + )).done([=](const MTPUpdates &result) { + api->applyUpdates(result); + }).send();