From 7d49d7fea2b1e514731f8c3bc5ea8659ceb7ecdb Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sat, 30 Aug 2014 07:22:56 +0000
Subject: [PATCH] Update to libaccounts-glib-1.16.

---
 net/libaccounts-glib/Makefile                 | 31 +++++++++----------
 net/libaccounts-glib/distinfo                 |  4 +--
 .../patch-libaccounts-glib_ag-provider_c      | 15 +++++++++
 net/libaccounts-glib/pkg/PLIST                |  9 ++++--
 4 files changed, 38 insertions(+), 21 deletions(-)
 create mode 100644 net/libaccounts-glib/patches/patch-libaccounts-glib_ag-provider_c

diff --git a/net/libaccounts-glib/Makefile b/net/libaccounts-glib/Makefile
index 677ff9a5459..33eff2e503e 100644
--- a/net/libaccounts-glib/Makefile
+++ b/net/libaccounts-glib/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.4 2013/04/16 10:21:58 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2014/08/30 07:22:56 ajacoutot Exp $
 
 COMMENT=	accounts management library for GLib applications
 
-DISTNAME=	libaccounts-glib-1.8
-REVISION=	1
+DISTNAME=	libaccounts-glib-1.16
 
-SHARED_LIBS +=	accounts-glib        0.0      # 1.3
+SHARED_LIBS +=	accounts-glib        1.0      # 1.3
 
 CATEGORIES=	net
 
@@ -17,28 +16,28 @@ HOMEPAGE=	https://accounts-sso.googlecode.com/
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM=Yes
 
+WANTLIB += c ffi gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 m pcre
+WANTLIB += pthread sqlite3 xml2 z
+
 MASTER_SITES=	${HOMEPAGE}/files/
 
 MODULES=	devel/gettext \
-		lang/python
+		lang/python \
+		x11/gnome
 
-WANTLIB += c gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 m pcre pthread
-WANTLIB += sqlite3 xml2 z ffi
-
-BUILD_DEPENDS=	devel/gobject-introspection \
-		devel/py-gobject3 \
-		lang/vala \
-		textproc/docbook-xsl
+BUILD_DEPENDS=	devel/py-gobject3
 RUN_DEPENDS=	devel/py-gobject3
 LIB_DEPENDS=	textproc/libxml
-TEST_DEPENDS=	devel/check
+
+MODGNOME_TOOLS=	docbook gobject-introspection
 
 USE_GMAKE=Yes
 
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
-		--enable-introspection
+CONFIGURE_ARGS=	--disable-gcov \
+		--disable-tests
 
-TEST_IS_INTERACTIVE=x11
+# XXX check if still needed at next update
+CONFIGURE_ENV+=	HAVE_GCOV_FALSE='\#'
 
 .include <bsd.port.mk>
diff --git a/net/libaccounts-glib/distinfo b/net/libaccounts-glib/distinfo
index 1f453437b76..c0cac222605 100644
--- a/net/libaccounts-glib/distinfo
+++ b/net/libaccounts-glib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libaccounts-glib-1.8.tar.gz) = p9HqGsI0lGTrA5+agKy8Up0szRVPVF+zQP9ixXiE17w=
-SIZE (libaccounts-glib-1.8.tar.gz) = 544737
+SHA256 (libaccounts-glib-1.16.tar.gz) = ipQhRNeVohmrwOFQHLjZx3tyMByX7UwKO2Ru13Ka+0E=
+SIZE (libaccounts-glib-1.16.tar.gz) = 573257
diff --git a/net/libaccounts-glib/patches/patch-libaccounts-glib_ag-provider_c b/net/libaccounts-glib/patches/patch-libaccounts-glib_ag-provider_c
new file mode 100644
index 00000000000..aab168da849
--- /dev/null
+++ b/net/libaccounts-glib/patches/patch-libaccounts-glib_ag-provider_c
@@ -0,0 +1,15 @@
+$OpenBSD: patch-libaccounts-glib_ag-provider_c,v 1.1 2014/08/30 07:22:56 ajacoutot Exp $
+
+http://pkgs.fedoraproject.org/cgit/libaccounts-glib.git/tree/libaccounts-glib-1.16-build-with-werror.patch
+
+--- libaccounts-glib/ag-provider.c.orig	Sat Aug 30 09:14:55 2014
++++ libaccounts-glib/ag-provider.c	Sat Aug 30 09:15:02 2014
+@@ -441,7 +441,7 @@ ag_provider_get_plugin_name (AgProvider *provider)
+ gboolean
+ ag_provider_get_single_account (AgProvider *provider)
+ {
+-    g_return_val_if_fail (provider != NULL, NULL);
++    g_return_val_if_fail (provider != NULL, FALSE);
+     return provider->single_account;
+ }
+ 
diff --git a/net/libaccounts-glib/pkg/PLIST b/net/libaccounts-glib/pkg/PLIST
index 70f38647afb..1f0efc5d1c8 100644
--- a/net/libaccounts-glib/pkg/PLIST
+++ b/net/libaccounts-glib/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2013/03/29 13:42:59 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.4 2014/08/30 07:22:56 ajacoutot Exp $
 @bin bin/ag-backup
 @bin bin/ag-tool
 include/libaccounts-glib/
@@ -26,6 +26,9 @@ lib/python${MODPY_VERSION}/site-packages/gi/overrides/Accounts.pyo
 share/backup-framework/
 share/backup-framework/applications/
 share/backup-framework/applications/accounts.conf
+share/dbus-1/
+share/dbus-1/interfaces/
+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/
 share/gtk-doc/html/libaccounts-glib/AgAccount.html
@@ -72,8 +75,8 @@ share/gtk-doc/html/libaccounts-glib/xml-file-formats.html
 share/gtk-doc/html/libaccounts-glib/xml-files.html
 share/vala/
 share/vala/vapi/
-share/vala/vapi/accounts.deps
-share/vala/vapi/accounts.vapi
+share/vala/vapi/libaccounts-glib.deps
+share/vala/vapi/libaccounts-glib.vapi
 share/xml/
 share/xml/accounts/
 share/xml/accounts/schema/