From nobody Tue Apr 25 10:46:28 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q5JZs2xsTz471s0; Tue, 25 Apr 2023 10:46:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q5JZs0qclz43MS; Tue, 25 Apr 2023 10:46:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682419589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZEV+HnTPhR605bEKViNQddEbdUTTS6a7z/Lm4TReJLo=; b=KHjAb6nIQPeDiuAoPBtzCWiYi+YtlIeB5AjF9h8ucZa+RFBIJHm62znHM3eyzTvGzFKhYN klQJ0/7M7y/lEA/+IuH/2YrCHyFuO5P+PqL6isFyYgkrKAyTnNcwk71cco7JveK1o8tvui iy/7tv8HW5/e2qf/zjP5T8t8HfJn+zS43Lx5esYuNpMGv9M/bQmFIHbdri0CG62s8pE0G+ DwKK/6a85cNsyQoXcwQ9yjbub8t6GtaSla3N30vjP8jlacWSWzBa31TEkmLrUySg0iM9wC Nf2KZnZeM2jVU0LIzYLAypT0MEOQR2LzU895U9XW/8wHmhhJXaf5dw/g7UAeFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682419589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZEV+HnTPhR605bEKViNQddEbdUTTS6a7z/Lm4TReJLo=; b=r6ileO1vitxp+mLZ3JlntQjVi1Cj/P6xdUzvny7nd2ZlJ3OGhsCFwpCh7jUx3AQGYzOYD8 E2aEFYqX/hwMJBqBBe8vVZypzNyUGeSBwDlDetrZxUNWVcSzmkeZEpXtciPCl0O0NrU77F eKJOkukU0fDOPtBiPC4FlardDWl7ZAurGmFVjr9fy34uxhP7BglaENAASUsH7MKvHqJ2P8 6mraZAeuG23UkXh2QsBlad7f6TAvCQ31aqq5Hf/NvE2OA8KuynDO30YbQqt/JGR6HLMQBD ts1Hw9NynNGr7FG06OuzDQqqc2MrGrncObrUy6nmrmQFx969paDbMQHrl0YaTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682419589; a=rsa-sha256; cv=none; b=hCINlTRgsqNHvW/8Nu2xpUM+dcMmjO2lHp98Izfi3pqoeW2i3ilVSva53rT1G1frm47MLC K3QXto1Xa9p+4fnSZIO42RdU+RD6RWkP4OpzVXcReXgiGn6MqjgAv0MXKBFZAVmCzHzeJg eC8Rc6QjlDLqFPSKg/M0XShvPg4tdYxk4k8petfqYbRMiQ6dpJhC3MZc3l/DOjePe2SKMc YxKH8bhGYO6+LxmKpe4/9v1q9mficvefNvan8DooZ+4o0Zr++UkdXtaxvHyH8GBduKOs49 xrW4Xl+jQkpWebhvnTdjosUNdiw0lID34v8xvnIh61FSg9UPPhSJdq3i4VMlOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q5JZr72fKz14Rp; Tue, 25 Apr 2023 10:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33PAkSuC062403; Tue, 25 Apr 2023 10:46:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33PAkSUR062402; Tue, 25 Apr 2023 10:46:28 GMT (envelope-from git) Date: Tue, 25 Apr 2023 10:46:28 GMT Message-Id: <202304251046.33PAkSUR062402@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Sergey A. Osokin" Subject: git: dd35cf3590e8 - main - net-im/telegram-desktop: update 4.8.0 -> 4.8.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: osa X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dd35cf3590e882c46413e3cc19443d5822610662 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=dd35cf3590e882c46413e3cc19443d5822610662 commit dd35cf3590e882c46413e3cc19443d5822610662 Author: Sergey A. Osokin AuthorDate: 2023-04-25 10:42:39 +0000 Commit: Sergey A. Osokin CommitDate: 2023-04-25 10:46:21 +0000 net-im/telegram-desktop: update 4.8.0 -> 4.8.1 Fix build with QT6. (*) Also, fix SYSTEM_FONTS option. Patches from: https://github.com/telegramdesktop/tdesktop/pull/26219 (*) Fixes: f7596f833caa1b18c84714e4648008a3fc78bbb2 --- net-im/telegram-desktop/Makefile | 4 ++-- net-im/telegram-desktop/distinfo | 6 +++--- ...h-Telegram_SourceFiles_api_api_chat_filters_cpp | 14 +++++++++++++ ...SourceFiles_boxes_filters_edit_filter_links_cpp | 23 ++++++++++++++++++++++ ...egram_SourceFiles_settings_settings_folders_cpp | 14 +++++++++++++ ...gram_SourceFiles_window_window_filters_menu_cpp | 14 +++++++++++++ 6 files changed, 70 insertions(+), 5 deletions(-) diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index de037500570a..aa3c5e5089b8 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -1,5 +1,5 @@ PORTNAME= telegram-desktop -DISTVERSION= 4.8.0 +DISTVERSION= 4.8.1 CATEGORIES= net-im MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ DISTNAME= tdesktop-${DISTVERSION}-full @@ -93,7 +93,7 @@ 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= DESKTOP_APP_USE_PACKAGED_FONTS +SYSTEM_FONTS_CMAKE_BOOL_OFF= DESKTOP_APP_USE_PACKAGED_FONTS # 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 7d720dfa71db..ac711158bb98 100644 --- a/net-im/telegram-desktop/distinfo +++ b/net-im/telegram-desktop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1682201134 -SHA256 (tdesktop-4.8.0-full.tar.gz) = 99d50c75171c8c6e74b2b9298db48deff32a60ced35195f9279469914b8ee1f9 -SIZE (tdesktop-4.8.0-full.tar.gz) = 63994851 +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 000000000000..267e419cb7ca --- /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 000000000000..f9cf3585a624 --- /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 000000000000..bb4b01dcc26d --- /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 000000000000..931f5b673762 --- /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();