From nobody Tue Oct 17 18:14:13 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 4S92Dj3lsSz4xq1D; Tue, 17 Oct 2023 18:14: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 4S92Dj3C9cz4dtm; Tue, 17 Oct 2023 18:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697566453; 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=4mk87LnKRIDY41+kO1bhJTL4PpOQBFPnkECR3t5YE2o=; b=hly44StvA0gxZNtRLKoIj8Ub39A2nEmsFzIoXIfQFx9RkIbc0xlvAx8jPUSgfskk2kB7BM OKw6bX0Zjbvq1y4yru08ustum+N+1NujAa+4Ow4s1BhMNZ2Kbbyn+8goT/hHxUYJFK8UWz or3z01IhIS8EOsB4WvoQvnmUIxpGQ+eUicDBOlFNoBEdHWXZoyOvj/NeZeVbX/m3GSio0D X4a+Nsgv/H1IKA42oaepee3Dl3MgG5nUk00G7zPyFR+bQkMqIcHhyC5fdHvlF5n+UBL1qs ahJ4MQBMGvhyS9elizQ2aXNt8wMJ3bQmZLyxzXT7j7y9lIUUVpuv/rA2khEXMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697566453; a=rsa-sha256; cv=none; b=k62lfcsGkBLzVtsJBPORD7lEif1hN5fcPkmtrsijLG0WV8AJjmmLN0gudkMyZx8rKM/ZzT N2Tog7btF6h/KVX50CvrDkjXW4lH8Byf0mV87XEJvsmjebO5J2eW3Lw/kQKnBW+mWtffjG 7vEqRRWX+mMCCXuT1mgUEyhyAn5qMthDrDbnjtcts/w9JQUsc1GRaDbyalffHomn79U7et sFzlZFd5xnZLf2v3ewcsVN//g7EbL0posXkAeV3Txng6CKGWqlBJKiy3bUpjZZgG+OCTxP HxZSGJh53OPj+2gjpR6YSXw7szdJMIUVlMVWNzyVpbah2jBty1alSzcyEn9jLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697566453; 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=4mk87LnKRIDY41+kO1bhJTL4PpOQBFPnkECR3t5YE2o=; b=FCG1ohc27XshZ65T66DPeVU68tC2ImaEPvPSoptOCKJAhLmAc3HtFqiXHdHW+X0s88w4SS kJQz/ldb06SauSBudC4vkFWiWUzgu1RIgrNQYfajHVrv2YjcXbd454TojWTm32IixAcUGp e4s3GTpYuAPMakaY+KX3RUgLq5xcXUpZB8+0etLR3ipVhN8Jf34aO/HecdbOLedmpKfceg hJDFIZqRpIRc3wrPNEP+a7Z/JatWhSgzlu2DD+6JJa9zZJq/VqOhkX/vAn5zAWeZ5tmCwr kYzCCNtQgBdRdEyXOC24BpBv5TZ9TicdqNCjZ8FWJ4B8riUvpVX87DHwPmJGfA== 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 4S92Dj2HcjzZxt; Tue, 17 Oct 2023 18:14:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39HIEDSn063337; Tue, 17 Oct 2023 18:14:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39HIEDNw063334; Tue, 17 Oct 2023 18:14:13 GMT (envelope-from git) Date: Tue, 17 Oct 2023 18:14:13 GMT Message-Id: <202310171814.39HIEDNw063334@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dima Panov Subject: git: 6e326bce9b96 - 2023Q4 - net-im/telegram-desktop: update to 4.10.3 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: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 6e326bce9b96362fa7b0053627b5a005decf2f42 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=6e326bce9b96362fa7b0053627b5a005decf2f42 commit 6e326bce9b96362fa7b0053627b5a005decf2f42 Author: Sergey A. Osokin AuthorDate: 2023-10-02 23:24:04 +0000 Commit: Dima Panov CommitDate: 2023-10-17 18:13:45 +0000 net-im/telegram-desktop: update to 4.10.3 (cherry picked from commit 329065bd5d1cd3c147456013c64002b689e29f66) --- net-im/telegram-desktop/Makefile | 2 +- net-im/telegram-desktop/distinfo | 6 +- ...latform_linux_notifications__manager__linux.cpp | 113 +-------------------- ...se_platform_linux_base__linux__xdp__utilities.h | 20 ---- 4 files changed, 6 insertions(+), 135 deletions(-) diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index e0cd2f60463e..4b736654360c 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -1,5 +1,5 @@ PORTNAME= telegram-desktop -DISTVERSION= 4.10.2 +DISTVERSION= 4.10.3 CATEGORIES= net-im MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ DISTNAME= tdesktop-${DISTVERSION}-full diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo index da57f3853eef..cc7f9cbc0ded 100644 --- a/net-im/telegram-desktop/distinfo +++ b/net-im/telegram-desktop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1696263386 -SHA256 (tdesktop-4.10.2-full.tar.gz) = 3f7aa12bf421a7fb6e9db9669f63bb6e1351cec2e7567551cef4ff2d936f2a27 -SIZE (tdesktop-4.10.2-full.tar.gz) = 67750091 +TIMESTAMP = 1696278627 +SHA256 (tdesktop-4.10.3-full.tar.gz) = 09d793834f7a25614ba23995e2290002a09e8e790520b4a265d0f7c3592c396e +SIZE (tdesktop-4.10.3-full.tar.gz) = 67750018 diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_notifications__manager__linux.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_notifications__manager__linux.cpp index f0ce20468478..1f69d447fd4f 100644 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_notifications__manager__linux.cpp +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_notifications__manager__linux.cpp @@ -1,77 +1,6 @@ ---- Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp.orig 2023-09-29 15:29:53 UTC +--- Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp.orig 2023-10-02 20:31:34 UTC +++ Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp -@@ -53,6 +53,10 @@ bool ServiceRegistered = false; - ServerInformation CurrentServerInformation; - std::vector CurrentCapabilities; - -+[[nodiscard]] bool HasCapability(const char *value) { -+ return ranges::contains(CurrentCapabilities, value, &Glib::ustring::raw); -+} -+ - void Noexcept(Fn callback, Fn failed = nullptr) noexcept { - try { - callback(); -@@ -446,7 +450,6 @@ bool NotificationData::init( - } - - const auto weak = base::make_weak(this); -- const auto &capabilities = CurrentCapabilities; - - const auto signalEmitted = crl::guard(weak, [=]( - const Glib::RefPtr &connection, -@@ -496,7 +499,7 @@ bool NotificationData::init( - - _imageKey = GetImageKey(CurrentServerInformation.specVersion); - -- if (ranges::contains(capabilities, "body-markup")) { -+ if (HasCapability("body-markup")) { - _title = title.toStdString(); - - _body = subtitle.isEmpty() -@@ -512,7 +515,7 @@ bool NotificationData::init( - _body = msg.toStdString(); - } - -- if (ranges::contains(capabilities, "actions")) { -+ if (HasCapability("actions")) { - _actions.push_back("default"); - _actions.push_back(tr::lng_open_link(tr::now).toStdString()); - -@@ -523,7 +526,7 @@ bool NotificationData::init( - tr::lng_context_mark_read(tr::now).toStdString()); - } - -- if (ranges::contains(capabilities, "inline-reply") -+ if (HasCapability("inline-reply") - && !options.hideReplyButton) { - _actions.push_back("inline-reply"); - _actions.push_back( -@@ -553,13 +556,13 @@ bool NotificationData::init( - kObjectPath); - } - -- if (ranges::contains(capabilities, "action-icons")) { -+ if (HasCapability("action-icons")) { - _hints["action-icons"] = Glib::create_variant(true); - } - - // suppress system sound if telegram sound activated, - // otherwise use system sound -- if (ranges::contains(capabilities, "sound")) { -+ if (HasCapability("sound")) { - if (Core::App().settings().soundNotify()) { - _hints["suppress-sound"] = Glib::create_variant(true); - } else { -@@ -569,7 +572,7 @@ bool NotificationData::init( - } - } - -- if (ranges::contains(capabilities, "x-canonical-append")) { -+ if (HasCapability("x-canonical-append")) { - _hints["x-canonical-append"] = Glib::create_variant( - Glib::ustring("true")); - } -@@ -805,7 +808,7 @@ bool ByDefault() { +@@ -814,7 +814,7 @@ bool ByDefault() { // A list of capabilities that offer feature parity // with custom notifications @@ -80,41 +9,3 @@ // To show message content "body", // To have buttons on notifications -@@ -816,7 +819,7 @@ bool ByDefault() { - // (no, using sound capability is not a way) - "inhibitions", - }, [](const auto *capability) { -- return ranges::contains(CurrentCapabilities, capability); -+ return HasCapability(capability); - }); - } - -@@ -909,7 +912,6 @@ class Manager::Private : public base::has_weak_ptr { ( - Manager::Private::Private(not_null manager) - : _manager(manager) { - const auto &serverInformation = CurrentServerInformation; -- const auto &capabilities = CurrentCapabilities; - - if (!serverInformation.name.empty()) { - LOG(("Notification daemon product name: %1") -@@ -931,17 +933,17 @@ Manager::Private::Private(not_null manager) - .arg(serverInformation.specVersion.toString())); - } - -- if (!capabilities.empty()) { -+ if (!CurrentCapabilities.empty()) { - LOG(("Notification daemon capabilities: %1").arg( - ranges::fold_left( -- capabilities, -+ CurrentCapabilities, - "", - [](const Glib::ustring &a, const Glib::ustring &b) { - return a + (a.empty() ? "" : ", ") + b; - }).c_str())); - } - -- if (ranges::contains(capabilities, "inhibitions")) { -+ if (HasCapability("inhibitions")) { - Noexcept([&] { - _dbusConnection = Gio::DBus::Connection::get_sync( - Gio::DBus::BusType::SESSION); diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__linux__xdp__utilities.h b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__linux__xdp__utilities.h deleted file mode 100644 index 79c5514df801..000000000000 --- a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__linux__xdp__utilities.h +++ /dev/null @@ -1,20 +0,0 @@ ---- Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.h.orig 2023-10-01 14:40:15 UTC -+++ Telegram/lib_base/base/platform/linux/base_linux_xdp_utilities.h -@@ -78,7 +78,7 @@ class SettingWatcher { (public) - - template - SettingWatcher(Callback callback) -- : SettingWatcher(Fn(callback)) { -+ : SettingWatcher(std::function(callback)) { - } - - template -@@ -101,7 +101,7 @@ class SettingWatcher { (public) - const Glib::ustring &group, - const Glib::ustring &key, - Callback callback) -- : SettingWatcher(group, key, Fn(callback)) { -+ : SettingWatcher(group, key, std::function(callback)) { - } - - ~SettingWatcher();