Skip to content

Commit

Permalink
sysutils/signon-qt5: rename port to sysutils/signond and flavorize
Browse files Browse the repository at this point in the history 
- switch to fork [1]
- flavorize to be used against Qt6
- rename port to match upstream (and get rid of the qt-version in the name)

[1] https://gitlab.com/nicolasfella/signond/
  • Loading branch information
@tcberner
tcberner committed Jan 5, 2024
1 parent a3b6b34 commit 8cd334f
Show file tree
Hide file tree
Showing 15 changed files with 59 additions and 46 deletions.
4 changes: 2 additions & 2 deletions net-im/kaccounts-integration/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= kaccounts-integration
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net-im kde kde-applications

MAINTAINER= kde@FreeBSD.org
Expand All @@ -9,7 +9,7 @@ WWW= https://projects.kde.org/projects/kdereview/kaccounts-integration

LIB_DEPENDS= libQCoro5Core.so:devel/qcoro@qt5 \
libaccounts-qt5.so:net-im/libaccounts-qt5 \
libsignon-qt5.so:sysutils/signon-qt5
libsignon-qt5.so:sysutils/signond@qt5
RUN_DEPENDS= signon-ui:sysutils/signon-ui

USES= cmake compiler:c++11-lang gettext-tools pkgconfig kde:5 \
Expand Down
3 changes: 2 additions & 1 deletion net-im/kaccounts-providers/Makefile
View file
@@ -1,5 +1,6 @@
PORTNAME= kaccounts-providers
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 1
CATEGORIES= net-im kde kde-applications

MAINTAINER= kde@FreeBSD.org
Expand All @@ -9,7 +10,7 @@ WWW= https://projects.kde.org/projects/kdereview/kaccounts-providers
LIB_DEPENDS= libaccounts-glib.so:net-im/libaccounts-glib \
libkaccounts.so:net-im/kaccounts-integration \
libaccounts-qt5.so:net-im/libaccounts-qt5 \
libsignon-qt5.so:sysutils/signon-qt5
libsignon-qt5.so:sysutils/signond@qt5

USES= cmake compiler:c++11-lang gettext gnome kde:5 pkgconfig qt:5 \
tar:xz
Expand Down
5 changes: 3 additions & 2 deletions net-im/libsignon-glib/Makefile
View file
@@ -1,5 +1,6 @@
PORTNAME= libsignon-glib
DISTVERSION= 2.1
PORTREVISION= 1
CATEGORIES= net-im
DIST_SUBDIR= KDE/${GL_ACCOUNT}

Expand All @@ -10,8 +11,8 @@ WWW= https://gitlab.com/accounts-sso/libsignon-glib
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING

BUILD_DEPENDS= signond:sysutils/signon-qt5
RUN_DEPENDS= signond:sysutils/signon-qt5
BUILD_DEPENDS= signond:sysutils/signond@qt5
RUN_DEPENDS= signond:sysutils/signond@qt5

USES= gnome libtool meson pathfix pkgconfig python tar:bz2 vala:build
USE_GNOME= introspection pygobject3
Expand Down
2 changes: 1 addition & 1 deletion sysutils/Makefile
View file
Expand Up @@ -1356,8 +1356,8 @@
SUBDIR += siegfried
SUBDIR += signon-kwallet-extension
SUBDIR += signon-plugin-oauth2
SUBDIR += signon-qt5
SUBDIR += signon-ui
SUBDIR += signond
SUBDIR += sispmctl
SUBDIR += skopeo
SUBDIR += slack
Expand Down
4 changes: 2 additions & 2 deletions sysutils/accounts-qml-module/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= accounts-qml-module
DISTVERSION= 0.7
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= sysutils kde
DIST_SUBDIR= KDE/${GL_ACCOUNT}

Expand All @@ -12,7 +12,7 @@ LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING

LIB_DEPENDS= libaccounts-qt5.so:net-im/libaccounts-qt5 \
libsignon-qt5.so:sysutils/signon-qt5
libsignon-qt5.so:sysutils/signond@qt5

USES= compiler:c++11-lang gl pkgconfig qmake qt:5 tar:bz2
USE_GL= gl
Expand Down
3 changes: 2 additions & 1 deletion sysutils/signon-kwallet-extension/Makefile
View file
@@ -1,12 +1,13 @@
PORTNAME= signon-kwallet-extension
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
PORTREVISION= 1
CATEGORIES= sysutils kde kde-applications

MAINTAINER= kde@FreeBSD.org
COMMENT= KWallet integration for signon framework
WWW= https://projects.kde.org/projects/kde/kdenetwork/signon-kwallet-extension

LIB_DEPENDS= libsignon-qt5.so:sysutils/signon-qt5
LIB_DEPENDS= libsignon-qt5.so:sysutils/signond@qt5

