Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 5 Jan 2024 13:10:44 GMT
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 6d08faea5121 - main - sysutils/signon-ui: flavorize for Qt5 and Qt6
Message-ID:  <202401051310.405DAiv4013889@gitrepo.freebsd.org>

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

URL: https://cgit.FreeBSD.org/ports/commit/?id=6d08faea51214414969d21706dead305e9eab673

commit 6d08faea51214414969d21706dead305e9eab673
Author:     Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2024-01-05 13:09:08 +0000
Commit:     Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2024-01-05 13:09:08 +0000

    sysutils/signon-ui: flavorize for Qt5 and Qt6
---
 net-im/kaccounts-integration/Makefile |  4 ++--
 sysutils/signon-ui/Makefile           | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/net-im/kaccounts-integration/Makefile b/net-im/kaccounts-integration/Makefile
index 3a1a65869cae..f3b99dec617a 100644
--- a/net-im/kaccounts-integration/Makefile
+++ b/net-im/kaccounts-integration/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	kaccounts-integration
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net-im kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -10,7 +10,7 @@ WWW=		https://projects.kde.org/projects/kdereview/kaccounts-integration
 LIB_DEPENDS=	libQCoro5Core.so:devel/qcoro@qt5 \
 		libaccounts-qt5.so:net-im/libaccounts-qt@qt5 \
 		libsignon-qt5.so:sysutils/signond@qt5
-RUN_DEPENDS=	signon-ui:sysutils/signon-ui
+RUN_DEPENDS=	signon-ui:sysutils/signon-ui@qt5
 
 USES=		cmake compiler:c++11-lang gettext-tools pkgconfig kde:5 \
 		qt:5 tar:xz
diff --git a/sysutils/signon-ui/Makefile b/sysutils/signon-ui/Makefile
index 77140d2dc5a1..8f697ddbc76f 100644
--- a/sysutils/signon-ui/Makefile
+++ b/sysutils/signon-ui/Makefile
@@ -3,9 +3,10 @@ PORTNAME=	signon-ui
 # > git rev-list 0.17+15.10.20150810-0ubuntu1.. --count
 DISTVERSION=	0.17-355
 DISTVERSIONSUFFIX=	-g4368bb7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils kde
 DIST_SUBDIR=	KDE/${GL_ACCOUNT}
+PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Component for handling accounts-sso user interactions
@@ -14,13 +15,16 @@ WWW=		https://gitlab.com/accounts-sso/signon-ui
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libaccounts-qt5.so:net-im/libaccounts-qt@qt5 \
+FLAVORS=	qt5 qt6
+FLAVOR?=	qt5
+
+LIB_DEPENDS=	libaccounts-${FLAVOR}.so:net-im/libaccounts-qt@${FLAVOR} \
 		libnotify.so:devel/libnotify \
-		libsignon-qt5.so:sysutils/signond@qt5 \
+		libsignon-${FLAVOR}.so:sysutils/signond@${FLAVOR} \
 		libproxy.so:net/libproxy
 
 USES=		compiler:c++11-lang gettext-runtime gl gnome pkgconfig python \
-		qmake qt:5 tar:bz2
+		qmake qt:${FLAVOR:S/qt//} tar:bz2
 USE_GL=		gl
 USE_GNOME=	gdkpixbuf2 glib20
 USE_QT=		core dbus declarative gui location network webchannel webengine widgets xml \



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