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
This commit is contained in:
Tobias C. Berner 2024-01-05 13:17:23 +01:00
parent 8cd334f819
commit 82f0c0f348
16 changed files with 62 additions and 50 deletions

View file

@ -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

View file

@ -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

View file

@ -42,7 +42,7 @@
SUBDIR += kaidan
SUBDIR += kopete
SUBDIR += libaccounts-glib
SUBDIR += libaccounts-qt5
SUBDIR += libaccounts-qt
SUBDIR += libmesode
SUBDIR += libnice
SUBDIR += libnice-gst1

View file

@ -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

View file

@ -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 \

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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'