git: 6e326bce9b96 - 2023Q4 - net-im/telegram-desktop: update to 4.10.3
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 17 Oct 2023 18:14:13 UTC
The branch 2023Q4 has been updated by fluffy:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6e326bce9b96362fa7b0053627b5a005decf2f42
commit 6e326bce9b96362fa7b0053627b5a005decf2f42
Author: Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2023-10-02 23:24:04 +0000
Commit: Dima Panov <fluffy@FreeBSD.org>
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<Glib::ustring> CurrentCapabilities;
-
-+[[nodiscard]] bool HasCapability(const char *value) {
-+ return ranges::contains(CurrentCapabilities, value, &Glib::ustring::raw);
-+}
-+
- void Noexcept(Fn<void()> callback, Fn<void()> 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<Gio::DBus::Connection> &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(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*> 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 <typename Callback>
- SettingWatcher(Callback callback)
-- : SettingWatcher(Fn(callback)) {
-+ : SettingWatcher(std::function(callback)) {
- }
-
- template <typename ...Args>
-@@ -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();