USES= cmake compiler:c++11-lang kde:5 pkgconfig qt:5 tar:xz
USE_KDE= wallet \
Expand Down
3 changes: 2 additions & 1 deletion sysutils/signon-plugin-oauth2/Makefile
View file
@@ -1,5 +1,6 @@
PORTNAME= signon-plugin-oauth2
DISTVERSION= 0.25
PORTREVISION= 1
CATEGORIES= sysutils kde
DISTNAME= archive
DIST_SUBDIR= KDE/${GL_ACCOUNT}
Expand All @@ -8,7 +9,7 @@ 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/signon-qt5
LIB_DEPENDS= libsignon-qt5.so:sysutils/signond@qt5

USES= compiler:c++11-lang pkgconfig python qmake qt:5
USE_QT= core network testlib \
Expand Down
3 changes: 0 additions & 3 deletions sysutils/signon-qt5/distinfo
View file

This file was deleted.

3 changes: 2 additions & 1 deletion sysutils/signon-ui/Makefile
View file
Expand Up @@ -3,6 +3,7 @@ PORTNAME= signon-ui
# > git rev-list 0.17+15.10.20150810-0ubuntu1.. --count
DISTVERSION= 0.17-355
DISTVERSIONSUFFIX= -g4368bb7
PORTREVISION= 1
CATEGORIES= sysutils kde
DIST_SUBDIR= KDE/${GL_ACCOUNT}

Expand All @@ -15,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING

LIB_DEPENDS= libaccounts-qt5.so:net-im/libaccounts-qt5 \
libnotify.so:devel/libnotify \
libsignon-qt5.so:sysutils/signon-qt5 \
libsignon-qt5.so:sysutils/signond@qt5 \
libproxy.so:net/libproxy

USES= compiler:c++11-lang gettext-runtime gl gnome pkgconfig python \
Expand Down
20 changes: 13 additions & 7 deletions sysutils/signon-qt5/Makefile → sysutils/signond/Makefile
View file
@@ -1,8 +1,7 @@
PORTNAME= signon
DISTVERSION= 8.60
PORTREVISION= 1
DISTVERSION= 8.61
CATEGORIES= sysutils kde
PKGNAMESUFFIX= -qt5
PKGNAMESUFFIX= -${FLAVOR}
DIST_SUBDIR= KDE/${GL_ACCOUNT}

MAINTAINER= kde@FreeBSD.org
Expand All @@ -12,20 +11,27 @@ WWW= https://gitlab.com/accounts-sso/signond
LICENSE= LGPL20
LICENSE_FILE= ${WRKSRC}/COPYING

FLAVORS= qt5 qt6
FLAVOR?= qt5

