Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 Jan 2025 22:13:19 GMT
From:      Nuno Teixeira <eduardo@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 420fb73865e0 - main - editors/neovim-qt: Remove Qt flavors
Message-ID:  <202501022213.502MDJNj098789@gitrepo.freebsd.org>

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

URL: https://cgit.FreeBSD.org/ports/commit/?id=420fb73865e04409f0b8cb7cd2f151cdb690fca9

commit 420fb73865e04409f0b8cb7cd2f151cdb690fca9
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2025-01-02 21:35:34 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2025-01-02 22:12:41 +0000

    editors/neovim-qt: 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
---
 MOVED                      |  2 ++
 editors/neovim-qt/Makefile | 24 +++++++-----------------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/MOVED b/MOVED
index 72b9c796418a..ced7aa6b04dc 100644
--- a/MOVED
+++ b/MOVED
@@ -3994,3 +3994,5 @@ x11/libfmqt-l10n||2025-01-02|Unknown, port deleted long time ago, entry added to
 x11/lightdm-slick-greeter||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
 x11/mere-about||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
 x11/mere-utils||2025-01-02|Unknown, port deleted long time ago, entry added to clean up portscout.freebsd.org
+editors/neovim-qt@qt5|editors/neovim-qt|2025-01-02|Flavorization has been removed. Qt 5.x has been long deprecated upstream. Please use the unflavored editors/neovim-qt port based on Qt 6.x instead
+editors/neovim-qt@qt6|editors/neovim-qt|2025-01-02|Flavorization has been removed. Continue to enjoy editors/neovim-qt based on Qt 6.x as usual
diff --git a/editors/neovim-qt/Makefile b/editors/neovim-qt/Makefile
index 8c784092aaeb..7f602a58aa1f 100644
--- a/editors/neovim-qt/Makefile
+++ b/editors/neovim-qt/Makefile
@@ -1,11 +1,11 @@
 PORTNAME=	neovim-qt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.18
+PORTREVISION=	1
 CATEGORIES=	editors
-PKGNAMESUFFIX=	${FLAVOR:S/qt//}
 
 MAINTAINER=	eduardo@FreeBSD.org
-COMMENT=	Neovim client library and QT${FLAVOR:S/qt//} GUI
+COMMENT=	Neovim client library and Qt6 GUI
 WWW=		https://github.com/equalsraf/neovim-qt/
 
 LICENSE=	ISCL
@@ -15,23 +15,13 @@ BUILD_DEPENDS=	neovim>=0:editors/neovim
 LIB_DEPENDS=	libmsgpack-c.so:devel/msgpack-c
 RUN_DEPENDS=	neovim>=0:editors/neovim
 
-FLAVORS=		qt5 qt6
-FLAVOR?=		${FLAVORS:[1]}
-qt5_CONFLICTS_INSTALL=	neovim-qt6
-qt6_CONFLICTS_INSTALL=	neovim-qt5
-
-USES=		${_USES_${FLAVOR}} cmake desktop-file-utils qt:${FLAVOR:S/qt//}
+USES=		cmake desktop-file-utils gl qt:6
 USE_GITHUB=	yes
 GH_ACCOUNT=	equalsraf
-_USES_qt6=	gl
-_USE_QT_qt5=	core gui network svg testlib widgets buildtools:build \
-		qmake:build
-_USE_QT_qt6=	base svg
-_USE_GL_qt6=	opengl
-USE_GL=		${_USE_GL_${FLAVOR}}
-USE_QT=		${_USE_QT_${FLAVOR}}
-
-CMAKE_ARGS=	-DWITH_QT=Qt${FLAVOR:S/qt//}
+USE_GL=		opengl
+USE_QT=		base svg
+
+CMAKE_ARGS=	-DWITH_QT=Qt6
 CMAKE_ON=	USE_SYSTEM_MSGPACK
 CMAKE_OFF=	ENABLE_TESTS
 



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