diff options
author | Sergey A. Osokin <osa@FreeBSD.org> | 2022-12-30 20:36:41 -0500 |
---|---|---|
committer | Sergey A. Osokin <osa@FreeBSD.org> | 2022-12-30 20:39:17 -0500 |
commit | 3637dcfb119c87bcb09b87072fb4f3d23aae37a7 (patch) | |
tree | 3d9e16cee3e136c81eaf8ed6bd0b03c27eec22f8 /net-im/telegram-desktop | |
parent | graphics/comical: Cleanup EXPIRED ports (diff) |
net-im/t*: update Telegram Desktop from 4.4.1 to 4.5.0
While I'm here remove legacy options.
Changelog: https://desktop.telegram.org/changelog
Diffstat (limited to 'net-im/telegram-desktop')
5 files changed, 5 insertions, 127 deletions
diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile index 1f177a83b9de..2bd256476561 100644 --- a/net-im/telegram-desktop/Makefile +++ b/net-im/telegram-desktop/Makefile @@ -1,5 +1,5 @@ PORTNAME= telegram-desktop -DISTVERSION= 4.4.1 +DISTVERSION= 4.5.0 CATEGORIES= net-im MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/ DISTNAME= tdesktop-${DISTVERSION}-full @@ -28,7 +28,6 @@ LIB_DEPENDS= libabsl_base.so:devel/abseil \ libavformat.so:multimedia/ffmpeg \ libdbus-1.so:devel/dbus \ libdispatch.so:devel/libdispatch \ - libenchant-2.so:textproc/enchant2 \ libhunspell-1.7.so:textproc/hunspell \ libjpeg.so:graphics/jpeg-turbo \ liblz4.so:archivers/liblz4 \ @@ -73,9 +72,7 @@ USE_GL= gl 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" \ - -DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} \ - -Ddisable_autoupdate=1 +CMAKE_ARGS= -DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} CMAKE_ON= DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \ DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION CMAKE_OFF= DESKTOP_APP_USE_PACKAGED_FONTS @@ -89,19 +86,14 @@ NO_CCACHE= yes # Telegram uses OpenAL for its audio, but libtgvoip (for voice calls) can use PulseAudio or ALSA. # It dynamically loads PulseAudio, and if this fails, it loads ALSA. # If both of them are not installed, then voice calls do not work, but other functionalities still work. -OPTIONS_DEFINE= WEBKIT OPTIONS_DEFAULT= ALSA OPTIONS_MULTI= AUDIO OPTIONS_MULTI_AUDIO= ALSA PULSEAUDIO AUDIO_DESC= Audio backend for voice calls -WEBKIT_DESC= WebKit-gtk integration for payments ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio -WEBKIT_CMAKE_BOOL_OFF= DESKTOP_APP_DISABLE_WEBKITGTK -WEBKIT_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 -WEBKIT_USE= GNOME=cairo,gtk30 # 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 217bbbf98d1f..32c004940c6c 100644 --- a/net-im/telegram-desktop/distinfo +++ b/net-im/telegram-desktop/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1670536925 -SHA256 (tdesktop-4.4.1-full.tar.gz) = 76981e32541c42b3212427e9abb4db2a6f55a14eaba31b3d7ad7d3d5ed8008b1 -SIZE (tdesktop-4.4.1-full.tar.gz) = 50077498 +TIMESTAMP = 1672431846 +SHA256 (tdesktop-4.5.0-full.tar.gz) = 9ba9eab6ae4b8be96056007e0fce36996b6bd2bbdec16bfb73a28b9208ceba93 +SIZE (tdesktop-4.5.0-full.tar.gz) = 63715621 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 deleted file mode 100644 index 99edcb91d928..000000000000 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_notifications__manager__linux.cpp +++ /dev/null @@ -1,54 +0,0 @@ ---- 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<base::Platform::DBus::ServiceWatcher> - try { - const auto connection = Gio::DBus::Connection::get_sync( - Gio::DBus::BusType::SESSION); -+ const auto GlibNames = -+ base::Platform::DBus::ListActivatableNames(connection); -+ const std::vector<std::string> 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<void()> 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<std::string> 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 deleted file mode 100644 index 364d86fdf5f7..000000000000 --- a/net-im/telegram-desktop/files/patch-Telegram_SourceFiles_platform_linux_specific__linux.cpp +++ /dev/null @@ -1,39 +0,0 @@ ---- 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<std::string>( -+ GlibNames.begin(), GlibNames.end() -+ ); - } - } catch (...) { - } - -- return std::vector<Glib::ustring>(); -+ return std::vector<std::string>(); - }(); - - 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 deleted file mode 100644 index 82f5a0b7acf8..000000000000 --- a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__last__input__linux.cpp +++ /dev/null @@ -1,21 +0,0 @@ ---- 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<crl::time> 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<crl::time> 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; - |