Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 26 Sep 2022 18:26:23 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: a179d4cf8018 - main - deskutils/copyq: Flavorize/Update to 6.3.2
Message-ID:  <202209261826.28QIQNR9062909@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=a179d4cf80185bcb3cf47e260121562dff1371f1

commit a179d4cf80185bcb3cf47e260121562dff1371f1
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2022-09-26 18:24:10 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2022-09-26 18:26:07 +0000

    deskutils/copyq: Flavorize/Update to 6.3.2
    
     - Flavorize: add Qt6 flavor
    
    ChangeLog:      https://github.com/hluk/CopyQ/blob/master/CHANGES.md
---
 deskutils/copyq/Makefile | 29 ++++++++++++++++++++++-------
 deskutils/copyq/distinfo |  6 +++---
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/deskutils/copyq/Makefile b/deskutils/copyq/Makefile
index 479cb327df9b..b7c250bb5656 100644
--- a/deskutils/copyq/Makefile
+++ b/deskutils/copyq/Makefile
@@ -1,27 +1,42 @@
 PORTNAME=	copyq
 DISTVERSIONPREFIX=	v
-DISTVERSION=	6.3.0
+DISTVERSION=	6.3.2
 CATEGORIES=	deskutils
+PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	eduardo@FreeBSD.org
-COMMENT=	Qt5 based clipboard manager
+COMMENT=	Qt${FLAVOR:S/qt//} based clipboard manager
 WWW=		https://github.com/hluk/CopyQ
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libwayland-client.so:graphics/wayland
+LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
+		libxkbcommon.so:x11/libxkbcommon
 
-USES=		cmake compiler:c++17-lang desktop-file-utils kde:5 qt:5 xorg
+FLAVORS=	qt5 qt6
+FLAVOR?=	qt5
+
+qt5_CONFLICTS_INSTALL=	copyq-qt6
+qt6_CONFLICTS_INSTALL=	copyq-qt5
+
+USES=		cmake compiler:c++17-lang desktop-file-utils gl kde:5 \
+		qt:${FLAVOR:S/qt//} xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	hluk
 GH_PROJECT=	CopyQ
-USE_KDE=	notifications
-
-USE_QT=		core dbus declarative gui network svg wayland widgets x11extras \
+USE_GL=		gl
+USE_KDE=	notifications # needed WITH_QT6, Extra CMake Modules (ECM)
+_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//}}
 USE_XORG=	ice sm x11 xext xfixes xtst
 
+_QT6_CMAKE_ARGS=	-DQtWaylandScanner_EXECUTABLE=${PREFIX}/libexec/qt6/qtwaylandscanner \
+			-DWITH_QT6:BOOL=TRUE
+CMAKE_ARGS=		${_QT${FLAVOR:S/qt//}_CMAKE_ARGS}
+
 PORTSCOUT=	limit:^d\.d\.
 
 OPTIONS_DEFINE=		PLUGINS
diff --git a/deskutils/copyq/distinfo b/deskutils/copyq/distinfo
index bc0481bd029b..a492e3a16467 100644
--- a/deskutils/copyq/distinfo
+++ b/deskutils/copyq/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1663589174
-SHA256 (hluk-CopyQ-v6.3.0_GH0.tar.gz) = 3dde185fe635bb3aa7e447f7e8edd808565cbc52ae8316afd957137bcf9ccaa3
-SIZE (hluk-CopyQ-v6.3.0_GH0.tar.gz) = 3324088
+TIMESTAMP = 1664215077
+SHA256 (hluk-CopyQ-v6.3.2_GH0.tar.gz) = ce122ed7f8e3e230b1c6dcce8f1ec6d717eef8c59829390cae1750c35b342c4a
+SIZE (hluk-CopyQ-v6.3.2_GH0.tar.gz) = 3325217



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