From 72deea76ea544555493ca8da126514d5d0bf96c6 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Sat, 11 Jul 2020 11:38:30 +0000 Subject: [PATCH] Update accounts-sso ports - this fixes for example kio-gdrive --- graphics/elementary-photos/Makefile | 1 + misc/kf5-purpose/Makefile | 2 +- net-im/kaccounts-integration/Makefile | 1 + net-im/kaccounts-providers/Makefile | 1 + net-im/ktp-accounts-kcm/Makefile | 1 + net-im/ktp-auth-handler/Makefile | 1 + net-im/ktp-common-internals/Makefile | 1 + net-im/libaccounts-glib/Makefile | 31 +-- net-im/libaccounts-glib/distinfo | 6 +- .../libaccounts-glib/files/patch-meson.build | 11 + .../files/patch-meson__options.txt | 5 + net-im/libaccounts-glib/pkg-plist | 28 ++- net-im/libaccounts-qt5/Makefile | 25 +- net-im/libaccounts-qt5/distinfo | 5 +- .../files/patch-accounts-qt.pro | 15 ++ .../files/patch-common-project-config.pri | 11 + net-im/libaccounts-qt5/pkg-plist | 232 ++++++++---------- net-im/libsignon-glib/Makefile | 29 +-- net-im/libsignon-glib/distinfo | 6 +- net-im/libsignon-glib/files/patch-meson.build | 14 ++ .../files/patch-meson__options.txt | 7 + net-im/libsignon-glib/pkg-plist | 21 +- net-im/telepathy-accounts-signon/Makefile | 7 +- net-im/telepathy-accounts-signon/distinfo | 6 +- net/kio-gdrive/Makefile | 1 + sysutils/accounts-qml-module/Makefile | 1 + sysutils/signon-qt5/Makefile | 5 +- sysutils/signon-qt5/distinfo | 6 +- sysutils/signon-qt5/files/patch-signon.pro | 8 +- sysutils/signon-qt5/pkg-plist | 7 +- sysutils/signon-ui/Makefile | 2 +- 31 files changed, 270 insertions(+), 227 deletions(-) create mode 100644 net-im/libaccounts-glib/files/patch-meson.build create mode 100644 net-im/libaccounts-glib/files/patch-meson__options.txt create mode 100644 net-im/libaccounts-qt5/files/patch-accounts-qt.pro create mode 100644 net-im/libaccounts-qt5/files/patch-common-project-config.pri create mode 100644 net-im/libsignon-glib/files/patch-meson.build create mode 100644 net-im/libsignon-glib/files/patch-meson__options.txt diff --git a/graphics/elementary-photos/Makefile b/graphics/elementary-photos/Makefile index 3b359e333354..b44bc3a6403e 100644 --- a/graphics/elementary-photos/Makefile +++ b/graphics/elementary-photos/Makefile @@ -2,6 +2,7 @@ PORTNAME= elementary-photos DISTVERSION= 2.7.0 +PORTREVISION= 1 CATEGORIES= graphics MAINTAINER= miguel@gocobachi.dev diff --git a/misc/kf5-purpose/Makefile b/misc/kf5-purpose/Makefile index c8fee5d0dcce..8fe93b78f89b 100644 --- a/misc/kf5-purpose/Makefile +++ b/misc/kf5-purpose/Makefile @@ -2,7 +2,7 @@ PORTNAME= purpose DISTVERSION= ${KDE_FRAMEWORKS_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc kde kde-frameworks MAINTAINER= kde@FreeBSD.org diff --git a/net-im/kaccounts-integration/Makefile b/net-im/kaccounts-integration/Makefile index c33f9d0b67bf..8c03a2212477 100644 --- a/net-im/kaccounts-integration/Makefile +++ b/net-im/kaccounts-integration/Makefile @@ -2,6 +2,7 @@ PORTNAME= kaccounts-integration DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/net-im/kaccounts-providers/Makefile b/net-im/kaccounts-providers/Makefile index 37adc62ff166..437f7048df77 100644 --- a/net-im/kaccounts-providers/Makefile +++ b/net-im/kaccounts-providers/Makefile @@ -2,6 +2,7 @@ PORTNAME= kaccounts-providers DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/net-im/ktp-accounts-kcm/Makefile b/net-im/ktp-accounts-kcm/Makefile index 3367e34b7162..555fc1285b16 100644 --- a/net-im/ktp-accounts-kcm/Makefile +++ b/net-im/ktp-accounts-kcm/Makefile @@ -2,6 +2,7 @@ PORTNAME= ktp-accounts-kcm DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/net-im/ktp-auth-handler/Makefile b/net-im/ktp-auth-handler/Makefile index 18210b01717a..f92e67c71f07 100644 --- a/net-im/ktp-auth-handler/Makefile +++ b/net-im/ktp-auth-handler/Makefile @@ -2,6 +2,7 @@ PORTNAME= ktp-auth-handler DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/net-im/ktp-common-internals/Makefile b/net-im/ktp-common-internals/Makefile index 0519d5a8bc06..ba7b351d66a7 100644 --- a/net-im/ktp-common-internals/Makefile +++ b/net-im/ktp-common-internals/Makefile @@ -2,6 +2,7 @@ PORTNAME= ktp-common-internals DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= net-im kde kde-applications MAINTAINER= kde@FreeBSD.org diff --git a/net-im/libaccounts-glib/Makefile b/net-im/libaccounts-glib/Makefile index 74267208807d..06734dbb5136 100644 --- a/net-im/libaccounts-glib/Makefile +++ b/net-im/libaccounts-glib/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libaccounts-glib -PORTVERSION= 1.21 -PORTREVISION= 3 +DISTVERSION= 1.25 CATEGORIES= net-im DIST_SUBDIR= KDE/${GL_ACCOUNT} @@ -13,38 +12,30 @@ COMMENT= Accounts and SSO framework for Linux and POSIX based platforms LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING +BUILD_DEPENDS= vapigen:lang/vala \ + checkmk:devel/check LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib -GNU_CONFIGURE= YES -CONFIGURE_ARGS= --disable-tests -INSTALL_TARGET= install-strip - -USES= autoreconf gmake gnome libtool pathfix pkgconfig python sqlite:3 +USES= gnome libtool meson pathfix pkgconfig python sqlite:3 USE_GNOME= pygobject3 introspection libxml2 USE_PYTHON= py3kplist CFLAGS_powerpc64= -Wno-error +CONFIGURE_ARGS= -Dtests=false + +INSTALL_TARGET= install-strip + # GitLab variables. USE_GITLAB= yes GL_ACCOUNT= accounts-sso -GL_COMMIT= 00254a604a7c7bd38c41794a80ad8930e90f21aa +GL_COMMIT= 886a80b3ba975d8a59a6500ade2b1debb552660c OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= gtkdocize:textproc/gtk-doc -DOCS_CONFIGURE_ENABLE= gtk-doc +DOCS_MESON_TRUE= docs -# Run gtdocize as done in autogen.sh. When DOCS is off, the -# unexpanded GTK_DOC_CHECK macro remains, so comment it out instead. -# Also drop the docs/ files from AC_CONFIG_FILES. -pre-configure-DOCS-on: - cd ${CONFIGURE_WRKSRC} && gtkdocize --copy --flavour no-tmpl - -pre-configure-DOCS-off: - @${TOUCH} ${WRKSRC}/gtk-doc.make - @${REINPLACE_CMD} -e 's/docs//g' ${WRKSRC}/Makefile.am - @${REINPLACE_CMD} -e 's/^GTK_DOC_CHECK/# GTK_DOC_CHECK/' \ - -e '/^.docs\//d' ${WRKSRC}/configure.ac +BINARY_ALIAS= python=${PYTHON_CMD} .include diff --git a/net-im/libaccounts-glib/distinfo b/net-im/libaccounts-glib/distinfo index 38423c9387e1..d1000fb2d5ee 100644 --- a/net-im/libaccounts-glib/distinfo +++ b/net-im/libaccounts-glib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1525025366 -SHA256 (KDE/accounts-sso/accounts-sso-libaccounts-glib-00254a604a7c7bd38c41794a80ad8930e90f21aa_GL0.tar.gz) = 63df498a587ae5cce8dca6e6f2a3a453a1c535383d6c57c7d154be35ca619202 -SIZE (KDE/accounts-sso/accounts-sso-libaccounts-glib-00254a604a7c7bd38c41794a80ad8930e90f21aa_GL0.tar.gz) = 126994 +TIMESTAMP = 1594315627 +SHA256 (KDE/accounts-sso/accounts-sso-libaccounts-glib-886a80b3ba975d8a59a6500ade2b1debb552660c_GL0.tar.gz) = da0b402fc2880c9e5d1e3b939cd0008e1c304fc844355dbc40eb009e65fb07bf +SIZE (KDE/accounts-sso/accounts-sso-libaccounts-glib-886a80b3ba975d8a59a6500ade2b1debb552660c_GL0.tar.gz) = 117357 diff --git a/net-im/libaccounts-glib/files/patch-meson.build b/net-im/libaccounts-glib/files/patch-meson.build new file mode 100644 index 000000000000..03bbc65ad1d8 --- /dev/null +++ b/net-im/libaccounts-glib/files/patch-meson.build @@ -0,0 +1,11 @@ +--- meson.build.orig 2020-07-09 18:44:08 UTC ++++ meson.build +@@ -36,5 +36,7 @@ root_dir = include_directories('.') + subdir('libaccounts-glib') + subdir('tools') + subdir('data') +-subdir('docs') ++if get_option('docs') ++ subdir('docs') ++endif + subdir('tests') diff --git a/net-im/libaccounts-glib/files/patch-meson__options.txt b/net-im/libaccounts-glib/files/patch-meson__options.txt new file mode 100644 index 000000000000..33e9838329fd --- /dev/null +++ b/net-im/libaccounts-glib/files/patch-meson__options.txt @@ -0,0 +1,5 @@ +--- meson_options.txt.orig 2020-07-09 18:44:08 UTC ++++ meson_options.txt +@@ -1 +1,2 @@ ++option('docs', type : 'boolean', description : 'Build with documentation') + option('py-overrides-dir', type : 'string', value : '', description: 'Path to pygobject overrides directory') diff --git a/net-im/libaccounts-glib/pkg-plist b/net-im/libaccounts-glib/pkg-plist index ffb34a6138b8..f83233626581 100644 --- a/net-im/libaccounts-glib/pkg-plist +++ b/net-im/libaccounts-glib/pkg-plist @@ -5,37 +5,41 @@ include/libaccounts-glib/ag-account-service.h include/libaccounts-glib/ag-account.h include/libaccounts-glib/ag-application.h include/libaccounts-glib/ag-auth-data.h +include/libaccounts-glib/ag-autocleanups.h include/libaccounts-glib/ag-errors.h include/libaccounts-glib/ag-manager.h include/libaccounts-glib/ag-provider.h include/libaccounts-glib/ag-service-type.h include/libaccounts-glib/ag-service.h include/libaccounts-glib/ag-types.h +include/libaccounts-glib/libaccounts-glib.h lib/girepository-1.0/Accounts-1.0.typelib lib/libaccounts-glib.so lib/libaccounts-glib.so.0 -lib/libaccounts-glib.so.0.1.3 +lib/libaccounts-glib.so.1.25 %%PYTHON_SITELIBDIR%%/gi/overrides/Accounts.py -%%PYTHON_SITELIBDIR%%/gi/overrides/Accounts.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/Accounts.pyo libdata/pkgconfig/libaccounts-glib.pc -share/backup-framework/applications/accounts.conf share/dbus-1/interfaces/com.google.code.AccountsSSO.Accounts.Manager.xml +share/gettext/its/accounts-application.its +share/gettext/its/accounts-application.loc +share/gettext/its/accounts-provider.its +share/gettext/its/accounts-provider.loc +share/gettext/its/accounts-service-type.its +share/gettext/its/accounts-service-type.loc +share/gettext/its/accounts-service.its +share/gettext/its/accounts-service.loc share/gir-1.0/Accounts-1.0.gir %%DOCS%%share/gtk-doc/html/libaccounts-glib/AgAccount.html %%DOCS%%share/gtk-doc/html/libaccounts-glib/AgAccountService.html -%%DOCS%%share/gtk-doc/html/libaccounts-glib/AgApplication.html -%%DOCS%%share/gtk-doc/html/libaccounts-glib/AgAuthData.html %%DOCS%%share/gtk-doc/html/libaccounts-glib/AgManager.html -%%DOCS%%share/gtk-doc/html/libaccounts-glib/AgProvider.html -%%DOCS%%share/gtk-doc/html/libaccounts-glib/AgService.html -%%DOCS%%share/gtk-doc/html/libaccounts-glib/AgServiceType.html %%DOCS%%share/gtk-doc/html/libaccounts-glib/account-management.html %%DOCS%%share/gtk-doc/html/libaccounts-glib/ag-backup.html %%DOCS%%share/gtk-doc/html/libaccounts-glib/ag-tool.html %%DOCS%%share/gtk-doc/html/libaccounts-glib/annotation-glossary.html %%DOCS%%share/gtk-doc/html/libaccounts-glib/api-index-1-1.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/api-index-1-14.html %%DOCS%%share/gtk-doc/html/libaccounts-glib/api-index-1-2.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/api-index-1-25.html %%DOCS%%share/gtk-doc/html/libaccounts-glib/api-index-1-4.html %%DOCS%%share/gtk-doc/html/libaccounts-glib/api-index-1-5.html %%DOCS%%share/gtk-doc/html/libaccounts-glib/api-index-deprecated.html @@ -48,13 +52,17 @@ share/gir-1.0/Accounts-1.0.gir %%DOCS%%share/gtk-doc/html/libaccounts-glib/left-insensitive.png %%DOCS%%share/gtk-doc/html/libaccounts-glib/left.png %%DOCS%%share/gtk-doc/html/libaccounts-glib/libaccounts-compiling.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/libaccounts-glib-ag-application.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/libaccounts-glib-ag-auth-data.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/libaccounts-glib-ag-provider.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/libaccounts-glib-ag-service-type.html +%%DOCS%%share/gtk-doc/html/libaccounts-glib/libaccounts-glib-ag-service.html %%DOCS%%share/gtk-doc/html/libaccounts-glib/libaccounts-glib-objects.html %%DOCS%%share/gtk-doc/html/libaccounts-glib/libaccounts-glib-overview.html %%DOCS%%share/gtk-doc/html/libaccounts-glib/libaccounts-glib-tools.html %%DOCS%%share/gtk-doc/html/libaccounts-glib/libaccounts-glib.devhelp2 %%DOCS%%share/gtk-doc/html/libaccounts-glib/libaccounts-overview.html %%DOCS%%share/gtk-doc/html/libaccounts-glib/libaccounts-running.html -%%DOCS%%share/gtk-doc/html/libaccounts-glib/object-tree.html %%DOCS%%share/gtk-doc/html/libaccounts-glib/provider-file-format.html %%DOCS%%share/gtk-doc/html/libaccounts-glib/right-insensitive.png %%DOCS%%share/gtk-doc/html/libaccounts-glib/right.png diff --git a/net-im/libaccounts-qt5/Makefile b/net-im/libaccounts-qt5/Makefile index 1e15dda20aef..37c7e9b4f907 100644 --- a/net-im/libaccounts-qt5/Makefile +++ b/net-im/libaccounts-qt5/Makefile @@ -2,12 +2,10 @@ # $FreeBSD$ PORTNAME= libaccounts-qt5 -PORTVERSION= 1.13 -PORTREVISION= 10 +DISTVERSION= 1.16 +PORTREVISION= 1 CATEGORIES= net-im -MASTER_SITES= https://drive.google.com/uc?export=download&id=0B8fX9XOwH_g4cTRCaktXNDRmMXM&dummy= \ - LOCAL/rakuco -DISTNAME= accounts-qt-${PORTVERSION} +DIST_SUBDIR= KDE/${GL_ACCOUNT} MAINTAINER= kde@FreeBSD.org COMMENT= Qt5 wrapper for SSO framework @@ -16,13 +14,22 @@ LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libaccounts-glib.so:net-im/libaccounts-glib -BUILD_DEPENDS= doxygen:devel/doxygen -FETCH_BEFORE_ARGS= -o ${DISTFILES} - -USES= compiler:c++11-lib qmake pathfix pkgconfig python qt:5 tar:bz2 +USES= compiler:c++17-lang qmake pathfix pkgconfig python qt:5 tar:bz2 USE_QT= buildtools_build core qmake_build testlib xml +# gitlab variables +USE_GITLAB= yes +GL_ACCOUNT= accounts-sso +GL_PROJECT= libaccounts-qt +GL_COMMIT= 525ec684cfa8d234f797d7e49e21c476eea04d8e + +OPTIONS_DEFINE= DOCS +OPTIONS_SUB= yes + +DOCS_BUILD_DEPENDS= doxygen:devel/doxygen +DOCS_QMAKE_ON= CONFIG+=docs + pre-configure: ${REINPLACE_CMD} -e 's,$$$${INSTALL_LIBDIR},${LOCALBASE}/libdata,' \ ${WRKSRC}/common-pkgconfig.pri diff --git a/net-im/libaccounts-qt5/distinfo b/net-im/libaccounts-qt5/distinfo index 87fd911d1e58..98558958bce7 100644 --- a/net-im/libaccounts-qt5/distinfo +++ b/net-im/libaccounts-qt5/distinfo @@ -1,2 +1,3 @@ -SHA256 (accounts-qt-1.13.tar.bz2) = 9033891b7f122f578d0ccf22b0e31fc478e644e97f24e7ad8fb54ef0a5da30f0 -SIZE (accounts-qt-1.13.tar.bz2) = 544655 +TIMESTAMP = 1594316326 +SHA256 (KDE/accounts-sso/accounts-sso-libaccounts-qt-525ec684cfa8d234f797d7e49e21c476eea04d8e_GL0.tar.gz) = 3ca41242436f4020a7a4f5222fdf95561c24756a9aebdaa749850f02d40b39c4 +SIZE (KDE/accounts-sso/accounts-sso-libaccounts-qt-525ec684cfa8d234f797d7e49e21c476eea04d8e_GL0.tar.gz) = 64324 diff --git a/net-im/libaccounts-qt5/files/patch-accounts-qt.pro b/net-im/libaccounts-qt5/files/patch-accounts-qt.pro new file mode 100644 index 000000000000..369c06028e7e --- /dev/null +++ b/net-im/libaccounts-qt5/files/patch-accounts-qt.pro @@ -0,0 +1,15 @@ +--- accounts-qt.pro.orig 2019-09-18 19:00:34 UTC ++++ accounts-qt.pro +@@ -2,10 +2,10 @@ include( common-vars.pri ) + + TEMPLATE = subdirs + CONFIG += ordered +-SUBDIRS += Accounts tests ++SUBDIRS += Accounts + + include( common-project-config.pri ) +-include( doc/doc.pri ) ++docs { include( doc/doc.pri ) } + + DISTNAME = $${PROJECT_NAME}-$${PROJECT_VERSION} + EXCLUDES = \ diff --git a/net-im/libaccounts-qt5/files/patch-common-project-config.pri b/net-im/libaccounts-qt5/files/patch-common-project-config.pri new file mode 100644 index 000000000000..7122b58bbe1b --- /dev/null +++ b/net-im/libaccounts-qt5/files/patch-common-project-config.pri @@ -0,0 +1,11 @@ +--- common-project-config.pri.orig 2020-07-09 18:52:52 UTC ++++ common-project-config.pri +@@ -19,7 +19,7 @@ UI_SOURCES_DIR = ui/src + # we don't like warnings... + #QMAKE_CXXFLAGS *= -Werror + +-CONFIG += c++11 ++CONFIG += c++17 + + #----------------------------------------------------------------------------- + # setup the installation prefix diff --git a/net-im/libaccounts-qt5/pkg-plist b/net-im/libaccounts-qt5/pkg-plist index 5543aa7fc5a2..a32bc1a35550 100644 --- a/net-im/libaccounts-qt5/pkg-plist +++ b/net-im/libaccounts-qt5/pkg-plist @@ -1,4 +1,3 @@ -bin/accountstest include/accounts-qt5/Accounts/Account include/accounts-qt5/Accounts/AccountService include/accounts-qt5/Accounts/Application @@ -24,134 +23,105 @@ lib/cmake/AccountsQt5/AccountsQt5Config.cmake lib/cmake/AccountsQt5/AccountsQt5ConfigVersion.cmake lib/libaccounts-qt5.so lib/libaccounts-qt5.so.1 -lib/libaccounts-qt5.so.1.2 -lib/libaccounts-qt5.so.1.2.0 +lib/libaccounts-qt5.so.1.4 +lib/libaccounts-qt5.so.1.4.0 libdata/pkgconfig/accounts-qt5.pc -share/doc/accounts-qt/html/account-service_8cpp_source.html -share/doc/accounts-qt/html/account-service_8h_source.html -share/doc/accounts-qt/html/account_8cpp_source.html -share/doc/accounts-qt/html/account_8h_source.html -share/doc/accounts-qt/html/accountscommon_8h_source.html -share/doc/accounts-qt/html/annotated.html -share/doc/accounts-qt/html/annotated.js -share/doc/accounts-qt/html/annotated_dup.js -share/doc/accounts-qt/html/application_8cpp_source.html -share/doc/accounts-qt/html/application_8h_source.html -share/doc/accounts-qt/html/auth-data_8cpp_source.html -share/doc/accounts-qt/html/auth-data_8h_source.html -share/doc/accounts-qt/html/bc_s.png -share/doc/accounts-qt/html/bdwn.png -share/doc/accounts-qt/html/classAccounts_1_1Account-members.html -share/doc/accounts-qt/html/classAccounts_1_1Account.html -share/doc/accounts-qt/html/classAccounts_1_1Account.js -share/doc/accounts-qt/html/classAccounts_1_1AccountService-members.html -share/doc/accounts-qt/html/classAccounts_1_1AccountService.html -share/doc/accounts-qt/html/classAccounts_1_1AccountService.js -share/doc/accounts-qt/html/classAccounts_1_1Application-members.html -share/doc/accounts-qt/html/classAccounts_1_1Application.html -share/doc/accounts-qt/html/classAccounts_1_1Application.js -share/doc/accounts-qt/html/classAccounts_1_1AuthData-members.html -share/doc/accounts-qt/html/classAccounts_1_1AuthData.html -share/doc/accounts-qt/html/classAccounts_1_1AuthData.js -share/doc/accounts-qt/html/classAccounts_1_1Error-members.html -share/doc/accounts-qt/html/classAccounts_1_1Error.html -share/doc/accounts-qt/html/classAccounts_1_1Error.js -share/doc/accounts-qt/html/classAccounts_1_1Manager-members.html -share/doc/accounts-qt/html/classAccounts_1_1Manager.html -share/doc/accounts-qt/html/classAccounts_1_1Manager.js -share/doc/accounts-qt/html/classAccounts_1_1Provider-members.html -share/doc/accounts-qt/html/classAccounts_1_1Provider.html -share/doc/accounts-qt/html/classAccounts_1_1Provider.js -share/doc/accounts-qt/html/classAccounts_1_1Service-members.html -share/doc/accounts-qt/html/classAccounts_1_1Service.html -share/doc/accounts-qt/html/classAccounts_1_1Service.js -share/doc/accounts-qt/html/classAccounts_1_1ServiceType-members.html -share/doc/accounts-qt/html/classAccounts_1_1ServiceType.html -share/doc/accounts-qt/html/classAccounts_1_1ServiceType.js -share/doc/accounts-qt/html/classAccounts_1_1Watch-members.html -share/doc/accounts-qt/html/classAccounts_1_1Watch.html -share/doc/accounts-qt/html/classAccounts_1_1Watch.js -share/doc/accounts-qt/html/classes.html -share/doc/accounts-qt/html/closed.png -share/doc/accounts-qt/html/deprecated.html -share/doc/accounts-qt/html/dir_61c9e5842729cb34568d93cb98ad85b9.html -share/doc/accounts-qt/html/dir_c3d1d086c816c0518443c9e800634b9c.html -share/doc/accounts-qt/html/dir_c3d1d086c816c0518443c9e800634b9c.js -share/doc/accounts-qt/html/dir_c3d1d086c816c0518443c9e800634b9c_dep.map -share/doc/accounts-qt/html/dir_c3d1d086c816c0518443c9e800634b9c_dep.md5 -share/doc/accounts-qt/html/dir_c3d1d086c816c0518443c9e800634b9c_dep.png -share/doc/accounts-qt/html/dir_e68e8157741866f444e17edd764ebbae.html -share/doc/accounts-qt/html/doc.png -share/doc/accounts-qt/html/doxygen.css -share/doc/accounts-qt/html/doxygen.png -share/doc/accounts-qt/html/dynsections.js -share/doc/accounts-qt/html/error_8cpp_source.html -share/doc/accounts-qt/html/error_8h_source.html -share/doc/accounts-qt/html/files.html -share/doc/accounts-qt/html/files.js -share/doc/accounts-qt/html/files_dup.js -share/doc/accounts-qt/html/folderclosed.png -share/doc/accounts-qt/html/folderopen.png -share/doc/accounts-qt/html/ftv2blank.png -share/doc/accounts-qt/html/ftv2cl.png -share/doc/accounts-qt/html/ftv2doc.png -share/doc/accounts-qt/html/ftv2folderclosed.png -share/doc/accounts-qt/html/ftv2folderopen.png -share/doc/accounts-qt/html/ftv2lastnode.png -share/doc/accounts-qt/html/ftv2link.png -share/doc/accounts-qt/html/ftv2mlastnode.png -share/doc/accounts-qt/html/ftv2mnode.png -share/doc/accounts-qt/html/ftv2mo.png -share/doc/accounts-qt/html/ftv2node.png -share/doc/accounts-qt/html/ftv2ns.png -share/doc/accounts-qt/html/ftv2plastnode.png -share/doc/accounts-qt/html/ftv2pnode.png -share/doc/accounts-qt/html/ftv2splitbar.png -share/doc/accounts-qt/html/ftv2vertline.png -share/doc/accounts-qt/html/functions.html -share/doc/accounts-qt/html/functions_enum.html -share/doc/accounts-qt/html/functions_eval.html -share/doc/accounts-qt/html/functions_func.html -share/doc/accounts-qt/html/graph_legend.html -share/doc/accounts-qt/html/graph_legend.md5 -share/doc/accounts-qt/html/graph_legend.png -share/doc/accounts-qt/html/index.html -share/doc/accounts-qt/html/index.qhp -share/doc/accounts-qt/html/jquery.js -share/doc/accounts-qt/html/manager_8cpp_source.html -share/doc/accounts-qt/html/manager_8h_source.html -share/doc/accounts-qt/html/manager__p_8h_source.html -share/doc/accounts-qt/html/menu.js -share/doc/accounts-qt/html/menudata.js -share/doc/accounts-qt/html/nav_f.png -share/doc/accounts-qt/html/nav_g.png -share/doc/accounts-qt/html/nav_h.png -share/doc/accounts-qt/html/navtree.css -share/doc/accounts-qt/html/navtree.js -share/doc/accounts-qt/html/navtreedata.js -share/doc/accounts-qt/html/navtreeindex0.js -share/doc/accounts-qt/html/open.png -share/doc/accounts-qt/html/pages.html -share/doc/accounts-qt/html/provider_8cpp_source.html -share/doc/accounts-qt/html/provider_8h_source.html -share/doc/accounts-qt/html/resize.js -share/doc/accounts-qt/html/service-type_8cpp_source.html -share/doc/accounts-qt/html/service-type_8h_source.html -share/doc/accounts-qt/html/service_8cpp_source.html -share/doc/accounts-qt/html/service_8h_source.html -share/doc/accounts-qt/html/splitbar.png -share/doc/accounts-qt/html/sync_off.png -share/doc/accounts-qt/html/sync_on.png -share/doc/accounts-qt/html/tab_a.png -share/doc/accounts-qt/html/tab_b.png -share/doc/accounts-qt/html/tab_h.png -share/doc/accounts-qt/html/tab_s.png -share/doc/accounts-qt/html/tabs.css -share/doc/accounts-qt/html/utils_8cpp_source.html -share/doc/accounts-qt/html/utils_8h_source.html -share/doc/accounts-qt/qch/accounts.qch -share/libaccounts-qt-tests/MyProvider.provider -share/libaccounts-qt-tests/MyService.service -share/libaccounts-qt-tests/OtherService.service -share/libaccounts-qt-tests/e-mail.service-type -share/libaccounts-qt-tests/tests.xml +%%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 +%%DOCS%%share/doc/accounts-qt/html/account_8h_source.html +%%DOCS%%share/doc/accounts-qt/html/accountscommon_8h_source.html +%%DOCS%%share/doc/accounts-qt/html/annotated.html +%%DOCS%%share/doc/accounts-qt/html/annotated_dup.js +%%DOCS%%share/doc/accounts-qt/html/application_8cpp_source.html +%%DOCS%%share/doc/accounts-qt/html/application_8h_source.html +%%DOCS%%share/doc/accounts-qt/html/auth-data_8cpp_source.html +%%DOCS%%share/doc/accounts-qt/html/auth-data_8h_source.html +%%DOCS%%share/doc/accounts-qt/html/bc_s.png +%%DOCS%%share/doc/accounts-qt/html/bdwn.png +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1AccountService-members.html +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1AccountService.html +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1AccountService.js +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1Application-members.html +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1Application.html +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1Application.js +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1AuthData-members.html +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1AuthData.html +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1AuthData.js +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1Error-members.html +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1Error.html +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1Error.js +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1Manager-members.html +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1Manager.html +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1Manager.js +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1Provider-members.html +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1Provider.html +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1Provider.js +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1Service-members.html +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1Service.html +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1Service.js +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1ServiceType-members.html +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1ServiceType.html +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1ServiceType.js +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1Watch-members.html +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1Watch.html +%%DOCS%%share/doc/accounts-qt/html/classAccounts_1_1Watch.js +%%DOCS%%share/doc/accounts-qt/html/classes.html +%%DOCS%%share/doc/accounts-qt/html/closed.png +%%DOCS%%share/doc/accounts-qt/html/deprecated.html +%%DOCS%%share/doc/accounts-qt/html/dir_61c9e5842729cb34568d93cb98ad85b9.html +%%DOCS%%share/doc/accounts-qt/html/dir_c3d1d086c816c0518443c9e800634b9c.html +%%DOCS%%share/doc/accounts-qt/html/dir_c3d1d086c816c0518443c9e800634b9c.js +%%DOCS%%share/doc/accounts-qt/html/dir_e68e8157741866f444e17edd764ebbae.html +%%DOCS%%share/doc/accounts-qt/html/doc.png +%%DOCS%%share/doc/accounts-qt/html/doxygen.css +%%DOCS%%share/doc/accounts-qt/html/doxygen.png +%%DOCS%%share/doc/accounts-qt/html/dynsections.js +%%DOCS%%share/doc/accounts-qt/html/error_8cpp_source.html +%%DOCS%%share/doc/accounts-qt/html/error_8h_source.html +%%DOCS%%share/doc/accounts-qt/html/files.html +%%DOCS%%share/doc/accounts-qt/html/files_dup.js +%%DOCS%%share/doc/accounts-qt/html/folderclosed.png +%%DOCS%%share/doc/accounts-qt/html/folderopen.png +%%DOCS%%share/doc/accounts-qt/html/functions.html +%%DOCS%%share/doc/accounts-qt/html/functions_enum.html +%%DOCS%%share/doc/accounts-qt/html/functions_eval.html +%%DOCS%%share/doc/accounts-qt/html/functions_func.html +%%DOCS%%share/doc/accounts-qt/html/graph_legend.html +%%DOCS%%share/doc/accounts-qt/html/graph_legend.md5 +%%DOCS%%share/doc/accounts-qt/html/graph_legend.png +%%DOCS%%share/doc/accounts-qt/html/index.html +%%DOCS%%share/doc/accounts-qt/html/index.qhp +%%DOCS%%share/doc/accounts-qt/html/jquery.js +%%DOCS%%share/doc/accounts-qt/html/manager_8cpp_source.html +%%DOCS%%share/doc/accounts-qt/html/manager_8h_source.html +%%DOCS%%share/doc/accounts-qt/html/manager__p_8h_source.html +%%DOCS%%share/doc/accounts-qt/html/menu.js +%%DOCS%%share/doc/accounts-qt/html/menudata.js +%%DOCS%%share/doc/accounts-qt/html/nav_f.png +%%DOCS%%share/doc/accounts-qt/html/nav_g.png +%%DOCS%%share/doc/accounts-qt/html/nav_h.png +%%DOCS%%share/doc/accounts-qt/html/navtree.css +%%DOCS%%share/doc/accounts-qt/html/navtree.js +%%DOCS%%share/doc/accounts-qt/html/navtreedata.js +%%DOCS%%share/doc/accounts-qt/html/navtreeindex0.js +%%DOCS%%share/doc/accounts-qt/html/open.png +%%DOCS%%share/doc/accounts-qt/html/pages.html +%%DOCS%%share/doc/accounts-qt/html/provider_8cpp_source.html +%%DOCS%%share/doc/accounts-qt/html/provider_8h_source.html +%%DOCS%%share/doc/accounts-qt/html/resize.js +%%DOCS%%share/doc/accounts-qt/html/service-type_8cpp_source.html +%%DOCS%%share/doc/accounts-qt/html/service-type_8h_source.html +%%DOCS%%share/doc/accounts-qt/html/service_8cpp_source.html +%%DOCS%%share/doc/accounts-qt/html/service_8h_source.html +%%DOCS%%share/doc/accounts-qt/html/splitbar.png +%%DOCS%%share/doc/accounts-qt/html/sync_off.png +%%DOCS%%share/doc/accounts-qt/html/sync_on.png +%%DOCS%%share/doc/accounts-qt/html/tab_a.png +%%DOCS%%share/doc/accounts-qt/html/tab_b.png +%%DOCS%%share/doc/accounts-qt/html/tab_h.png +%%DOCS%%share/doc/accounts-qt/html/tab_s.png +%%DOCS%%share/doc/accounts-qt/html/tabs.css +%%DOCS%%share/doc/accounts-qt/html/utils_8cpp_source.html +%%DOCS%%share/doc/accounts-qt/html/utils_8h_source.html +%%DOCS%%@dir share/doc/accounts-qt/qch diff --git a/net-im/libsignon-glib/Makefile b/net-im/libsignon-glib/Makefile index 3138a5d7f2f0..79fb8dbeb73b 100644 --- a/net-im/libsignon-glib/Makefile +++ b/net-im/libsignon-glib/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= libsignon-glib -PORTVERSION= 1.14 -PORTREVISION= 4 +DISTVERSION= 2.1 CATEGORIES= net-im DIST_SUBDIR= KDE/${GL_ACCOUNT} @@ -12,37 +11,33 @@ COMMENT= GLib-based client library for applications handling account authenticat LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= signond:sysutils/signon-qt5 +BUILD_DEPENDS= signond:sysutils/signon-qt5 \ + vapigen:lang/vala RUN_DEPENDS= signond:sysutils/signon-qt5 -GNU_CONFIGURE= YES -CONFIGURE_ARGS= --disable-tests -USES= autoreconf gmake gnome libtool pathfix pkgconfig python tar:bz2 +USES= gnome libtool meson pathfix pkgconfig python tar:bz2 USE_GNOME= introspection pygobject3 USE_PYTHON= py3kplist -PATHFIX_MAKEFILEIN= Makefile.am - # gitlab variables USE_GITLAB= yes GL_ACCOUNT= accounts-sso -GL_COMMIT= 4e85baaf483268d04bbf835bebeac4ae30c7c327 +GL_COMMIT= 7f9f10a2e7533b74eaf027b26de48818326a1dcf CFLAGS+= -Wno-error +CONFIGURE_ARGS= -Dtests=false + OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes DOCS_BUILD_DEPENDS= gtkdocize:textproc/gtk-doc -DOCS_CONFIGURE_ENABLE= gtk-doc +DOCS_MESON_TRUE= docs -# Run gtdocize as done in autogen.sh. When DOCS is off, the -# unexpanded GTK_DOC_CHECK macro remains, so comment it out instead. -pre-configure-DOCS-on: - cd ${CONFIGURE_WRKSRC} && gtkdocize --copy --flavour no-tmpl +BINARY_ALIAS= python=${PYTHON_CMD} -pre-configure-DOCS-off: - @${TOUCH} ${WRKSRC}/gtk-doc.make - @${REINPLACE_CMD} -e 's/^GTK_DOC_CHECK/# GTK_DOC_CHECK/' ${WRKSRC}/configure.ac +post-extract: + # Fix broken tar ball + ${CP} ${WRKSRC}/libsignon-glib/*.xml ${WRKSRC}/libsignon-glib/interfaces .include diff --git a/net-im/libsignon-glib/distinfo b/net-im/libsignon-glib/distinfo index 822481425ff5..6aa3fbc8356c 100644 --- a/net-im/libsignon-glib/distinfo +++ b/net-im/libsignon-glib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1521876594 -SHA256 (KDE/accounts-sso/accounts-sso-libsignon-glib-4e85baaf483268d04bbf835bebeac4ae30c7c327_GL0.tar.gz) = fea04d2cb4e59b9322226ba532e1600c23f817ee409d3c6ec0b7659aec1840a7 -SIZE (KDE/accounts-sso/accounts-sso-libsignon-glib-4e85baaf483268d04bbf835bebeac4ae30c7c327_GL0.tar.gz) = 54781 +TIMESTAMP = 1594311646 +SHA256 (KDE/accounts-sso/accounts-sso-libsignon-glib-7f9f10a2e7533b74eaf027b26de48818326a1dcf_GL0.tar.gz) = 15d8c0ca29b69f8876f833a3272417cf88905f68aece6f962f50a0480a6450ab +SIZE (KDE/accounts-sso/accounts-sso-libsignon-glib-7f9f10a2e7533b74eaf027b26de48818326a1dcf_GL0.tar.gz) = 52463 diff --git a/net-im/libsignon-glib/files/patch-meson.build b/net-im/libsignon-glib/files/patch-meson.build new file mode 100644 index 000000000000..40f92d753995 --- /dev/null +++ b/net-im/libsignon-glib/files/patch-meson.build @@ -0,0 +1,14 @@ +--- meson.build.orig 2020-07-09 18:29:47 UTC ++++ meson.build +@@ -23,7 +23,10 @@ endif + root_dir = include_directories ('.') + + subdir('libsignon-glib') +-subdir('docs') ++ ++if get_option('docs') ++ subdir('docs') ++endif + + if get_option('python') + subdir('pygobject') diff --git a/net-im/libsignon-glib/files/patch-meson__options.txt b/net-im/libsignon-glib/files/patch-meson__options.txt new file mode 100644 index 000000000000..a75a41241149 --- /dev/null +++ b/net-im/libsignon-glib/files/patch-meson__options.txt @@ -0,0 +1,7 @@ +--- meson_options.txt.orig 2020-07-09 18:37:36 UTC ++++ meson_options.txt +@@ -1,3 +1,4 @@ ++option('docs', type : 'boolean', description : 'Build with documentation') + option('tests', type : 'boolean', description : 'Build with test support') + option('debugging', type : 'boolean', value: false, description : 'Printing of debug messages') + option('python', type : 'boolean', description : 'Build with python support') diff --git a/net-im/libsignon-glib/pkg-plist b/net-im/libsignon-glib/pkg-plist index 3b4fa9575e8e..0170b0536de2 100644 --- a/net-im/libsignon-glib/pkg-plist +++ b/net-im/libsignon-glib/pkg-plist @@ -5,25 +5,28 @@ include/libsignon-glib/signon-errors.h include/libsignon-glib/signon-glib.h include/libsignon-glib/signon-identity-info.h include/libsignon-glib/signon-identity.h +include/libsignon-glib/signon-security-context.h include/libsignon-glib/signon-types.h -lib/girepository-1.0/Signon-1.0.typelib +lib/girepository-1.0/Signon-2.0.typelib lib/libsignon-glib.so -lib/libsignon-glib.so.1 -lib/libsignon-glib.so.1.0.0 +lib/libsignon-glib.so.2 +lib/libsignon-glib.so.2.0.0 %%PYTHON_SITELIBDIR%%/gi/overrides/Signon.py -%%PYTHON_SITELIBDIR%%/gi/overrides/Signon.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/Signon.pyo libdata/pkgconfig/libsignon-glib.pc -share/gir-1.0/Signon-1.0.gir +share/gir-1.0/Signon-2.0.gir %%DOCS%%share/gtk-doc/html/libsignon-glib/SignonAuthService.html %%DOCS%%share/gtk-doc/html/libsignon-glib/SignonAuthSession.html %%DOCS%%share/gtk-doc/html/libsignon-glib/SignonIdentity.html %%DOCS%%share/gtk-doc/html/libsignon-glib/SignonIdentityInfo.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/SignonSecurityContext.html %%DOCS%%share/gtk-doc/html/libsignon-glib/annotation-glossary.html %%DOCS%%share/gtk-doc/html/libsignon-glib/api-index-1-8.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/api-index-2-0.html %%DOCS%%share/gtk-doc/html/libsignon-glib/api-index-deprecated.html %%DOCS%%share/gtk-doc/html/libsignon-glib/api-index-full.html %%DOCS%%share/gtk-doc/html/libsignon-glib/appendices.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/ch03s02.html +%%DOCS%%share/gtk-doc/html/libsignon-glib/ch03s03.html %%DOCS%%share/gtk-doc/html/libsignon-glib/credential-management.html %%DOCS%%share/gtk-doc/html/libsignon-glib/gdbus-com.google.code.AccountsSSO.SingleSignOn.AuthService.html %%DOCS%%share/gtk-doc/html/libsignon-glib/gdbus-com.google.code.AccountsSSO.SingleSignOn.AuthSession.html @@ -36,12 +39,14 @@ share/gir-1.0/Signon-1.0.gir %%DOCS%%share/gtk-doc/html/libsignon-glib/libsignon-glib-objects.html %%DOCS%%share/gtk-doc/html/libsignon-glib/libsignon-glib-overview.html %%DOCS%%share/gtk-doc/html/libsignon-glib/libsignon-glib.devhelp2 +%%DOCS%%share/gtk-doc/html/libsignon-glib/migrating.html %%DOCS%%share/gtk-doc/html/libsignon-glib/object-tree.html %%DOCS%%share/gtk-doc/html/libsignon-glib/right-insensitive.png %%DOCS%%share/gtk-doc/html/libsignon-glib/right.png +%%DOCS%%share/gtk-doc/html/libsignon-glib/signon-migrating-1-to-2.html %%DOCS%%share/gtk-doc/html/libsignon-glib/signond-dbus-api.html %%DOCS%%share/gtk-doc/html/libsignon-glib/style.css %%DOCS%%share/gtk-doc/html/libsignon-glib/up-insensitive.png %%DOCS%%share/gtk-doc/html/libsignon-glib/up.png -share/vala/vapi/signon.vapi -@comment share/gtk-doc/html/libsignon-glib/index.sgml +share/vala/vapi/libsignon-glib.deps +share/vala/vapi/libsignon-glib.vapi diff --git a/net-im/telepathy-accounts-signon/Makefile b/net-im/telepathy-accounts-signon/Makefile index bcf41a538885..6ff8b2ee81d5 100644 --- a/net-im/telepathy-accounts-signon/Makefile +++ b/net-im/telepathy-accounts-signon/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= telepathy-accounts-signon -PORTVERSION= 1.0 +DISTVERSION= 2.1 PORTREVISION= 1 CATEGORIES= net-im DIST_SUBDIR= KDE/${GL_ACCOUNT} @@ -16,15 +16,14 @@ LIB_DEPENDS= libaccounts-glib.so:net-im/libaccounts-glib \ libmission-control-plugins.so:net-im/telepathy-mission-control \ libsignon-glib.so:net-im/libsignon-glib -USES= gettext pkgconfig qmake qt:5 tar:bz2 -USE_QT= buildtools_build core qmake_build +USES= gettext meson pkgconfig tar:bz2 USE_LDCONFIG= YES # gitlab variables USE_GITLAB= yes GL_ACCOUNT= accounts-sso -GL_COMMIT= f01a6d9eccad24a3cb4a5300fb0ae0fd426cc815 +GL_COMMIT= 0af244284e6b04c4abe5373d43bbc88a235d84aa PLIST_FILES= lib/mission-control-plugins.0/mcp-account-manager-accounts-sso.so diff --git a/net-im/telepathy-accounts-signon/distinfo b/net-im/telepathy-accounts-signon/distinfo index 76b3a4e2992c..4f02d1ea85a9 100644 --- a/net-im/telepathy-accounts-signon/distinfo +++ b/net-im/telepathy-accounts-signon/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1521876611 -SHA256 (KDE/accounts-sso/accounts-sso-telepathy-accounts-signon-f01a6d9eccad24a3cb4a5300fb0ae0fd426cc815_GL0.tar.gz) = 1588bc8190664ea13bb086d125a999f7556d5d47cd61ee2a7bd80699f07fd413 -SIZE (KDE/accounts-sso/accounts-sso-telepathy-accounts-signon-f01a6d9eccad24a3cb4a5300fb0ae0fd426cc815_GL0.tar.gz) = 16676 +TIMESTAMP = 1594315268 +SHA256 (KDE/accounts-sso/accounts-sso-telepathy-accounts-signon-0af244284e6b04c4abe5373d43bbc88a235d84aa_GL0.tar.gz) = 478e8b8c91380960343b6de44bcfad5ac75895fdea3839155cb418f0db9aaea4 +SIZE (KDE/accounts-sso/accounts-sso-telepathy-accounts-signon-0af244284e6b04c4abe5373d43bbc88a235d84aa_GL0.tar.gz) = 16654 diff --git a/net/kio-gdrive/Makefile b/net/kio-gdrive/Makefile index f1e055e744f1..0707c4b533cf 100644 --- a/net/kio-gdrive/Makefile +++ b/net/kio-gdrive/Makefile @@ -2,6 +2,7 @@ PORTNAME= kio-gdrive DISTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= net kde MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTNAME} diff --git a/sysutils/accounts-qml-module/Makefile b/sysutils/accounts-qml-module/Makefile index 318bbd68376f..1bc4552f912d 100644 --- a/sysutils/accounts-qml-module/Makefile +++ b/sysutils/accounts-qml-module/Makefile @@ -2,6 +2,7 @@ PORTNAME= accounts-qml-module DISTVERSION= 0.7 +PORTREVISION= 1 CATEGORIES= sysutils kde DIST_SUBDIR= KDE/${GL_ACCOUNT} diff --git a/sysutils/signon-qt5/Makefile b/sysutils/signon-qt5/Makefile index ee8b8175781c..c40773483fd7 100644 --- a/sysutils/signon-qt5/Makefile +++ b/sysutils/signon-qt5/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= signon -PORTVERSION= 8.58 -PORTREVISION= 3 +DISTVERSION= 8.60 CATEGORIES= sysutils kde PKGNAMESUFFIX= -qt5 DIST_SUBDIR= KDE/${GL_ACCOUNT} @@ -22,7 +21,7 @@ USE_QT= core dbus gui network sql testlib xml \ USE_GITLAB= yes GL_ACCOUNT= accounts-sso GL_PROJECT= signond -GL_COMMIT= aa1bcf3c9218addbdb376a40151b689409046125 +GL_COMMIT= 07d45498ad374d9e8e4ff6a886f4b4bb850c0cb5 OPTIONS_DEFINE= DOCS diff --git a/sysutils/signon-qt5/distinfo b/sysutils/signon-qt5/distinfo index d21b70618cca..ee77e07442f6 100644 --- a/sysutils/signon-qt5/distinfo +++ b/sysutils/signon-qt5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1521876255 -SHA256 (KDE/accounts-sso/accounts-sso-signond-aa1bcf3c9218addbdb376a40151b689409046125_GL0.tar.gz) = 764aa2b1481785f847d4b299a974a885615280d2daaf7fc39b93b81e17a900f3 -SIZE (KDE/accounts-sso/accounts-sso-signond-aa1bcf3c9218addbdb376a40151b689409046125_GL0.tar.gz) = 277074 +TIMESTAMP = 1594311077 +SHA256 (KDE/accounts-sso/accounts-sso-signond-07d45498ad374d9e8e4ff6a886f4b4bb850c0cb5_GL0.tar.gz) = c47a304853fd0495c8531d00c0ee0220815d196dceae26340cbe68a594062f74 +SIZE (KDE/accounts-sso/accounts-sso-signond-07d45498ad374d9e8e4ff6a886f4b4bb850c0cb5_GL0.tar.gz) = 281364 diff --git a/sysutils/signon-qt5/files/patch-signon.pro b/sysutils/signon-qt5/files/patch-signon.pro index 088cf8ef0d6e..c95f7a46da26 100644 --- a/sysutils/signon-qt5/files/patch-signon.pro +++ b/sysutils/signon-qt5/files/patch-signon.pro @@ -1,11 +1,9 @@ ---- signon.pro.orig 2015-04-19 18:24:47 UTC +--- signon.pro.orig 2020-07-09 16:11:28 UTC +++ signon.pro -@@ -7,8 +7,6 @@ tests.depends = lib src +@@ -7,6 +7,4 @@ tests.depends = lib src include( common-installs-config.pri ) -include( doc/doc.pri ) - - DISTNAME = $${PROJECT_NAME}-$${PROJECT_VERSION} - dist.commands = "git archive --format=tar --prefix=$${DISTNAME}/ HEAD | bzip2 -9 > $${DISTNAME}.tar.bz2" - QMAKE_EXTRA_TARGETS += dist + # End of File diff --git a/sysutils/signon-qt5/pkg-plist b/sysutils/signon-qt5/pkg-plist index 732f65c73fa3..00b24edfd3f5 100644 --- a/sysutils/signon-qt5/pkg-plist +++ b/sysutils/signon-qt5/pkg-plist @@ -36,17 +36,18 @@ 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/signond/accesscontrolmanagerhelper.h -include/signond/backupifadaptor.h include/signond/credentialsaccessmanager.h include/signond/credentialsdb.h include/signond/credentialsdb_p.h @@ -64,6 +65,7 @@ include/signond/signondisposable.h include/signond/signonidentity.h include/signond/signonidentityadaptor.h include/signond/signonidentityinfo.h +include/signond/signonsecuritycontext.h include/signond/signonsessioncore.h include/signond/signonsessioncoretools.h include/signond/signontrace.h @@ -96,9 +98,6 @@ libdata/pkgconfig/libsignon-qt5.pc libdata/pkgconfig/signon-plugins-common.pc libdata/pkgconfig/signon-plugins.pc libdata/pkgconfig/signond.pc -share/dbus-1/interfaces/com.google.code.AccountsSSO.SingleSignOn.AuthService.xml -share/dbus-1/interfaces/com.google.code.AccountsSSO.SingleSignOn.AuthSession.xml -share/dbus-1/interfaces/com.google.code.AccountsSSO.SingleSignOn.Identity.xml share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service share/dbus-1/services/com.nokia.SingleSignOn.Backup.service %%PORTDOCS%%%%DOCSDIR%%-plugins-dev/example/exampledata.h diff --git a/sysutils/signon-ui/Makefile b/sysutils/signon-ui/Makefile index 9125b8ace636..4a22f8ee3dc2 100644 --- a/sysutils/signon-ui/Makefile +++ b/sysutils/signon-ui/Makefile @@ -2,7 +2,7 @@ PORTNAME= signon-ui PORTVERSION= 0.17 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils kde DIST_SUBDIR= KDE/${GL_ACCOUNT}