Date: Fri, 5 Jan 2024 12:57:37 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: 82f0c0f3480c - main - net-im/libaccounts-qt5: rename to libaccounts-qt and flavorize Message-ID: <202401051257.405Cvbxl085247@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=82f0c0f3480cb0e63adcbbc33cbf929f27371f8c commit 82f0c0f3480cb0e63adcbbc33cbf929f27371f8c Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2024-01-05 12:17:23 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2024-01-05 12:57:24 +0000 net-im/libaccounts-qt5: rename to libaccounts-qt and flavorize - rename to get rid of qt5 in name - switch to fork [1] to add Qt6 support [1] https://gitlab.com/nicolasfella/libaccounts-qt/-/tree/qt6 --- databases/akonadi/Makefile | 3 +- misc/kf5-purpose/Makefile | 3 +- net-im/Makefile | 2 +- net-im/kaccounts-integration/Makefile | 4 +- net-im/kaccounts-providers/Makefile | 4 +- .../{libaccounts-qt5 => libaccounts-qt}/Makefile | 20 +++++--- net-im/libaccounts-qt/distinfo | 3 ++ .../files/patch-accounts-qt.pro | 0 .../files/patch-common-project-config.pri | 0 .../{libaccounts-qt5 => libaccounts-qt}/pkg-descr | 0 .../{libaccounts-qt5 => libaccounts-qt}/pkg-plist | 56 +++++++++++----------- net-im/libaccounts-qt5/distinfo | 3 -- net/kio-gdrive/Makefile | 3 +- sysutils/accounts-qml-module/Makefile | 4 +- sysutils/signon-ui/Makefile | 4 +- x11/plasma5-plasma-desktop/Makefile | 3 +- 16 files changed, 62 insertions(+), 50 deletions(-) diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile index 28bdbf48636a..690597a688ed 100644 --- a/databases/akonadi/Makefile +++ b/databases/akonadi/Makefile @@ -1,5 +1,6 @@ PORTNAME= akonadi DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= databases kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -10,7 +11,7 @@ LICENSE= LGPL21 LIB_DEPENDS= libboost_thread.so:devel/boost-libs \ libkaccounts.so:net-im/kaccounts-integration \ - libaccounts-qt5.so:net-im/libaccounts-qt5 + libaccounts-qt5.so:net-im/libaccounts-qt@qt5 # Let process generate meaningful backtrace on core dump. BUILD_DEPENDS= xsltproc:textproc/libxslt diff --git a/misc/kf5-purpose/Makefile b/misc/kf5-purpose/Makefile index 87517ba4ae08..d399499c606e 100644 --- a/misc/kf5-purpose/Makefile +++ b/misc/kf5-purpose/Makefile @@ -1,11 +1,12 @@ PORTNAME= purpose DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= misc kde kde-frameworks MAINTAINER= kde@FreeBSD.org COMMENT= Offers available actions for a specific purpose -LIB_DEPENDS= libaccounts-qt5.so:net-im/libaccounts-qt5 \ +LIB_DEPENDS= libaccounts-qt5.so:net-im/libaccounts-qt@qt5 \ libkaccounts.so:net-im/kaccounts-integration RUN_DEPENDS= accounts-qml-module>=0:sysutils/accounts-qml-module diff --git a/net-im/Makefile b/net-im/Makefile index 4787d039f321..e55c9365ebf8 100644 --- a/net-im/Makefile +++ b/net-im/Makefile @@ -42,7 +42,7 @@ SUBDIR += kaidan SUBDIR += kopete SUBDIR += libaccounts-glib - SUBDIR += libaccounts-qt5 + SUBDIR += libaccounts-qt SUBDIR += libmesode SUBDIR += libnice SUBDIR += libnice-gst1 diff --git a/net-im/kaccounts-integration/Makefile b/net-im/kaccounts-integration/Makefile index e754ddeea736..3a1a65869cae 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= 2 +PORTREVISION= 3 CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -8,7 +8,7 @@ COMMENT= System to administer web accounts for the KDE desktop WWW= https://projects.kde.org/projects/kdereview/kaccounts-integration LIB_DEPENDS= libQCoro5Core.so:devel/qcoro@qt5 \ - libaccounts-qt5.so:net-im/libaccounts-qt5 \ + libaccounts-qt5.so:net-im/libaccounts-qt@qt5 \ libsignon-qt5.so:sysutils/signond@qt5 RUN_DEPENDS= signon-ui:sysutils/signon-ui diff --git a/net-im/kaccounts-providers/Makefile b/net-im/kaccounts-providers/Makefile index 80f582234658..b062c6f88c91 100644 --- a/net-im/kaccounts-providers/Makefile +++ b/net-im/kaccounts-providers/Makefile @@ -1,6 +1,6 @@ PORTNAME= kaccounts-providers 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-providers LIB_DEPENDS= libaccounts-glib.so:net-im/libaccounts-glib \ libkaccounts.so:net-im/kaccounts-integration \ - libaccounts-qt5.so:net-im/libaccounts-qt5 \ + libaccounts-qt5.so:net-im/libaccounts-qt@qt5 \ libsignon-qt5.so:sysutils/signond@qt5 USES= cmake compiler:c++11-lang gettext gnome kde:5 pkgconfig qt:5 \ diff --git a/net-im/libaccounts-qt5/Makefile b/net-im/libaccounts-qt/Makefile similarity index 64% rename from net-im/libaccounts-qt5/Makefile rename to net-im/libaccounts-qt/Makefile index 83344b178db1..b76092d99fcd 100644 --- a/net-im/libaccounts-qt5/Makefile +++ b/net-im/libaccounts-qt/Makefile @@ -1,8 +1,9 @@ -PORTNAME= libaccounts-qt5 +PORTNAME= libaccounts-qt DISTVERSION= 1.16 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-im DIST_SUBDIR= KDE/${GL_ACCOUNT} +PKGNAMESUFFIX= ${FLAVOR:S/qt//} MAINTAINER= kde@FreeBSD.org COMMENT= Qt5 wrapper for SSO framework @@ -11,18 +12,23 @@ WWW= https://code.google.com/p/accounts-sso/ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING +FLAVORS= qt5 qt6 +FLAVOR?= qt5 + LIB_DEPENDS= libaccounts-glib.so:net-im/libaccounts-glib USES= compiler:c++17-lang gettext-runtime gnome qmake \ - pathfix pkgconfig python qt:5 tar:bz2 + pathfix pkgconfig python qt:${FLAVOR:S/qt//} tar:bz2 USE_GNOME= glib20 -USE_QT= buildtools:build core qmake:build testlib xml +_USE_QT_qt5= buildtools:build core qmake:build testlib xml +_USE_QT_qt6= base +USE_QT= ${_USE_QT_${FLAVOR}} # gitlab variables USE_GITLAB= yes -GL_ACCOUNT= accounts-sso +GL_ACCOUNT= nicolasfella GL_PROJECT= libaccounts-qt -GL_TAGNAME= 525ec684cfa8d234f797d7e49e21c476eea04d8e +GL_TAGNAME= 18557f7def9af8f4a9e0e93e9f575ae11e5066aa OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes @@ -30,6 +36,8 @@ OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= doxygen:devel/doxygen DOCS_QMAKE_ON= CONFIG+=docs +PLIST_SUB= QT_VER=${FLAVOR:S/qt//} + pre-configure: ${REINPLACE_CMD} -e 's,$$$${INSTALL_LIBDIR},${LOCALBASE}/libdata,' \ ${WRKSRC}/common-pkgconfig.pri diff --git a/net-im/libaccounts-qt/distinfo b/net-im/libaccounts-qt/distinfo new file mode 100644 index 000000000000..a72f665c50b2 --- /dev/null +++ b/net-im/libaccounts-qt/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1704456583 +SHA256 (KDE/nicolasfella/nicolasfella-libaccounts-qt-18557f7def9af8f4a9e0e93e9f575ae11e5066aa_GL0.tar.gz) = c89df9c9537afa5b2f01556a99a28cb78bca6325588147c0e902d52a06c64c49 +SIZE (KDE/nicolasfella/nicolasfella-libaccounts-qt-18557f7def9af8f4a9e0e93e9f575ae11e5066aa_GL0.tar.gz) = 65468 diff --git a/net-im/libaccounts-qt5/files/patch-accounts-qt.pro b/net-im/libaccounts-qt/files/patch-accounts-qt.pro similarity index 100% rename from net-im/libaccounts-qt5/files/patch-accounts-qt.pro rename to net-im/libaccounts-qt/files/patch-accounts-qt.pro diff --git a/net-im/libaccounts-qt5/files/patch-common-project-config.pri b/net-im/libaccounts-qt/files/patch-common-project-config.pri similarity index 100% rename from net-im/libaccounts-qt5/files/patch-common-project-config.pri rename to net-im/libaccounts-qt/files/patch-common-project-config.pri diff --git a/net-im/libaccounts-qt5/pkg-descr b/net-im/libaccounts-qt/pkg-descr similarity index 100% rename from net-im/libaccounts-qt5/pkg-descr rename to net-im/libaccounts-qt/pkg-descr diff --git a/net-im/libaccounts-qt5/pkg-plist b/net-im/libaccounts-qt/pkg-plist similarity index 81% rename from net-im/libaccounts-qt5/pkg-plist rename to net-im/libaccounts-qt/pkg-plist index fa3e813ee503..b409b1daf0c8 100644 --- a/net-im/libaccounts-qt5/pkg-plist +++ b/net-im/libaccounts-qt/pkg-plist @@ -1,31 +1,31 @@ -include/accounts-qt5/Accounts/Account -include/accounts-qt5/Accounts/AccountService -include/accounts-qt5/Accounts/Application -include/accounts-qt5/Accounts/AuthData -include/accounts-qt5/Accounts/Error -include/accounts-qt5/Accounts/Manager -include/accounts-qt5/Accounts/Provider -include/accounts-qt5/Accounts/Service -include/accounts-qt5/Accounts/ServiceType -include/accounts-qt5/Accounts/account-service.h -include/accounts-qt5/Accounts/account.h -include/accounts-qt5/Accounts/accountscommon.h -include/accounts-qt5/Accounts/application.h -include/accounts-qt5/Accounts/auth-data.h -include/accounts-qt5/Accounts/error.h -include/accounts-qt5/Accounts/manager.h -include/accounts-qt5/Accounts/manager_p.h -include/accounts-qt5/Accounts/provider.h -include/accounts-qt5/Accounts/service-type.h -include/accounts-qt5/Accounts/service.h -include/accounts-qt5/Accounts/utils.h -lib/cmake/AccountsQt5/AccountsQt5Config.cmake -lib/cmake/AccountsQt5/AccountsQt5ConfigVersion.cmake -lib/libaccounts-qt5.so -lib/libaccounts-qt5.so.1 -lib/libaccounts-qt5.so.1.4 -lib/libaccounts-qt5.so.1.4.0 -libdata/pkgconfig/accounts-qt5.pc +include/accounts-qt%%QT_VER%%/Accounts/Account +include/accounts-qt%%QT_VER%%/Accounts/AccountService +include/accounts-qt%%QT_VER%%/Accounts/Application +include/accounts-qt%%QT_VER%%/Accounts/AuthData +include/accounts-qt%%QT_VER%%/Accounts/Error +include/accounts-qt%%QT_VER%%/Accounts/Manager +include/accounts-qt%%QT_VER%%/Accounts/Provider +include/accounts-qt%%QT_VER%%/Accounts/Service +include/accounts-qt%%QT_VER%%/Accounts/ServiceType +include/accounts-qt%%QT_VER%%/Accounts/account-service.h +include/accounts-qt%%QT_VER%%/Accounts/account.h +include/accounts-qt%%QT_VER%%/Accounts/accountscommon.h +include/accounts-qt%%QT_VER%%/Accounts/application.h +include/accounts-qt%%QT_VER%%/Accounts/auth-data.h +include/accounts-qt%%QT_VER%%/Accounts/error.h +include/accounts-qt%%QT_VER%%/Accounts/manager.h +include/accounts-qt%%QT_VER%%/Accounts/manager_p.h +include/accounts-qt%%QT_VER%%/Accounts/provider.h +include/accounts-qt%%QT_VER%%/Accounts/service-type.h +include/accounts-qt%%QT_VER%%/Accounts/service.h +include/accounts-qt%%QT_VER%%/Accounts/utils.h +lib/cmake/AccountsQt%%QT_VER%%/AccountsQt%%QT_VER%%Config.cmake +lib/cmake/AccountsQt%%QT_VER%%/AccountsQt%%QT_VER%%ConfigVersion.cmake +lib/libaccounts-qt%%QT_VER%%.so +lib/libaccounts-qt%%QT_VER%%.so.1 +lib/libaccounts-qt%%QT_VER%%.so.1.4 +lib/libaccounts-qt%%QT_VER%%.so.1.4.0 +libdata/pkgconfig/accounts-qt%%QT_VER%%.pc %%DOCS%%share/doc/accounts-qt/html/account-service_8cpp_source.html %%DOCS%%share/doc/accounts-qt/html/account-service_8h_source.html %%DOCS%%share/doc/accounts-qt/html/account_8cpp_source.html diff --git a/net-im/libaccounts-qt5/distinfo b/net-im/libaccounts-qt5/distinfo deleted file mode 100644 index 8974bad22d43..000000000000 --- a/net-im/libaccounts-qt5/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1617891830 -SHA256 (KDE/accounts-sso/accounts-sso-libaccounts-qt-525ec684cfa8d234f797d7e49e21c476eea04d8e_GL0.tar.gz) = 87f5a6e1cdcaa115bced1e6db1936746152fa17f03eae406dcf2469f45749709 -SIZE (KDE/accounts-sso/accounts-sso-libaccounts-qt-525ec684cfa8d234f797d7e49e21c476eea04d8e_GL0.tar.gz) = 64429 diff --git a/net/kio-gdrive/Makefile b/net/kio-gdrive/Makefile index c300322e0bd5..4c709a233cd3 100644 --- a/net/kio-gdrive/Makefile +++ b/net/kio-gdrive/Makefile @@ -1,5 +1,6 @@ PORTNAME= kio-gdrive DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= net kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -10,7 +11,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libqt5keychain.so:security/qtkeychain@qt5 \ - libaccounts-qt5.so:net-im/libaccounts-qt5 \ + libaccounts-qt5.so:net-im/libaccounts-qt@qt5 \ libkaccounts.so:net-im/kaccounts-integration RUN_DEPENDS= kaccounts-providers>=0:net-im/kaccounts-providers diff --git a/sysutils/accounts-qml-module/Makefile b/sysutils/accounts-qml-module/Makefile index 3c1e2481bbac..bb7a91830f30 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= 3 +PORTREVISION= 4 CATEGORIES= sysutils kde DIST_SUBDIR= KDE/${GL_ACCOUNT} @@ -11,7 +11,7 @@ WWW= https://gitlab.com/groups/accounts-sso LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libaccounts-qt5.so:net-im/libaccounts-qt5 \ +LIB_DEPENDS= libaccounts-qt5.so:net-im/libaccounts-qt@qt5 \ libsignon-qt5.so:sysutils/signond@qt5 USES= compiler:c++11-lang gl pkgconfig qmake qt:5 tar:bz2 diff --git a/sysutils/signon-ui/Makefile b/sysutils/signon-ui/Makefile index ca3178df3602..77140d2dc5a1 100644 --- a/sysutils/signon-ui/Makefile +++ b/sysutils/signon-ui/Makefile @@ -3,7 +3,7 @@ PORTNAME= signon-ui # > git rev-list 0.17+15.10.20150810-0ubuntu1.. --count DISTVERSION= 0.17-355 DISTVERSIONSUFFIX= -g4368bb7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils kde DIST_SUBDIR= KDE/${GL_ACCOUNT} @@ -14,7 +14,7 @@ WWW= https://gitlab.com/accounts-sso/signon-ui LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libaccounts-qt5.so:net-im/libaccounts-qt5 \ +LIB_DEPENDS= libaccounts-qt5.so:net-im/libaccounts-qt@qt5 \ libnotify.so:devel/libnotify \ libsignon-qt5.so:sysutils/signond@qt5 \ libproxy.so:net/libproxy diff --git a/x11/plasma5-plasma-desktop/Makefile b/x11/plasma5-plasma-desktop/Makefile index dcb464c0eddd..1d9f4c4b35d6 100644 --- a/x11/plasma5-plasma-desktop/Makefile +++ b/x11/plasma5-plasma-desktop/Makefile @@ -1,5 +1,6 @@ PORTNAME= plasma-desktop DISTVERSION= ${KDE_PLASMA_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde kde-plasma MAINTAINER= kde@FreeBSD.org @@ -70,7 +71,7 @@ SCIM_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_SCIM SCIM_LIB_DEPENDS= libscim-1.0.so:textproc/scim SCIM_DESC= Enable SCIM backend for input dialog ACCOUNTS_LIB_DEPENDS= libkaccounts.so:net-im/kaccounts-integration \ - libaccounts-qt5.so:net-im/libaccounts-qt5 + libaccounts-qt5.so:net-im/libaccounts-qt@qt5 ACCOUNTS_USE= gnome=intltool ACCOUNTS_DESC= Accounts management library support PIPEWIRE_DESC= Use runtime dependency QML module 'org.kde.pipewire'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401051257.405Cvbxl085247>