Index: head/net-im/libaccounts-glib/files/patch-libaccounts-glib_ag-manager.c =================================================================== --- head/net-im/libaccounts-glib/files/patch-libaccounts-glib_ag-manager.c (revision 412744) +++ head/net-im/libaccounts-glib/files/patch-libaccounts-glib_ag-manager.c (nonexistent) @@ -1,21 +0,0 @@ -Fixes the following build error with clang: - -ag-manager.c:503:16: error: implicit conversion from enumeration type 'AgAccountsError' to different enumeration type 'AgError' [-Werror,-Wenum-conversion] - code = AG_ACCOUNTS_ERROR_DB_LOCKED; - ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~ -ag-manager.c:508:16: error: implicit conversion from enumeration type 'AgAccountsError' to different enumeration type 'AgError' [-Werror,-Wenum-conversion] - code = AG_ACCOUNTS_ERROR_DB; - ~ ^~~~~~~~~~~~~~~~~~~~ - -Sent upstream: https://gitlab.com/accounts-sso/libaccounts-glib/merge_requests/3 ---- libaccounts-glib/ag-manager.c -+++ libaccounts-glib/ag-manager.c -@@ -490,7 +490,7 @@ static void - set_error_from_db (AgManager *manager) - { - AgManagerPrivate *priv = manager->priv; -- AgError code; -+ AgAccountsError code; - GError *error; - - switch (sqlite3_errcode (priv->db)) Property changes on: head/net-im/libaccounts-glib/files/patch-libaccounts-glib_ag-manager.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net-im/libaccounts-glib/Makefile =================================================================== --- head/net-im/libaccounts-glib/Makefile (revision 412744) +++ head/net-im/libaccounts-glib/Makefile (revision 412745) @@ -1,38 +1,37 @@ # Created by: Tobias C. Berner # $FreeBSD$ PORTNAME= libaccounts-glib -PORTVERSION= 1.18 -PORTREVISION= 1 +PORTVERSION= 1.21 CATEGORIES= net-im -MASTER_SITES= https://drive.google.com/uc?export=download&id=0B8fX9XOwH_g4U1NzNmg0cWoxNGM&dummy= \ +MASTER_SITES= https://gitlab.com/${GL_ACCOUNT}/${GL_PROJECT}/repository/archive${EXTRACT_SUFX}?ref=VERSION_${GL_TAGNAME}#/ \ LOCAL/rakuco +DISTNAME= ${GL_PROJECT}-VERSION_${GL_TAGNAME}-${GL_COMMIT} MAINTAINER= kde@FreeBSD.org COMMENT= Accounts and SSO framework for Linux and POSIX based platforms LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ - libsqlite3.so:databases/sqlite3 +BUILD_DEPENDS= gtkdocize:textproc/gtk-doc +LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib -FETCH_BEFORE_ARGS= -o ${DISTFILES} - GNU_CONFIGURE= YES -# The line below is a hack required when the port is configure either without -# devel/libcheck installed or with --disable-tests. -# A proper fix has been submitted upstream: -# https://gitlab.com/accounts-sso/libaccounts-glib/merge_requests/1 -CONFIGURE_ENV= HAVE_GCOV_FALSE='\#' -CONFIGURE_ARGS= --disable-tests +CONFIGURE_ARGS= --disable-tests --enable-gtk-doc INSTALL_TARGET= install-strip -USES= gmake libtool pathfix pkgconfig python +USES= autoreconf gmake libtool pathfix pkgconfig python sqlite:3 USE_GNOME= pygobject3 introspection libxml2 +PATHFIX_MAKEFILEIN=Makefile.am -post-patch: - @${REINPLACE_CMD} -e 's|-Werror||g' \ - ${WRKSRC}/libaccounts-glib/Makefile.in +# GitLab variables. +GL_ACCOUNT= accounts-sso +GL_PROJECT= ${PORTNAME} +GL_TAGNAME= ${PORTVERSION} +GL_COMMIT= 00254a604a7c7bd38c41794a80ad8930e90f21aa + +pre-configure: + cd ${WRKSRC} && gtkdocize --copy --flavour no-tmpl .include Index: head/net-im/libaccounts-glib/distinfo =================================================================== --- head/net-im/libaccounts-glib/distinfo (revision 412744) +++ head/net-im/libaccounts-glib/distinfo (revision 412745) @@ -1,2 +1,2 @@ -SHA256 (libaccounts-glib-1.18.tar.gz) = 7aab9ec2ba3ae2548125f4bb330ed433e8066c672e32101a339cbb7f4657ff56 -SIZE (libaccounts-glib-1.18.tar.gz) = 579435 +SHA256 (libaccounts-glib-VERSION_1.21-00254a604a7c7bd38c41794a80ad8930e90f21aa.tar.gz) = 27cb75f3f2f0ce736b77f0fd0432f8d565297f0735846a2862577eadaec92488 +SIZE (libaccounts-glib-VERSION_1.21-00254a604a7c7bd38c41794a80ad8930e90f21aa.tar.gz) = 127061 Index: head/net-im/libaccounts-glib/pkg-plist =================================================================== --- head/net-im/libaccounts-glib/pkg-plist (revision 412744) +++ head/net-im/libaccounts-glib/pkg-plist (revision 412745) @@ -1,75 +1,75 @@ bin/ag-backup bin/ag-tool include/libaccounts-glib/accounts-glib.h 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-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 lib/girepository-1.0/Accounts-1.0.typelib lib/libaccounts-glib.so lib/libaccounts-glib.so.0 lib/libaccounts-glib.so.0.1.3 -libdata/pkgconfig/libaccounts-glib.pc %%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/gir-1.0/Accounts-1.0.gir share/gtk-doc/html/libaccounts-glib/AgAccount.html share/gtk-doc/html/libaccounts-glib/AgAccountService.html share/gtk-doc/html/libaccounts-glib/AgApplication.html share/gtk-doc/html/libaccounts-glib/AgAuthData.html share/gtk-doc/html/libaccounts-glib/AgManager.html share/gtk-doc/html/libaccounts-glib/AgProvider.html share/gtk-doc/html/libaccounts-glib/AgService.html share/gtk-doc/html/libaccounts-glib/AgServiceType.html share/gtk-doc/html/libaccounts-glib/account-management.html share/gtk-doc/html/libaccounts-glib/ag-backup.html share/gtk-doc/html/libaccounts-glib/ag-tool.html share/gtk-doc/html/libaccounts-glib/annotation-glossary.html share/gtk-doc/html/libaccounts-glib/api-index-1-1.html share/gtk-doc/html/libaccounts-glib/api-index-1-2.html share/gtk-doc/html/libaccounts-glib/api-index-1-4.html share/gtk-doc/html/libaccounts-glib/api-index-1-5.html share/gtk-doc/html/libaccounts-glib/api-index-deprecated.html share/gtk-doc/html/libaccounts-glib/api-index-full.html share/gtk-doc/html/libaccounts-glib/appendices.html share/gtk-doc/html/libaccounts-glib/gettext-xml-files.html share/gtk-doc/html/libaccounts-glib/glossary.html share/gtk-doc/html/libaccounts-glib/home.png share/gtk-doc/html/libaccounts-glib/index.html share/gtk-doc/html/libaccounts-glib/index.sgml share/gtk-doc/html/libaccounts-glib/left-insensitive.png share/gtk-doc/html/libaccounts-glib/left.png share/gtk-doc/html/libaccounts-glib/libaccounts-compiling.html share/gtk-doc/html/libaccounts-glib/libaccounts-glib-objects.html share/gtk-doc/html/libaccounts-glib/libaccounts-glib-overview.html share/gtk-doc/html/libaccounts-glib/libaccounts-glib-tools.html share/gtk-doc/html/libaccounts-glib/libaccounts-glib.devhelp2 share/gtk-doc/html/libaccounts-glib/libaccounts-overview.html share/gtk-doc/html/libaccounts-glib/libaccounts-running.html share/gtk-doc/html/libaccounts-glib/object-tree.html share/gtk-doc/html/libaccounts-glib/provider-file-format.html share/gtk-doc/html/libaccounts-glib/right-insensitive.png share/gtk-doc/html/libaccounts-glib/right.png share/gtk-doc/html/libaccounts-glib/service-file-format.html share/gtk-doc/html/libaccounts-glib/service-type-file-format.html share/gtk-doc/html/libaccounts-glib/style.css share/gtk-doc/html/libaccounts-glib/up-insensitive.png share/gtk-doc/html/libaccounts-glib/up.png share/gtk-doc/html/libaccounts-glib/validating-xml-files.html share/gtk-doc/html/libaccounts-glib/xml-file-formats.html share/gtk-doc/html/libaccounts-glib/xml-files.html share/vala/vapi/libaccounts-glib.deps share/vala/vapi/libaccounts-glib.vapi share/xml/accounts/schema/dtd/accounts-application.dtd share/xml/accounts/schema/dtd/accounts-provider.dtd share/xml/accounts/schema/dtd/accounts-service-type.dtd share/xml/accounts/schema/dtd/accounts-service.dtd