Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 Jan 2025 22:13:21 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: a5268609be32 - main - deskutils/copyq: Remove Qt flavors
Message-ID:  <202501022213.502MDLnm098828@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=a5268609be327e2b7060cd3a64bca059cfc9ceee

commit a5268609be327e2b7060cd3a64bca059cfc9ceee
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2025-01-02 22:10:24 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2025-01-02 22:12:41 +0000

    deskutils/copyq: 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 ++
 deskutils/copyq/Makefile | 26 +++++++-------------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/MOVED b/MOVED
index ced7aa6b04dc..90988d573ccf 100644
--- a/MOVED
+++ b/MOVED
@@ -3996,3 +3996,5 @@ x11/mere-about||2025-01-02|Unknown, port deleted long time ago, entry added to c
 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
+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
diff --git a/deskutils/copyq/Makefile b/deskutils/copyq/Makefile
index 79dca45de237..8f8a7d0384ee 100644
--- a/deskutils/copyq/Makefile
+++ b/deskutils/copyq/Makefile
@@ -1,12 +1,12 @@
 PORTNAME=	copyq
 DISTVERSION=	9.1.0
+PORTREVISION=	1
 CATEGORIES=	deskutils
 MASTER_SITES=	https://github.com/hluk/CopyQ/releases/download/v${DISTVERSION}/
-PKGNAMESUFFIX=	-${FLAVOR}
 DISTNAME=	Copyq-${DISTVERSION}
 
 MAINTAINER=	eduardo@FreeBSD.org
-COMMENT=	Qt${FLAVOR:S/qt//} based clipboard manager
+COMMENT=	Qt6 based clipboard manager
 WWW=		https://github.com/hluk/CopyQ
 
 LICENSE=	GPLv3+
@@ -15,25 +15,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 		libxkbcommon.so:x11/libxkbcommon
 
-FLAVORS=		qt5 qt6
-FLAVOR?=		qt5
-qt5_CONFLICTS_INSTALL=	copyq-qt6
-qt6_CONFLICTS_INSTALL=	copyq-qt5
-
-USES=		cmake gl kde:${FLAVOR:S/qt//} pkgconfig qt:${FLAVOR:S/qt//} \
-		xorg
-USE_GL=		gl
-_USE_KDE_qt5=	ecm:build notifications
-_USE_KDE_qt6=	ecm:build notifications statusnotifieritem
-USE_KDE=	${_USE_KDE_${FLAVOR}}
-_USE_QT5=	core dbus declarative gui network svg wayland widgets x11extras \
-		xml buildtools:build qmake:build
-_USE_QT6=	base declarative svg wayland translations:build
-USE_QT=		${_USE_QT${FLAVOR:S/qt//}}
+USES=		cmake gl kde:6 pkgconfig qt:6 xorg
+USE_GL=		opengl
+USE_KDE=	notifications ecm:build statusnotifieritem
+USE_QT=		base declarative svg wayland translations:build
 USE_XORG=	ice sm x11 xext xfixes xtst
 
-_QT6_CMAKE_ARGS=	-DWITH_QT6:BOOL=TRUE
-CMAKE_ARGS=		${_QT${FLAVOR:S/qt//}_CMAKE_ARGS}
+CMAKE_ARGS=	-DWITH_QT6:BOOL=TRUE
 
 PORTSCOUT=	limit:^d\.d\.
 



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