From nobody Thu Dec 8 22:11:02 2022 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 4NSpJQ6j8gz4jbtq; Thu, 8 Dec 2022 22:11:02 +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 4NSpJQ5zgPz3kl2; Thu, 8 Dec 2022 22:11:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670537462; 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=SSzDH1Patfm0CIQb4CJq3NxkQ0uz2HzIl61YHeoxL4E=; b=rS9lHw2RkuncRZp5725IuTNID0jChrQ8g+IXT4AOSX2JuoqMUa8tj2S4gz1CKvwhXhnp8T 2hSEeqlcn43kylY+g9x+LZzO7CR+IQbpRUsH2LIsCCQn7xY8c0wKnivKcXdfT4puE+jcHr LqDqDH4/Ztmh5PdA1BaMiXvvM79P9kdzksI0eHwmJ7CXqn2ZKKwH4Zm6ED1ZUUHBnedBh3 dIoLS7pOfRjGxKAEjJWDncic7ECTP/p4sBikXkjtcrF0TubZxXAumnY1NLhYx992Wu7964 gGRePwpK7fe9MLL/FXYQdtHxyITYqEPyB2C4aZhRz0ZkgnMMh7OktGRaUsczCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670537462; 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=SSzDH1Patfm0CIQb4CJq3NxkQ0uz2HzIl61YHeoxL4E=; b=br5v1DcOsTg1r5/2UH78WnOCvTy1JwacHFJjP7J87vXlGtDMdZaaCHWv2eF835eBjYgG+a cC3adIZTVnsB8n+uae1sb6CD8bYSgnCcrFq+VCgvB3Oa7sn/XXprv64cViDpmH38vqyzIR gNBRxwU9SB0gUcw4ieX2U+Jg/011Z+fjaF6n42VejjQ/8vd6rSVT96/aJmKM8zgpCUO0Jk am05/iZOwO9J8rRH7kKHsmFl/DO/wJHZj5uzZ/Kffq31Ft9FgeZ3fvg/XFJo7zwMBj4gvn jr3nqZboDBHdC1IHkktSTo/tkEUYQgjfANGkKpff1Jx78oin4h/hvbuRv9uQxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670537462; a=rsa-sha256; cv=none; b=KtdavF5C8GZOO/aRxPUapHgkEKnkBe+Q3SWSbCHI/uRETekcjI8topa9aHnQzTe7HaMM31 F32L56Ds0MA1YS7iEQE9bFGW0Hs7y8lUEG8wduq6qgog0/OoV+uqIbXd4Gg6yUXz3yiExo 5L4U9r7fHfjdc3v4mlVAL10VqnBrQ7Uu1MKrf48dwxj+sNcK/OdlZb1D1x1HLrcQoApBxz 8bG2PDHZ4laahtHTOcB8T/nae7r7M74NEhC5McBiA9jdsZpFemxMEulCXru/dKjjG38lwQ z1rzXbw7srQniwHHyugLyDDWjELz2bnzWGFoyBNerorf7nzJx2UiBRkt/ozY1Q== 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 4NSpJQ54zFz19wp; Thu, 8 Dec 2022 22:11:02 +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 2B8MB2tC084378; Thu, 8 Dec 2022 22:11:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B8MB2Go084377; Thu, 8 Dec 2022 22:11:02 GMT (envelope-from git) Date: Thu, 8 Dec 2022 22:11:02 GMT Message-Id: <202212082211.2B8MB2Go084377@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: 01e12e4ddf12 - main - net-im/telegram-desktop: update from 4.2.4 to 4.4.1 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: 01e12e4ddf12b64c1f49f9e17059678d8476b5c2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by osa: URL: https://cgit.FreeBSD.org/ports/commit/?id=01e12e4ddf12b64c1f49f9e17059678d8476b5c2 commit 01e12e4ddf12b64c1f49f9e17059678d8476b5c2 Author: Sergey A. Osokin AuthorDate: 2022-12-08 22:07:24 +0000 Commit: Sergey A. Osokin CommitDate: 2022-12-08 22:07:24 +0000 net-im/telegram-desktop: update from 4.2.4 to 4.4.1 Patches obtained from: https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tdesktop/patches/ Hotfix for Qt5: https://github.com/telegramdesktop/tdesktop/commit/5990b0fabf4c28e70955b4b52965609dc282a5fe Special thanks to: Klemens Nanni --- net-im/telegram-desktop/Makefile | 9 ++-- net-im/telegram-desktop/distinfo | 6 +-- ...latform_linux_notifications__manager__linux.cpp | 54 ++++++++++++++++++++++ ..._SourceFiles_platform_linux_specific__linux.cpp | 39 ++++++++++++++++ ...ase_platform_linux_base__last__input__linux.cpp | 21 +++++++++ net-im/telegram-desktop/pkg-plist | 4 +- 6 files changed, 124 insertions(+), 9 deletions(-) diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index 2d1b9476ba07..4b61f33b21d4 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -1,6 +1,5 @@ PORTNAME= telegram-desktop -DISTVERSION= 4.2.4 -PORTREVISION= 1 +DISTVERSION= 4.4.1 CATEGORIES= net-im MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ DISTNAME= tdesktop-${DISTVERSION}-full @@ -33,10 +32,12 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \ libhunspell-1.7.so:textproc/hunspell \ libjpeg.so:graphics/jpeg-turbo \ liblz4.so:archivers/liblz4 \ + libminizip.so:archivers/minizip \ libopenal.so:audio/openal-soft \ libopenh264.so:multimedia/openh264 \ libopus.so:audio/opus \ libpipewire-0.3.so:multimedia/pipewire \ + libprotobuf.so:devel/protobuf \ libqrcodegencpp.so:graphics/qr-code-generator \ librnnoise.so:audio/rnnoise \ libxcb-keysyms.so:x11/xcb-util-keysyms \ @@ -52,7 +53,7 @@ qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 qt6_CONFLICTS_INSTALL= ${PORTNAME} USES= cmake compiler:c++17-lang desktop-file-utils gl \ - gnome pkgconfig python:3.7+,build ssl xorg + gnome localbase pkgconfig python:3.7+,build ssl xorg USE_GITHUB= nodefault GH_ACCOUNT= telegramdesktop @@ -69,7 +70,7 @@ USE_QT= 5compat base imageformats lottie shadertools svg tools:build wayland .endif USE_GL= gl -USE_GNOME= glib20 glibmm +USE_GNOME= glib20 glibmm26 USE_XORG= x11 xcb xcomposite xdamage xext xfixes xrandr xrender xtst CMAKE_ARGS= -DDESKTOP_APP_SPECIAL_TARGET="" -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \ diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo index 1ef1665503fe..217bbbf98d1f 100644 --- a/net-im/telegram-desktop/distinfo +++ b/net-im/telegram-desktop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1664664542 -SHA256 (tdesktop-4.2.4-full.tar.gz) = a8109fce9d55553efcbc7c3d9349869e1e267113f5badaf48cf4e0c25cd559d1 -SIZE (tdesktop-4.2.4-full.tar.gz) = 49210806 +TIMESTAMP = 1670536925 +SHA256 (tdesktop-4.4.1-full.tar.gz) = 76981e32541c42b3212427e9abb4db2a6f55a14eaba31b3d7ad7d3d5ed8008b1 +SIZE (tdesktop-4.4.1-full.tar.gz) = 50077498 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 new file mode 100644 index 000000000000..99edcb91d928 --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_notifications__manager__linux.cpp @@ -0,0 +1,54 @@ +--- Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp.orig 2022-12-07 09:41:04 UTC ++++ Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp +@@ -75,12 +75,17 @@ std::unique_ptr + try { + const auto connection = Gio::DBus::Connection::get_sync( + Gio::DBus::BusType::SESSION); ++ const auto GlibNames = ++ base::Platform::DBus::ListActivatableNames(connection); ++ const std::vector StringNames( ++ GlibNames.begin(), GlibNames.end() ++ ); + + const auto activatable = [&] { + try { + return ranges::contains( +- base::Platform::DBus::ListActivatableNames(connection), +- Glib::ustring(std::string(kService))); ++ StringNames, ++ std::string(kService)); + } catch (...) { + // avoid service restart loop in sandboxed environments + return true; +@@ -129,7 +134,7 @@ void StartServiceAsync(Fn callback) { + }; + + const auto errorName = +- Gio::DBus::ErrorUtils::get_remote_error(e); ++ Gio::DBus::ErrorUtils::get_remote_error(e).raw(); + + if (!ranges::contains(NotSupportedErrors, errorName)) { + throw e; +@@ -151,6 +156,11 @@ bool GetServiceRegistered() { + try { + const auto connection = Gio::DBus::Connection::get_sync( + Gio::DBus::BusType::SESSION); ++ const auto GlibNames = ++ base::Platform::DBus::ListActivatableNames(connection); ++ const std::vector StringNames( ++ GlibNames.begin(), GlibNames.end() ++ ); + + const auto hasOwner = [&] { + try { +@@ -165,8 +175,8 @@ bool GetServiceRegistered() { + static const auto activatable = [&] { + try { + return ranges::contains( +- DBus::ListActivatableNames(connection), +- Glib::ustring(std::string(kService))); ++ StringNames, ++ std::string(kService)); + } catch (...) { + return false; + } diff --git a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_specific__linux.cpp b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_specific__linux.cpp new file mode 100644 index 000000000000..364d86fdf5f7 --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_specific__linux.cpp @@ -0,0 +1,39 @@ +--- Telegram/SourceFiles/platform/linux/specific_linux.cpp.orig 2022-12-07 09:41:04 UTC ++++ Telegram/SourceFiles/platform/linux/specific_linux.cpp +@@ -244,12 +244,16 @@ void LaunchGApplication() { + const auto activatableNames = [&] { + try { + if (connection) { +- return ListActivatableNames(connection); ++ const auto GlibNames = ++ ListActivatableNames(connection); ++ return std::vector( ++ GlibNames.begin(), GlibNames.end() ++ ); + } + } catch (...) { + } + +- return std::vector(); ++ return std::vector(); + }(); + + const auto freedesktopNotifications = [&] { +@@ -356,7 +360,7 @@ void LaunchGApplication() { + + using Window::Notifications::Manager; + using NotificationId = Manager::NotificationId; +- using NotificationIdTuple = std::result_of< ++ using NotificationIdTuple = ranges::result_of< + decltype(&NotificationId::toTuple)(NotificationId*) + >::type; + +@@ -731,7 +735,7 @@ void start() { + md5Hash.data()); + } + +- return u"org.telegram.desktop._%1.desktop"_q.arg(md5Hash); ++ return u"org.telegram.desktop._%1.desktop"_q.arg(md5Hash.constData()); + } + + return u"org.telegram.desktop.desktop"_q; diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__last__input__linux.cpp b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__last__input__linux.cpp new file mode 100644 index 000000000000..82f5a0b7acf8 --- /dev/null +++ b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__last__input__linux.cpp @@ -0,0 +1,21 @@ +--- Telegram/lib_base/base/platform/linux/base_last_input_linux.cpp.orig 2022-12-07 06:59:17 UTC ++++ Telegram/lib_base/base/platform/linux/base_last_input_linux.cpp +@@ -103,7 +103,7 @@ std::optional FreedesktopDBusLastUserInputT + "org.freedesktop.DBus.Error.AccessDenied", + }; + +- const auto errorName = Gio::DBus::ErrorUtils::get_remote_error(e); ++ const auto errorName = Gio::DBus::ErrorUtils::get_remote_error(e).raw(); + if (ranges::contains(NotSupportedErrors, errorName)) { + NotSupported = true; + return std::nullopt; +@@ -163,7 +163,7 @@ std::optional MutterDBusLastUserInputTime() + "org.freedesktop.DBus.Error.AccessDenied", + }; + +- const auto errorName = Gio::DBus::ErrorUtils::get_remote_error(e); ++ const auto errorName = Gio::DBus::ErrorUtils::get_remote_error(e).raw(); + if (ranges::contains(NotSupportedErrors, errorName)) { + NotSupported = true; + return std::nullopt; + diff --git a/net-im/telegram-desktop/pkg-plist b/net-im/telegram-desktop/pkg-plist index 9f9a17a5ff0e..106d6671dbba 100644 --- a/net-im/telegram-desktop/pkg-plist +++ b/net-im/telegram-desktop/pkg-plist @@ -1,5 +1,5 @@ bin/telegram-desktop -share/applications/telegramdesktop.desktop +share/applications/org.telegram.desktop.desktop share/icons/hicolor/128x128/apps/telegram.png share/icons/hicolor/16x16/apps/telegram.png share/icons/hicolor/256x256/apps/telegram.png @@ -7,4 +7,4 @@ share/icons/hicolor/32x32/apps/telegram.png share/icons/hicolor/48x48/apps/telegram.png share/icons/hicolor/512x512/apps/telegram.png share/icons/hicolor/64x64/apps/telegram.png -share/metainfo/telegramdesktop.metainfo.xml +share/metainfo/org.telegram.desktop.metainfo.xml