USES= compiler:c++11-lang gettext gl pathfix pkgconfig python qmake \
qt:5 tar:bz2
qt:${FLAVOR:S/qt//} tar:bz2
USE_GL= gl
USE_QT= core dbus gui network sql testlib xml \
_USE_QT_qt5= core dbus gui network sql testlib xml \
buildtools:build qmake:build
_USE_QT_qt6= base
USE_QT= ${_USE_QT_${FLAVOR}}

# gitlab variables
USE_GITLAB= yes
GL_ACCOUNT= accounts-sso
GL_ACCOUNT= nicolasfella
GL_PROJECT= signond
GL_TAGNAME= 07d45498ad374d9e8e4ff6a886f4b4bb850c0cb5
GL_TAGNAME= c8ad98249af541514ff7a81634d3295e712f1a39

OPTIONS_DEFINE= DOCS

PLIST_SUB= QT_VER=${FLAVOR:S/qt//}

pre-configure:
#make it find qdbusxml2ccp (as ${QT_BINDIR} is not in PATH)
${REINPLACE_CMD} -e 's,qdbusxml2cpp,${QT_BINDIR}/qdbusxml2cpp,' \
Expand Down
3 changes: 3 additions & 0 deletions sysutils/signond/distinfo
View file
@@ -0,0 +1,3 @@
TIMESTAMP = 1704457434
SHA256 (KDE/nicolasfella/nicolasfella-signond-c8ad98249af541514ff7a81634d3295e712f1a39_GL0.tar.gz) = 2c3dd97fcdb90f38bb9884f7e11d0fb9ba214f78bddaacb27e4969cefff7d690
SIZE (KDE/nicolasfella/nicolasfella-signond-c8ad98249af541514ff7a81634d3295e712f1a39_GL0.tar.gz) = 283647
0 sysutils/signon-qt5/files/patch-signon.pro → sysutils/signond/files/patch-signon.pro
View file
File renamed without changes.
0 ...s_mock-ac-plugin_access-control-manager.h → ...s_mock-ac-plugin_access-control-manager.h
View file
File renamed without changes.
0 sysutils/signon-qt5/pkg-descr → sysutils/signond/pkg-descr
View file
File renamed without changes.
52 changes: 27 additions & 25 deletions sysutils/signon-qt5/pkg-plist → sysutils/signond/pkg-plist
View file
@@ -1,6 +1,6 @@
etc/signond.conf
bin/signond
bin/signonpluginprocess
etc/signond.conf
include/signon-extension/SignOn/AbstractAccessControlManager
include/signon-extension/SignOn/AbstractCryptoManager
include/signon-extension/SignOn/AbstractKeyAuthorizer
Expand Down Expand Up @@ -31,29 +31,31 @@ include/signon-plugins/passwordplugin.h
include/signon-plugins/ssotest2data.h
include/signon-plugins/ssotest2plugin.h
include/signon-plugins/ssotestplugin.h
include/signon-qt5/SignOn/AuthService
include/signon-qt5/SignOn/AuthSession
include/signon-qt5/SignOn/Error
include/signon-qt5/SignOn/Identity
include/signon-qt5/SignOn/IdentityInfo
include/signon-qt5/SignOn/SecurityContext
include/signon-qt5/SignOn/SessionData
include/signon-qt5/SignOn/authservice.h
include/signon-qt5/SignOn/authsession.h
include/signon-qt5/SignOn/identity.h
include/signon-qt5/SignOn/identityinfo.h
include/signon-qt5/SignOn/libsignoncommon.h
include/signon-qt5/SignOn/securitycontext.h
include/signon-qt5/SignOn/sessiondata.h
include/signon-qt5/SignOn/signon.h
include/signon-qt5/SignOn/signonerror.h
include/signon-qt%%QT_VER%%/SignOn/AuthService
include/signon-qt%%QT_VER%%/SignOn/AuthSession
include/signon-qt%%QT_VER%%/SignOn/Error
include/signon-qt%%QT_VER%%/SignOn/Identity
include/signon-qt%%QT_VER%%/SignOn/IdentityInfo
include/signon-qt%%QT_VER%%/SignOn/SecurityContext
include/signon-qt%%QT_VER%%/SignOn/SessionData
include/signon-qt%%QT_VER%%/SignOn/authservice.h
include/signon-qt%%QT_VER%%/SignOn/authsession.h
include/signon-qt%%QT_VER%%/SignOn/identity.h
include/signon-qt%%QT_VER%%/SignOn/identityinfo.h
include/signon-qt%%QT_VER%%/SignOn/libsignoncommon.h
include/signon-qt%%QT_VER%%/SignOn/securitycontext.h
include/signon-qt%%QT_VER%%/SignOn/sessiondata.h
include/signon-qt%%QT_VER%%/SignOn/signon.h
include/signon-qt%%QT_VER%%/SignOn/signonerror.h
include/signond/accesscontrolmanagerhelper.h
include/signond/credentialsaccessmanager.h
include/signond/credentialsdb.h
include/signond/credentialsdb_p.h
include/signond/default-crypto-manager.h
include/signond/default-key-authorizer.h
include/signond/default-secrets-storage.h
include/signond/error.h
include/signond/peercontext.h
include/signond/pluginproxy.h
include/signond/signonauthsession.h
include/signond/signonauthsessionadaptor.h
Expand All @@ -70,8 +72,8 @@ include/signond/signonsessioncore.h
include/signond/signonsessioncoretools.h
include/signond/signontrace.h
include/signond/signonui_interface.h
lib/cmake/SignOnQt5/SignOnQt5Config.cmake
lib/cmake/SignOnQt5/SignOnQt5ConfigVersion.cmake
lib/cmake/SignOnQt%%QT_VER%%/SignOnQt%%QT_VER%%Config.cmake
lib/cmake/SignOnQt%%QT_VER%%/SignOnQt%%QT_VER%%ConfigVersion.cmake
lib/libsignon-extension.so
lib/libsignon-extension.so.1
lib/libsignon-extension.so.1.0
Expand All @@ -84,17 +86,17 @@ lib/libsignon-plugins.so
lib/libsignon-plugins.so.1
lib/libsignon-plugins.so.1.0
lib/libsignon-plugins.so.1.0.0
lib/libsignon-qt5.a
lib/libsignon-qt5.so
lib/libsignon-qt5.so.1
lib/libsignon-qt5.so.1.0
lib/libsignon-qt5.so.1.0.0
lib/libsignon-qt%%QT_VER%%.a
lib/libsignon-qt%%QT_VER%%.so
lib/libsignon-qt%%QT_VER%%.so.1
lib/libsignon-qt%%QT_VER%%.so.1.0
lib/libsignon-qt%%QT_VER%%.so.1.0.0
lib/signon/libexampleplugin.so
lib/signon/libpasswordplugin.so
lib/signon/libssotest2plugin.so
lib/signon/libssotestplugin.so
libdata/pkgconfig/SignOnExtension.pc
libdata/pkgconfig/libsignon-qt5.pc
libdata/pkgconfig/libsignon-qt%%QT_VER%%.pc
libdata/pkgconfig/signon-plugins-common.pc
libdata/pkgconfig/signon-plugins.pc
libdata/pkgconfig/signond.pc
Expand Down

0 comments on commit 8cd334f

Please sign in to comment.