Update to evolution-data-server-3.8.0.

databases/evolution-data-server/Makefile

@@ -1,27 +1,22 @@
-# $OpenBSD: Makefile,v 1.133 2013/03/11 02:52:05 espie Exp $
+# $OpenBSD: Makefile,v 1.134 2013/03/29 15:17:01 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		unified backend for PIM programs
 
 GNOME_PROJECT=		evolution-data-server
-GNOME_VERSION=		3.6.4
+GNOME_VERSION=		3.8.0
-REVISION=		0
-
-# Only get the first x.y which is needed in the PLIST.
-R=			${GNOME_VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-SUBST_VARS=		R
 
 CATEGORIES=		databases productivity
 
-SHARED_LIBS +=  camel-1.2            34.0     # 40.0
+SHARED_LIBS +=  camel-1.2            35.0     # 43.0
 SHARED_LIBS +=  edataserver-1.2      17.0     # 17.0
-SHARED_LIBS +=  ebackend-1.2         3.0      # 5.0
+SHARED_LIBS +=  ebackend-1.2         4.0      # 6.0
-SHARED_LIBS +=  ebook-1.2            17.0     # 17.1
+SHARED_LIBS +=  ebook-contacts-1.2   0.0      # 0.0
-SHARED_LIBS +=  edata-book-1.2       14.0     # 15.0
+SHARED_LIBS +=  edata-book-1.2       15.0     # 17.0
+SHARED_LIBS +=  ebook-1.2            18.0     # 17.1
 SHARED_LIBS +=  ecal-1.2             14.0     # 15.0
-SHARED_LIBS +=  edata-cal-1.2        16.0     # 18.0
+SHARED_LIBS +=  edata-cal-1.2        17.0     # 20.
-SHARED_LIBS +=  edataserverui-3.0    2.0      # 4.0
 
 HOMEPAGE=	http://www.gnome.org/projects/evolution/
 
@@ -43,7 +38,7 @@ WANTLIB += krb5 lber-2.4 ldap-2.4 m nspr4 nss3 nssutil3 oauth
 WANTLIB += p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
 WANTLIB += pixman-1 plc4 plds4 png pthread pthread-stubs sasl2
 WANTLIB += smime3 softokn3 soup-2.4 soup-gnome-2.4 sqlite3 ssl
-WANTLIB += ssl3 xcb xcb-render xcb-shm xml2 z
+WANTLIB += ssl3 xcb xcb-render xcb-shm xml2 z graphite2 secret-1
 
 MODULES=		devel/gettext \
 			devel/dconf \
@@ -77,6 +72,9 @@ CONFIGURE_ARGS=		--with-krb5 \
 			--with-libdb=${LOCALBASE} \
 			--with-openldap=${LOCALBASE}
 
+# XXX needs signond, libsignon-glib
+CONFIGURE_ARGS +=	--disable-uoa
+
 pre-configure:
 	perl -pi -e 's,/usr/sbin/imapd,${LOCALBASE}/libexec/imapd,g' \
 		${WRKSRC}/camel/camel-imapx-settings.c \

databases/evolution-data-server/distinfo

@@ -1,2 +1,2 @@
-SHA256 (evolution-data-server-3.6.4.tar.xz) = ULTKIbxX0v5JM+owcr8R1eYGnQ7KrM7QvQ9V8JjQn04=
+SHA256 (evolution-data-server-3.8.0.tar.xz) = //fcoCq8UsqmLdvZOpE1wV2j8hw2wld08zmft6bB1B4=
-SIZE (evolution-data-server-3.6.4.tar.xz) = 4079620
+SIZE (evolution-data-server-3.8.0.tar.xz) = 3898836

databases/evolution-data-server/patches/patch-addressbook_backends_file_e-book-backend-file_c

@@ -1,10 +1,10 @@
-$OpenBSD: patch-addressbook_backends_file_e-book-backend-file_c,v 1.18 2013/01/22 06:29:55 ajacoutot Exp $
+$OpenBSD: patch-addressbook_backends_file_e-book-backend-file_c,v 1.19 2013/03/29 15:17:01 ajacoutot Exp $
 
 XXX remove when we have a 64-bit time_t
 
---- addressbook/backends/file/e-book-backend-file.c.orig	Sat Jan 19 18:35:45 2013
+--- addressbook/backends/file/e-book-backend-file.c.orig	Sun Mar 17 13:46:02 2013
-+++ addressbook/backends/file/e-book-backend-file.c	Tue Jan 22 07:02:16 2013
++++ addressbook/backends/file/e-book-backend-file.c	Fri Mar 29 13:32:31 2013
-@@ -765,7 +765,7 @@ e_book_backend_file_create_unique_id (void)
+@@ -601,7 +601,7 @@ e_book_backend_file_create_unique_id (void)
  	 * it's doubtful 2^32 id's will be created in a second, so we
  	 * should be okay. */
  	static guint c = 0;

databases/evolution-data-server/patches/patch-addressbook_backends_ldap_e-book-backend-ldap_c

@@ -1,10 +1,10 @@
-$OpenBSD: patch-addressbook_backends_ldap_e-book-backend-ldap_c,v 1.13 2013/03/07 08:18:20 ajacoutot Exp $
+$OpenBSD: patch-addressbook_backends_ldap_e-book-backend-ldap_c,v 1.14 2013/03/29 15:17:01 ajacoutot Exp $
 
 XXX remove when we have a 64-bit time_t
 
---- addressbook/backends/ldap/e-book-backend-ldap.c.orig	Tue Feb 26 15:58:36 2013
+--- addressbook/backends/ldap/e-book-backend-ldap.c.orig	Sun Mar 17 13:46:02 2013
-+++ addressbook/backends/ldap/e-book-backend-ldap.c	Thu Mar  7 08:47:07 2013
++++ addressbook/backends/ldap/e-book-backend-ldap.c	Fri Mar 29 13:32:31 2013
-@@ -1276,11 +1276,11 @@ create_dn_from_contact (EContact *contact,
+@@ -1255,11 +1255,11 @@ create_dn_from_contact (EContact *contact,
  	}
  
  	dn = g_strdup_printf (

databases/evolution-data-server/patches/patch-addressbook_backends_vcf_e-book-backend-vcf_c

@@ -1,15 +0,0 @@
-$OpenBSD: patch-addressbook_backends_vcf_e-book-backend-vcf_c,v 1.9 2012/10/18 13:54:56 ajacoutot Exp $
-
-XXX remove when we have a 64-bit time_t
-
---- addressbook/backends/vcf/e-book-backend-vcf.c.orig	Fri Sep 28 07:55:26 2012
-+++ addressbook/backends/vcf/e-book-backend-vcf.c	Fri Sep 28 07:55:42 2012
-@@ -75,7 +75,7 @@ e_book_backend_vcf_create_unique_id (void)
- 	 * it's doubtful 2^32 id's will be created in a second, so we
- 	 * should be okay. */
- 	static guint c = 0;
--	return g_strdup_printf (PAS_ID_PREFIX "%08lX%08X", time (NULL), c++);
-+	return g_strdup_printf (PAS_ID_PREFIX "%08lX%08X", (long)time (NULL), c++);
- }
- 
- static void

databases/evolution-data-server/patches/patch-addressbook_libebook-contacts_e-book-query_c

@@ -0,0 +1,18 @@
+$OpenBSD: patch-addressbook_libebook-contacts_e-book-query_c,v 1.1 2013/03/29 15:17:01 ajacoutot Exp $
+
+XXX fix and push upstream
+
+--- addressbook/libebook-contacts/e-book-query.c.orig	Fri Mar 29 14:38:02 2013
++++ addressbook/libebook-contacts/e-book-query.c	Fri Mar 29 14:39:13 2013
+@@ -200,8 +200,11 @@ e_book_query_not (EBookQuery *q,
+ static const gchar *
+ address_locale (void)
+ {
++#if 0
+ 	const gchar *locale = setlocale (LC_ADDRESS, NULL);
++#endif
+ 
++	const gchar *locale = NULL;
+ 	if (locale == NULL || strcmp (locale, "C") == 0)
+ 		locale = setlocale (LC_MESSAGES, NULL);
+ 

databases/evolution-data-server/patches/patch-addressbook_libedata-book_e-data-book-factory_c

@@ -1,14 +0,0 @@
-$OpenBSD: patch-addressbook_libedata-book_e-data-book-factory_c,v 1.1 2012/11/10 08:07:55 ajacoutot Exp $
-
-Remove on update, fixed upstream (rewritten).
-
---- addressbook/libedata-book/e-data-book-factory.c.orig	Sat Nov 10 08:19:50 2012
-+++ addressbook/libedata-book/e-data-book-factory.c	Sat Nov 10 08:20:33 2012
-@@ -357,6 +357,7 @@ impl_BookFactory_get_book (EGdbusBookFactory *object,
- 	book_backend_factory_match_goa_object (factory, backend);
- #endif
- 
-+	g_mutex_lock (priv->books_lock);
- 	path = construct_book_factory_path ();
- 	book = e_data_book_new (E_BOOK_BACKEND (backend));
- 	g_hash_table_insert (priv->books, g_strdup (path), book);

databases/evolution-data-server/patches/patch-calendar_libedata-cal_e-cal-backend-intervaltree_c

@@ -1,12 +1,12 @@
-$OpenBSD: patch-calendar_libedata-cal_e-cal-backend-intervaltree_c,v 1.9 2012/11/11 18:10:01 ajacoutot Exp $
+$OpenBSD: patch-calendar_libedata-cal_e-cal-backend-intervaltree_c,v 1.10 2013/03/29 15:17:01 ajacoutot Exp $
 
 XXX remove when we have a 64-bit time_t
 
---- calendar/libedata-cal/e-cal-backend-intervaltree.c.orig	Sun Oct 21 03:22:29 2012
+--- calendar/libedata-cal/e-cal-backend-intervaltree.c.orig	Sun Mar 17 13:46:02 2013
-+++ calendar/libedata-cal/e-cal-backend-intervaltree.c	Sun Nov 11 18:46:32 2012
++++ calendar/libedata-cal/e-cal-backend-intervaltree.c	Fri Mar 29 13:32:31 2013
-@@ -614,8 +614,8 @@ e_intervaltree_node_dump (EIntervalTree *tree,
+@@ -761,8 +761,8 @@ e_intervaltree_node_dump (EIntervalTree *tree,
- 	EIntervalTreePrivate *priv = tree->priv;
+ 	*/
- 	if (node != priv->nil) {
+ 	if (node != tree->priv->nil) {
  		g_print (
 -			"%*s[%ld - %ld] [%ld - %ld] red %d\n", indent, "", node->start,
 -			node->end, node->min, node->max, node->red);

databases/evolution-data-server/patches/patch-camel_providers_local_camel-maildir-summary_c

@@ -1,10 +1,10 @@
-$OpenBSD: patch-camel_providers_local_camel-maildir-summary_c,v 1.10 2012/10/18 13:54:56 ajacoutot Exp $
+$OpenBSD: patch-camel_providers_local_camel-maildir-summary_c,v 1.11 2013/03/29 15:17:01 ajacoutot Exp $
 
 XXX remove when we have a 64-bit time_t
 
---- camel/providers/local/camel-maildir-summary.c.orig	Fri Sep 28 07:53:03 2012
+--- camel/providers/local/camel-maildir-summary.c.orig	Sun Mar 17 13:46:02 2013
-+++ camel/providers/local/camel-maildir-summary.c	Fri Sep 28 07:53:37 2012
++++ camel/providers/local/camel-maildir-summary.c	Fri Mar 29 13:32:31 2013
-@@ -395,7 +395,7 @@ static gchar *maildir_summary_next_uid_string (CamelFo
+@@ -419,7 +419,7 @@ static gchar *maildir_summary_next_uid_string (CamelFo
  				g_free (uid);
  				g_usleep (2 * G_USEC_PER_SEC);
  			}

databases/evolution-data-server/patches/patch-tests_libebook-contacts_test-phone-number_c

@@ -0,0 +1,26 @@
+$OpenBSD: patch-tests_libebook-contacts_test-phone-number_c,v 1.1 2013/03/29 15:17:01 ajacoutot Exp $
+
+XXX fix and push upstream
+
+--- tests/libebook-contacts/test-phone-number.c.orig	Fri Mar 29 15:50:05 2013
++++ tests/libebook-contacts/test-phone-number.c	Fri Mar 29 15:41:25 2013
+@@ -342,7 +342,9 @@ test_country_code_for_region (void)
+ 	GError *error = NULL;
+ 	gint code;
+ 
++#if 0
+ 	g_assert_cmpstr (setlocale (LC_ADDRESS, NULL), ==, "en_US.UTF-8");
++#endif
+ 
+ #ifdef ENABLE_PHONENUMBER
+ 
+@@ -381,7 +383,9 @@ test_default_region (void)
+ 	GError *error = NULL;
+ 	gchar *country;
+ 
++#if 0
+ 	g_assert_cmpstr (setlocale (LC_ADDRESS, NULL), ==, "en_US.UTF-8");
++#endif
+ 	country = e_phone_number_get_default_region (&error);
+ 
+ #ifdef ENABLE_PHONENUMBER

databases/evolution-data-server/patches/patch-tests_libebook-contacts_test-query_c

@@ -0,0 +1,46 @@
+$OpenBSD: patch-tests_libebook-contacts_test-query_c,v 1.1 2013/03/29 15:17:01 ajacoutot Exp $
+
+XXX fix and push upstream
+
+--- tests/libebook-contacts/test-query.c.orig	Fri Mar 29 15:50:21 2013
++++ tests/libebook-contacts/test-query.c	Fri Mar 29 15:37:22 2013
+@@ -37,7 +37,9 @@ test_query (gconstpointer data)
+ 	EBookQuery *query;
+ 	gchar *sexp;
+ 
++#if 0
+ 	setlocale (LC_ADDRESS, test->locale);
++#endif
+ 	sexp = e_book_query_to_string (test->query);
+ 	normalize_space (sexp);
+ 
+@@ -74,7 +76,9 @@ add_query_test (const gchar *path,
+ {
+ 	TestData *data = g_slice_new (TestData);
+ 
++#if 0
+ 	data->locale = g_strdup (setlocale (LC_ADDRESS, NULL));
++#endif
+ 	data->sexp = g_strdup (sexp);
+ 	data->query = query;
+ 
+@@ -89,7 +93,9 @@ main (gint argc,
+ 
+ 	g_test_init (&argc, &argv, NULL);
+ 
++#if 0
+ 	setlocale (LC_ADDRESS, "en_US.UTF-8");
++#endif
+ 
+ 	add_query_test (
+ 		"/libebook/test-query/sexp/all",
+@@ -186,7 +192,9 @@ main (gint argc,
+ 		" (eqphone_short \"phone\" \"5423789\" \"en_US.UTF-8\")"
+ 		" )");
+ 
++#if 0
+ 	setlocale (LC_ADDRESS, "en_GB.UTF-8");
++#endif
+ 
+ 	add_query_test (
+ 		"/libebook/test-query/sexp/eqphone/gb",

databases/evolution-data-server/patches/patch-tests_libebook_client_test-client-custom-summary_c

@@ -0,0 +1,16 @@
+$OpenBSD: patch-tests_libebook_client_test-client-custom-summary_c,v 1.1 2013/03/29 15:17:01 ajacoutot Exp $
+
+XXX fix and push upstream
+
+--- tests/libebook/client/test-client-custom-summary.c.orig	Fri Mar 29 14:38:08 2013
++++ tests/libebook/client/test-client-custom-summary.c	Fri Mar 29 14:39:26 2013
+@@ -342,7 +342,9 @@ main (gint argc,
+ 	g_setenv ("LC_ALL", "en_US.UTF-8", TRUE);
+ 	setlocale (LC_ALL, "");
+ 
++#if 0
+ 	g_assert_cmpstr (setlocale (LC_ADDRESS, NULL), ==, "en_US.UTF-8");
++#endif
+ 
+ 	/* Test all queries in 8 different combinations specified by the 'suites'
+ 	 */

databases/evolution-data-server/patches/patch-tests_test-server-utils_e-test-server-utils_c

@@ -0,0 +1,15 @@
+$OpenBSD: patch-tests_test-server-utils_e-test-server-utils_c,v 1.1 2013/03/29 15:17:01 ajacoutot Exp $
+
+https://bugzilla.gnome.org/show_bug.cgi?id=696858
+
+--- tests/test-server-utils/e-test-server-utils.c.orig	Fri Mar 29 15:21:12 2013
++++ tests/test-server-utils/e-test-server-utils.c	Fri Mar 29 15:20:51 2013
+@@ -22,6 +22,8 @@
+ 
+ #include "e-test-server-utils.h"
+ 
++#include <sys/wait.h>
++
+ #define ADDRESS_BOOK_SOURCE_UID "test-address-book"
+ #define CALENDAR_SOURCE_UID     "test-calendar"
+