Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Jan 2025 02:13:42 GMT
From:      "Sergey A. Osokin" <osa@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 833301ea3ea4 - main - net-im/telegram-desktop: Remove Qt flavors
Message-ID:  <202501050213.5052DgU8034378@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by osa:

URL: https://cgit.FreeBSD.org/ports/commit/?id=833301ea3ea4ca70a92a0c1694a068673115a337

commit 833301ea3ea4ca70a92a0c1694a068673115a337
Author:     Sergey A. Osokin <osa@FreeBSD.org>
AuthorDate: 2025-01-05 02:13:05 +0000
Commit:     Sergey A. Osokin <osa@FreeBSD.org>
CommitDate: 2025-01-05 02:13:37 +0000

    net-im/telegram-desktop: Remove Qt flavors
    
    Drop local Qt 5.x support for ease of maintainership and its eventual
    removal from the FreeBSD ports tree.  Qt 5.x has been long deprecated
    upstream [1] and the FreeBSD kde@ team recommends using Qt 6.x for
    end-user applications whenever possible.
    
    [1] https://www.qt.io/blog/qt-5.15-support-ends
    
    Bump PORTREVISION.
---
 MOVED                            |  2 ++
 net-im/telegram-desktop/Makefile | 22 ++++------------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/MOVED b/MOVED
index deba50b9a7bd..09e65ca3ab61 100644
--- a/MOVED
+++ b/MOVED
@@ -3998,3 +3998,5 @@ editors/neovim-qt@qt6|editors/neovim-qt|2025-01-02|Flavorization has been remove
 deskutils/copyq@qt5|deskutils/copyq|2025-01-02|Flavorization has been removed. Qt 5.x has been long deprecated upstream. Please use the unflavored deskutils/copyq port based on Qt 6.x instead
 deskutils/copyq@qt6|deskutils/copyq|2025-01-02|Flavorization has been removed. Continue to enjoy deskutils/copyq based on Qt 6.x as usual
 devel/py-pyls-black||2025-01-04|Repository has been archived by the owner. Use textproc/py-python-lsp-black instead
+net-im/telegram-desktop@qt5|net-im/telegram-desktop|2025-01-05|Flavorization has been removed. Qt 5.x has been long deprecated upstream. Please use unflavored net-im/telegram-desktop port based on Qt 6.x instead
+net-im/telegram-desktop@qt6|net-im/telegram-desktop|2025-01-05|Flavorization has been removed. Continue to enjoy editors/neovim-qt based on Qt 6.x as usual
diff --git a/net-im/telegram-desktop/Makefile b/net-im/telegram-desktop/Makefile
index 3eee56da7904..064bff8ababc 100644
--- a/net-im/telegram-desktop/Makefile
+++ b/net-im/telegram-desktop/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	telegram-desktop
 DISTVERSION=	5.10.0
+PORTREVISION=	1
 CATEGORIES=	net-im
 MASTER_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
 DISTNAME=	tdesktop-${DISTVERSION}-full
@@ -44,36 +45,21 @@ LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libxxhash.so:devel/xxhash \
 		libvpx.so:multimedia/libvpx
 
-FLAVORS=	qt5 qt6
-FLAVOR?=	${FLAVORS:[1]}
-qt5_PKGNAMESUFFIX=
-qt6_PKGNAMESUFFIX=	-qt6
-qt5_CONFLICTS_INSTALL=	${PORTNAME}-qt6
-qt6_CONFLICTS_INSTALL=	${PORTNAME}
-
-USES=		cmake compiler:c++20-lang desktop-file-utils gl gnome jpeg localbase \
-		minizip openal pkgconfig python:build ssl
+USES=		cmake compiler:c++20-lang desktop-file-utils gl gnome jpeg kde:6 localbase \
+		minizip openal pkgconfig python:build qt:6 ssl
 
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	telegramdesktop
 GH_PROJECT=	tdesktop
 
-.if ${FLAVOR} == qt5
-USES+=		kde:5 qt:5
-USE_QT=		buildtools:build core dbus declarative gui imageformats network qmake:build \
-		svg widgets
-USE_KDE=	coreaddons kimageformats
-.else
-USES+=		kde:6 qt:6
 USE_QT=		5compat base declarative imageformats lottie shadertools svg tools:build
 USE_KDE=	coreaddons kimageformats
-.endif
 
 USE_GL=		gl
 USE_GNOME=	glib20 glibmm26 introspection
 
 CMAKE_ARGS=	-DTDESKTOP_API_ID=${TELEGRAM_API_ID} -DTDESKTOP_API_HASH=${TELEGRAM_API_HASH} \
-		-DQT_VERSION_MAJOR=${FLAVOR:S/qt//}
+		-DQT_VERSION_MAJOR=6
 CMAKE_ON=	DESKTOP_APP_USE_PACKAGED DESKTOP_APP_DISABLE_CRASH_REPORTS \
 		DESKTOP_APP_DISABLE_JEMALLOC \
 		DESKTOP_APP_DISABLE_SCUDO



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501050213.5052DgU8034378>