git: 7941e944cbb0 - main - sysutils/signon-plugin-oauth2: flavorize for Qt5 and Qt6
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 05 Jan 2024 12:57:40 UTC
The branch main has been updated by tcberner:
URL: https://cgit.FreeBSD.org/ports/commit/?id=7941e944cbb0eead91c8cc5eedc5ec84f3cbf739
commit 7941e944cbb0eead91c8cc5eedc5ec84f3cbf739
Author: Tobias C. Berner <tcberner@FreeBSD.org>
AuthorDate: 2024-01-05 12:34:40 +0000
Commit: Tobias C. Berner <tcberner@FreeBSD.org>
CommitDate: 2024-01-05 12:57:25 +0000
sysutils/signon-plugin-oauth2: flavorize for Qt5 and Qt6
- switch to fork [1]
[1] https://gitlab.com/nicolasfella/signon-plugin-oauth2/-/tree/qt6
---
sysutils/signon-plugin-oauth2/Makefile | 18 ++++++++++++------
sysutils/signon-plugin-oauth2/distinfo | 6 +++---
x11/plasma6-plasma-desktop/Makefile | 3 ++-
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/sysutils/signon-plugin-oauth2/Makefile b/sysutils/signon-plugin-oauth2/Makefile
index 99f1d89537e3..9f5ed241e90e 100644
--- a/sysutils/signon-plugin-oauth2/Makefile
+++ b/sysutils/signon-plugin-oauth2/Makefile
@@ -1,27 +1,33 @@
PORTNAME= signon-plugin-oauth2
DISTVERSION= 0.25
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils kde
DISTNAME= archive
DIST_SUBDIR= KDE/${GL_ACCOUNT}
+PKGNAMESUFFIX= -${FLAVOR}
MAINTAINER= kde@FreeBSD.org
COMMENT= Signon OAuth 1.0 and 2.0 plugin for accounts-sso
WWW= https://gitlab.com/accounts-sso/signon-plugin-oauth2
-LIB_DEPENDS= libsignon-qt5.so:sysutils/signond@qt5
+FLAVORS= qt5 qt6
+FLAVOR?= qt5
-USES= compiler:c++11-lang pkgconfig python qmake qt:5
-USE_QT= core network testlib \
+LIB_DEPENDS= libsignon-qt${FLAVOR:S/qt//}.so:sysutils/signond@${FLAVOR}
+
+USES= compiler:c++11-lang pkgconfig python qmake qt:${FLAVOR:S/qt//}
+_USE_QT_qt5= core network testlib \
buildtools:build qmake:build
+_USE_QT_qt6= base
+USE_QT= ${_USE_QT_${FLAVOR}}
USE_LDCONFIG= ${PREFIX}/lib/signon
QMAKE_ENV= PREFIX=${PREFIX}
# gitlab variables
USE_GITLAB= yes
-GL_ACCOUNT= accounts-sso
-GL_TAGNAME= 091887d09bb635fa31f69ed16d384563cddc8009
+GL_ACCOUNT= nicolasfella
+GL_TAGNAME= fab698862466994a8fdc9aa335c87b4f05430ce6
# Fix for Qt5-5.13:
# oauth2plugin.cpp:133:9: error: 'addQueryItem' is deprecated [-Werror,-Wdeprecated-declarations]
diff --git a/sysutils/signon-plugin-oauth2/distinfo b/sysutils/signon-plugin-oauth2/distinfo
index 143ada737dc0..4128647a65cb 100644
--- a/sysutils/signon-plugin-oauth2/distinfo
+++ b/sysutils/signon-plugin-oauth2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626330369
-SHA256 (KDE/accounts-sso/accounts-sso-signon-plugin-oauth2-091887d09bb635fa31f69ed16d384563cddc8009_GL0.tar.gz) = 4ac679bead32d2cbafc902b66cc84e5ada38e977ad583a1bc55c106f18c2e04c
-SIZE (KDE/accounts-sso/accounts-sso-signon-plugin-oauth2-091887d09bb635fa31f69ed16d384563cddc8009_GL0.tar.gz) = 41112
+TIMESTAMP = 1704457883
+SHA256 (KDE/nicolasfella/nicolasfella-signon-plugin-oauth2-fab698862466994a8fdc9aa335c87b4f05430ce6_GL0.tar.gz) = 5a1298cc49f504503f54f20f0f5f685e43f541244a654dd3da58951f43782625
+SIZE (KDE/nicolasfella/nicolasfella-signon-plugin-oauth2-fab698862466994a8fdc9aa335c87b4f05430ce6_GL0.tar.gz) = 41352
diff --git a/x11/plasma6-plasma-desktop/Makefile b/x11/plasma6-plasma-desktop/Makefile
index f3d8e5f60c3d..b8561ce724c9 100644
--- a/x11/plasma6-plasma-desktop/Makefile
+++ b/x11/plasma6-plasma-desktop/Makefile
@@ -1,5 +1,6 @@
PORTNAME= plasma-desktop
DISTVERSION= ${KDE_PLASMA_VERSION}
+PORTREVISION= 1
CATEGORIES= x11 kde kde-plasma
COMMENT= KDE Plasma Desktop
@@ -11,7 +12,7 @@ BUILD_DEPENDS= wayland-protocols>=0:graphics/wayland-protocols \
xf86-input-synaptics>0:x11-drivers/xf86-input-synaptics
LIB_DEPENDS= libcanberra.so:audio/libcanberra \
libicuuc.so:devel/icu \
- liboauth2plugin.so:sysutils/signon-plugin-oauth2 \
+ liboauth2plugin.so:sysutils/signon-plugin-oauth2@qt6 \
libwayland-client.so:graphics/wayland \
libxcb-util.so:x11/xcb-util \
libxkbcommon.so:x11/libxkbcommon \