net-im/telegram-desktop: update to 2.6.1

ChangeLog: https://github.com/telegramdesktop/tdesktop/releases/tag/v2.6.1

While here, pet linters

PR:	254123
Submitted by:	henry.hu.sh@gmail.com (maintainer)

3 files changed, 18 insertions, 31 deletions

diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
index 695f3f64083b..8704cd431daf 100644
--- a/net-im/telegram-desktop/Makefile
+++ b/net-im/telegram-desktop/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	telegram-desktop
-DISTVERSION=	2.5.8
+DISTVERSION=	2.6.1
 CATEGORIES=	net-im
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
 DISTNAME=	tdesktop-${DISTVERSION}-full
@@ -13,9 +13,9 @@ COMMENT=	Telegram Desktop messaging app
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+BROKEN_i386=	Does not build, webrtc related.
 NOT_FOR_ARCHS=		powerpc powerpc64 powerpcspe
 NOT_FOR_ARCHS_REASON=	Only little endian is supported
-BROKEN_i386=	Does not build, webrtc related.
 
 BUILD_DEPENDS=	alsa-lib>0:audio/alsa-lib \
 		dee>0:devel/dee \
@@ -44,52 +44,50 @@ LIB_DEPENDS=	libavformat.so:multimedia/ffmpeg \
 USES=		cmake compiler:c++17-lang desktop-file-utils gl \
 		gnome pkgconfig python:3.7,build qt:5 ssl xorg
 
-# see Bugzilla #245452 for details
-NO_CCACHE=	yes
-
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	telegramdesktop
 GH_PROJECT=	tdesktop
+USE_GL=		gl
 USE_GNOME=	glib20
+INSTALLS_ICONS=	yes
 USE_QT=		core dbus gui imageformats network widgets buildtools_build \
 		qmake_build wayland
 USE_XORG=	x11 xcb
-USE_GL=		gl
 
+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_ON=	DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \
 		TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION \
 		DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION
 CMAKE_OFF=	DESKTOP_APP_USE_PACKAGED_RLOTTIE DESKTOP_APP_USE_PACKAGED_VARIANT \
 		DESKTOP_APP_USE_GLIBC_WRAPS TDESKTOP_USE_PACKAGED_TGVOIP \
 		DESKTOP_APP_USE_PACKAGED_FONTS
-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
 
 # Disable DCHECKs, otherwise video calls will crash.
 CXXFLAGS+=	-DNDEBUG
 
-# Telegram asks each custom build to have its own API ID and hash.
-TELEGRAM_API_ID=	601761
-TELEGRAM_API_HASH=	20a3432aab43f24bb4460fceac5ba38d
+# see Bugzilla #245452 for details
+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_MULTI=		AUDIO
-OPTIONS_MULTI_AUDIO=	ALSA PULSEAUDIO
 OPTIONS_DEFINE=		GTK
 OPTIONS_DEFAULT=	ALSA
+OPTIONS_MULTI=		AUDIO
+OPTIONS_MULTI_AUDIO=	ALSA PULSEAUDIO
 
 AUDIO_DESC=	Audio backend for voice calls
 GTK_DESC=	Gtk integration (Use Gtk dialogs, etc.)
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
+GTK_CMAKE_BOOL_OFF=	DESKTOP_APP_DISABLE_GTK_INTEGRATION
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 
-GTK_CMAKE_BOOL_OFF=	TDESKTOP_DISABLE_GTK_INTEGRATION
-
-INSTALLS_ICONS=	yes
+# Telegram asks each custom build to have its own API ID and hash.
+TELEGRAM_API_HASH=	20a3432aab43f24bb4460fceac5ba38d
+TELEGRAM_API_ID=	601761
 
 .include <bsd.port.options.mk>
 
diff --git a/net-im/telegram-desktop/distinfo b/net-im/telegram-desktop/distinfo
index f384a7ca55fd..fb740d566b31 100644
--- a/net-im/telegram-desktop/distinfo
+++ b/net-im/telegram-desktop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612728578
-SHA256 (tdesktop-2.5.8-full.tar.gz) = 9c89cb31f8ba8a26821fe3c2769b04162e8d7629d327f9cd25a892e88878417e
-SIZE (tdesktop-2.5.8-full.tar.gz) = 36685925
+TIMESTAMP = 1615175171
+SHA256 (tdesktop-2.6.1-full.tar.gz) = c7878c4d7c621a175b3b27895b3fb8c20a56319214d5030d734b2768390a8b73
+SIZE (tdesktop-2.6.1-full.tar.gz) = 36726422
diff --git a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__file__utilities__linux.cpp b/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__file__utilities__linux.cpp
deleted file mode 100644
index dac991968a86..000000000000
--- a/net-im/telegram-desktop/files/patch-Telegram_lib__base_base_platform_linux_base__file__utilities__linux.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp.orig	2021-01-28 15:30:24 UTC
-+++ Telegram/lib_base/base/platform/linux/base_file_utilities_linux.cpp
-@@ -114,7 +114,7 @@ bool ShowInFolder(const QString &filepath) {
- 	}
- 
- 	if (g_app_info_launch_default_for_uri(
--		g_filename_to_uri(absoluteDirPath.toUtf8(), nullptr, nullptr),
-+		g_filename_to_uri(absoluteDirPath.toUtf8().constData(), nullptr, nullptr),
- 		nullptr,
- 		nullptr)) {
- 		return true;