From nobody Mon Jun 19 01:49:12 2023 X-Original-To: dev-commits-ports-all@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 4Qkt3Y4GmZz4fxlp; Mon, 19 Jun 2023 01:49:13 +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 4Qkt3Y12MJz4QXt; Mon, 19 Jun 2023 01:49:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687139353; 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=T0Q5Kjnq9U96ue5amYOi6gtMv99yba86H3WRW963qJY=; b=w6bjw7JU5FgO0mIm9qWesUjfnm4mnnrmNI2v2rgQBaTvT/MkwuQNYSBD4BWSrW8jRDrpaA 3zgwRR8hhfuy15CFvaiNwXV4bEAZ+EH60Br4CzQ0ObNlzbnR4PgP2n6GDv+KQ1geVEsErs ZxXWtogR4WKgyL2CEA9y8w3VtoFLk0XwRH2rdacL7GcQU0P8u6ZAK5tyV/gHY9bBl+YyN/ eAK4NLzSUnaHPiU37B5m1lpCy+rDNBrzMAFyJXFOGG/aoxnWMZDMwIy08K0oDraXt3Dc2u 3Lkbtd5b+KkJNOp1GzBWzH5FBXPacHD+YqpvRjcmjbrkNX4BMFhj5z+cEptnfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687139353; 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=T0Q5Kjnq9U96ue5amYOi6gtMv99yba86H3WRW963qJY=; b=Hyb4JyquCpS4tTJZ6FNuhu0VdPsEgIv6/+SToz0OTwsi053PCTSAZnmmknIqICGOkTFeoO wvQ9toIBA9zVkqhq0q/1FGRcci8V1+9mjfXrTs7I/FFwpjxS99aS9s805lne+HCGnte00z /X7lVSzvMIzdqYedq6h/OznLRXqqjMi13Hk3rXQnQZVaHJBhlCAyk9KyB6uuIlzhEER5h+ 2IVBRyzjtA919UUxlmENsFefzPg1EN2aohObLdjASQGeMGutWgaIyQ5Xafj6sWEtaaIpHZ odNntS1PMXAccWwScumNmiOuVkb2tDWM05cy+RBN4y9xAqgnt7/XP2ytbk8QGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687139353; a=rsa-sha256; cv=none; b=vXemL3rWDuwRcIMHD0Imw9E1do/CmPp5wv1DtmWVPmjqNar8R+15lmMxn/M9u5OCgbBEMl ALJc8ExXaYsMAziwYVHaaJMbN/Hf3Z/WRMikqIcAlQIAJm83boZNEUkvlGcXVZeBaS8Y3Q UharL11CV+Wbyo7n5G7gmqzS6KLH8I6KB4SyB/QJiPxTMyka7c7ottKMb2TIrR2WsyCS2p sblJCBmRSOFIPTNkiLoYobTpjFdb7B4Dnum4jRi+awTaVZ2oHwZ6Bpp4DH78PQ9onUzKNH Tm9E/FEzyUDhwkOzoK0jSqIG/YFb9Oe4TH5KfbeqemXIIiF9ClQz9vmQVnDcCA== 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 4Qkt3Y07pxzySB; Mon, 19 Jun 2023 01:49:13 +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 35J1nCQR013473; Mon, 19 Jun 2023 01:49:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35J1nCGe013472; Mon, 19 Jun 2023 01:49:12 GMT (envelope-from git) Date: Mon, 19 Jun 2023 01:49:12 GMT Message-Id: <202306190149.35J1nCGe013472@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: 1e0f6a02b5b8 - main - net-im/telegram-desktop: update to 4.8.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 1e0f6a02b5b8b59d3e130d22c2a2224bf5907871 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=1e0f6a02b5b8b59d3e130d22c2a2224bf5907871 commit 1e0f6a02b5b8b59d3e130d22c2a2224bf5907871 Author: Sergey A. Osokin AuthorDate: 2023-06-19 01:13:41 +0000 Commit: Sergey A. Osokin CommitDate: 2023-06-19 01:49:07 +0000 net-im/telegram-desktop: update to 4.8.4 --- net-im/telegram-desktop/Makefile | 9 +++++---- 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 ------------- ..._linux_base__system__media__controls__linux.cpp | 17 ++++++++++++++++ ...patch-cmake_external_glib_cppgir_CMakeLists.txt | 13 ++++++++++++ ...tch-cmake_external_glib_cppgir_tools_cppgir.cpp | 13 ++++++++++++ ...h-cmake_external_glib_cppgir_tools_function.hpp | 8 ++++++++ ...ch-cmake_external_glib_cppgir_tools_genbase.cpp | 8 ++++++++ ...atch-cmake_external_glib_cppgir_tools_genns.cpp | 13 ++++++++++++ 12 files changed, 80 insertions(+), 72 deletions(-) diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index e4403a2729ac..054b1b3e6fb2 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -1,6 +1,5 @@ PORTNAME= telegram-desktop -DISTVERSION= 4.8.1 -PORTREVISION= 4 +DISTVERSION= 4.8.4 CATEGORIES= net-im MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ DISTNAME= tdesktop-${DISTVERSION}-full @@ -19,7 +18,8 @@ BROKEN_SSL_REASON= undefined symbol: ERR_load_BIO_strings NOT_FOR_ARCHS= powerpc powerpc64 powerpcspe NOT_FOR_ARCHS_REASON= Only little endian is supported -BUILD_DEPENDS= microsoft-gsl>0:devel/microsoft-gsl \ +BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ + microsoft-gsl>0:devel/microsoft-gsl \ range-v3>0:devel/range-v3 \ tl-expected>0:devel/tl-expected \ v4l_compat>0:multimedia/v4l_compat \ @@ -29,6 +29,7 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \ libavformat.so:multimedia/ffmpeg \ libdbus-1.so:devel/dbus \ libdispatch.so:devel/libdispatch \ + libfmt.so:devel/libfmt \ libhunspell-1.7.so:textproc/hunspell \ liblz4.so:archivers/liblz4 \ libopenh264.so:multimedia/openh264 \ @@ -68,7 +69,7 @@ USE_QT= 5compat base imageformats lottie shadertools svg tools:build wayland .endif USE_GL= gl -USE_GNOME= glib20 glibmm26 +USE_GNOME= glib20 glibmm26 introspection USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrandr xrender xtst CMAKE_ARGS= -DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo index ac711158bb98..f343cf8ca583 100644 --- a/net-im/telegram-desktop/distinfo +++ b/net-im/telegram-desktop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1682388062 -SHA256 (tdesktop-4.8.1-full.tar.gz) = 96660bb151c035a80c5b32a8fe043cecb54e9fe450329cf612ecb752db68c06f -SIZE (tdesktop-4.8.1-full.tar.gz) = 63997319 +TIMESTAMP = 1687099818 +SHA256 (tdesktop-4.8.4-full.tar.gz) = 4328296df07557786e1b9cf22f6675200dbdf29c75d2efeb635c6b7f3f951e8d +SIZE (tdesktop-4.8.4-full.tar.gz) = 69090626 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 deleted file mode 100644 index 267e419cb7ca..000000000000 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_api_api_chat_filters_cpp +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index f9cf3585a624..000000000000 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_boxes_filters_edit_filter_links_cpp +++ /dev/null @@ -1,23 +0,0 @@ -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 deleted file mode 100644 index bb4b01dcc26d..000000000000 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_settings_settings_folders_cpp +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index 931f5b673762..000000000000 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_window_window_filters_menu_cpp +++ /dev/null @@ -1,14 +0,0 @@ -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(); diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__system__media__controls__linux.cpp b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__system__media__controls__linux.cpp new file mode 100644 index 000000000000..0f126e486ec7 --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__system__media__controls__linux.cpp @@ -0,0 +1,17 @@ +--- Telegram/lib_base/base/platform/linux/base_system_media_controls_linux.cpp.orig 2023-06-03 03:29:41 UTC ++++ Telegram/lib_base/base/platform/linux/base_system_media_controls_linux.cpp +@@ -16,11 +16,12 @@ + #include + #include + +-using namespace gi::repository; +- + namespace base::Platform { + + namespace { ++ ++using namespace gi::repository; ++namespace GObject = gi::repository::GObject; + + // QString to GLib::Variant. + inline auto Q2V(const QString &s) { diff --git a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_CMakeLists.txt b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_CMakeLists.txt new file mode 100644 index 000000000000..41ca852809b2 --- /dev/null +++ b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_CMakeLists.txt @@ -0,0 +1,13 @@ +--- cmake/external/glib/cppgir/CMakeLists.txt.orig 2023-05-17 06:10:31 UTC ++++ cmake/external/glib/cppgir/CMakeLists.txt +@@ -65,8 +65,8 @@ target_compile_definitions(cppgir PRIVATE + -DDEFAULT_GIRPATH=${GI_DEFAULT_GIRPATH}) + target_compile_definitions(cppgir PRIVATE + -DDEFAULT_IGNORE_FILE=${GI_IGNORE_FILE_INSTALL_DIR}/${GI_IGNORE_FILE}:${GI_IGNORE_FILE_INSTALL_DIR}/${GI_IGNORE_FILE_PLATFORM}) +-target_link_libraries(cppgir Boost::program_options stdc++fs ${FORMAT_LIBRARIES}) +-set_property(TARGET cppgir PROPERTY CXX_STANDARD 14) ++target_link_libraries(cppgir Boost::program_options ${FORMAT_LIBRARIES}) ++set_property(TARGET cppgir PROPERTY CXX_STANDARD 17) + + add_library(gi INTERFACE) + target_include_directories(gi INTERFACE diff --git a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_cppgir.cpp b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_cppgir.cpp new file mode 100644 index 000000000000..41e57cfe1ef5 --- /dev/null +++ b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_cppgir.cpp @@ -0,0 +1,13 @@ +--- cmake/external/glib/cppgir/tools/cppgir.cpp.orig 2023-06-15 00:49:41 UTC ++++ cmake/external/glib/cppgir/tools/cppgir.cpp +@@ -3,8 +3,8 @@ + #include "genns.hpp" + #include "repository.hpp" + +-#include +-namespace fs = std::experimental::filesystem; ++#include ++namespace fs = std::filesystem; + + #include + #include diff --git a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_function.hpp b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_function.hpp new file mode 100644 index 000000000000..6875de52fc6a --- /dev/null +++ b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_function.hpp @@ -0,0 +1,8 @@ +--- cmake/external/glib/cppgir/tools/function.hpp.orig 2023-06-15 00:41:50 UTC ++++ cmake/external/glib/cppgir/tools/function.hpp +@@ -1,3 +1,5 @@ ++#include ++ + #ifndef FUNCTION_HPP + #define FUNCTION_HPP + diff --git a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genbase.cpp b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genbase.cpp new file mode 100644 index 000000000000..ef2e474ce9ff --- /dev/null +++ b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genbase.cpp @@ -0,0 +1,8 @@ +--- cmake/external/glib/cppgir/tools/genbase.cpp.orig 2023-06-15 00:42:39 UTC ++++ cmake/external/glib/cppgir/tools/genbase.cpp +@@ -1,3 +1,5 @@ ++#include ++ + #include "genbase.hpp" + + static std::string diff --git a/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genns.cpp b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genns.cpp new file mode 100644 index 000000000000..8262affc33f2 --- /dev/null +++ b/net-im/telegram-desktop/files/patch-cmake_external_glib_cppgir_tools_genns.cpp @@ -0,0 +1,13 @@ +--- cmake/external/glib/cppgir/tools/genns.cpp.orig 2023-06-15 00:40:47 UTC ++++ cmake/external/glib/cppgir/tools/genns.cpp +@@ -5,8 +5,8 @@ + #include + #include + +-#include +-namespace fs = std::experimental::filesystem; ++#include ++namespace fs = std::filesystem; + + #include +