Date: Fri, 5 Jan 2024 12:57:36 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: 8cd334f8192f - main - sysutils/signon-qt5: rename port to sysutils/signond and flavorize Message-ID: <202401051257.405Cva6i085199@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=8cd334f8192f08dcc21f21bdac6f0278d1298653 commit 8cd334f8192f08dcc21f21bdac6f0278d1298653 Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2024-01-05 11:48:37 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2024-01-05 12:57:24 +0000 sysutils/signon-qt5: rename port to sysutils/signond and flavorize - 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/ --- net-im/kaccounts-integration/Makefile | 4 +- net-im/kaccounts-providers/Makefile | 3 +- net-im/libsignon-glib/Makefile | 5 ++- sysutils/Makefile | 2 +- sysutils/accounts-qml-module/Makefile | 4 +- sysutils/signon-kwallet-extension/Makefile | 3 +- sysutils/signon-plugin-oauth2/Makefile | 3 +- sysutils/signon-qt5/distinfo | 3 -- sysutils/signon-ui/Makefile | 3 +- sysutils/{signon-qt5 => signond}/Makefile | 20 ++++++--- sysutils/signond/distinfo | 3 ++ .../{signon-qt5 => signond}/files/patch-signon.pro | 0 ...d-tests_mock-ac-plugin_access-control-manager.h | 0 sysutils/{signon-qt5 => signond}/pkg-descr | 0 sysutils/{signon-qt5 => signond}/pkg-plist | 52 +++++++++++----------- 15 files changed, 59 insertions(+), 46 deletions(-) diff --git a/net-im/kaccounts-integration/Makefile b/net-im/kaccounts-integration/Makefile index 13bfe67c3bb4..e754ddeea736 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= 1 +PORTREVISION= 2 CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -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 \ diff --git a/net-im/kaccounts-providers/Makefile b/net-im/kaccounts-providers/Makefile index 6c98c99b1bb2..80f582234658 100644 --- a/net-im/kaccounts-providers/Makefile +++ b/net-im/kaccounts-providers/Makefile @@ -1,5 +1,6 @@ PORTNAME= kaccounts-providers DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -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 diff --git a/net-im/libsignon-glib/Makefile b/net-im/libsignon-glib/Makefile index 66633b241e4c..51435830687a 100644 --- a/net-im/libsignon-glib/Makefile +++ b/net-im/libsignon-glib/Makefile @@ -1,5 +1,6 @@ PORTNAME= libsignon-glib DISTVERSION= 2.1 +PORTREVISION= 1 CATEGORIES= net-im DIST_SUBDIR= KDE/${GL_ACCOUNT} @@ -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 diff --git a/sysutils/Makefile b/sysutils/Makefile index 838e4cecdc9c..7c014e8bc4fc 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -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 diff --git a/sysutils/accounts-qml-module/Makefile b/sysutils/accounts-qml-module/Makefile index 25dc2596b06a..3c1e2481bbac 100644 --- a/sysutils/accounts-qml-module/Makefile +++ b/sysutils/accounts-qml-module/Makefile @@ -1,6 +1,6 @@ PORTNAME= accounts-qml-module DISTVERSION= 0.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils kde DIST_SUBDIR= KDE/${GL_ACCOUNT} @@ -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 diff --git a/sysutils/signon-kwallet-extension/Makefile b/sysutils/signon-kwallet-extension/Makefile index 1e9a97584d25..f59255d86bba 100644 --- a/sysutils/signon-kwallet-extension/Makefile +++ b/sysutils/signon-kwallet-extension/Makefile @@ -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 \ diff --git a/sysutils/signon-plugin-oauth2/Makefile b/sysutils/signon-plugin-oauth2/Makefile index 44ceea45c7c2..99f1d89537e3 100644 --- a/sysutils/signon-plugin-oauth2/Makefile +++ b/sysutils/signon-plugin-oauth2/Makefile @@ -1,5 +1,6 @@ PORTNAME= signon-plugin-oauth2 DISTVERSION= 0.25 +PORTREVISION= 1 CATEGORIES= sysutils kde DISTNAME= archive DIST_SUBDIR= KDE/${GL_ACCOUNT} @@ -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 \ diff --git a/sysutils/signon-qt5/distinfo b/sysutils/signon-qt5/distinfo deleted file mode 100644 index cd415da0de90..000000000000 --- a/sysutils/signon-qt5/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1617892293 -SHA256 (KDE/accounts-sso/accounts-sso-signond-07d45498ad374d9e8e4ff6a886f4b4bb850c0cb5_GL0.tar.gz) = b25bd96fd3862b9b9ec9d3fc4e32f8cdfea49cbae6251a182f95d3f27f954243 -SIZE (KDE/accounts-sso/accounts-sso-signond-07d45498ad374d9e8e4ff6a886f4b4bb850c0cb5_GL0.tar.gz) = 281640 diff --git a/sysutils/signon-ui/Makefile b/sysutils/signon-ui/Makefile index 927aede3becc..ca3178df3602 100644 --- a/sysutils/signon-ui/Makefile +++ b/sysutils/signon-ui/Makefile @@ -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} @@ -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 \ diff --git a/sysutils/signon-qt5/Makefile b/sysutils/signond/Makefile similarity index 73% rename from sysutils/signon-qt5/Makefile rename to sysutils/signond/Makefile index d0eee87c38a2..bf4f907c748f 100644 --- a/sysutils/signon-qt5/Makefile +++ b/sysutils/signond/Makefile @@ -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 @@ -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,' \ diff --git a/sysutils/signond/distinfo b/sysutils/signond/distinfo new file mode 100644 index 000000000000..7e6fe43ea464 --- /dev/null +++ b/sysutils/signond/distinfo @@ -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 diff --git a/sysutils/signon-qt5/files/patch-signon.pro b/sysutils/signond/files/patch-signon.pro similarity index 100% rename from sysutils/signon-qt5/files/patch-signon.pro rename to sysutils/signond/files/patch-signon.pro diff --git a/sysutils/signon-qt5/files/patch-tests_signond-tests_mock-ac-plugin_access-control-manager.h b/sysutils/signond/files/patch-tests_signond-tests_mock-ac-plugin_access-control-manager.h similarity index 100% rename from sysutils/signon-qt5/files/patch-tests_signond-tests_mock-ac-plugin_access-control-manager.h rename to sysutils/signond/files/patch-tests_signond-tests_mock-ac-plugin_access-control-manager.h diff --git a/sysutils/signon-qt5/pkg-descr b/sysutils/signond/pkg-descr similarity index 100% rename from sysutils/signon-qt5/pkg-descr rename to sysutils/signond/pkg-descr diff --git a/sysutils/signon-qt5/pkg-plist b/sysutils/signond/pkg-plist similarity index 74% rename from sysutils/signon-qt5/pkg-plist rename to sysutils/signond/pkg-plist index 00b24edfd3f5..ca79b15cce3b 100644 --- a/sysutils/signon-qt5/pkg-plist +++ b/sysutils/signond/pkg-plist @@ -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 @@ -31,22 +31,22 @@ 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 @@ -54,6 +54,8 @@ 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 @@ -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 @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401051257.405Cva6i085199>