The e-calendar-factory process did not terminate automatically

when the user logged out of the graphical desktop environment, and
e-calendar-factory thus redundantly consumed system resources.
(https://bugzilla.redhat.com/show_bug.cgi?id=1141760 and upstream
https://bugzilla.gnome.org/show_bug.cgi?id=646117)

bump PKGREVISION

6 files changed, 82 insertions, 7 deletions

diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 59dec71a654..d7d739ae0f0 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.154 2015/10/10 01:57:53 ryoon Exp $
+# $NetBSD: Makefile,v 1.155 2016/01/31 07:01:55 richard Exp $
 
 DISTNAME=	evolution-data-server-2.32.3
-PKGREVISION=	37
+PKGREVISION=	38
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-data-server/2.32/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/mail/evolution-data-server/distinfo b/mail/evolution-data-server/distinfo
index b1de8bdd328..e820d144316 100644
--- a/mail/evolution-data-server/distinfo
+++ b/mail/evolution-data-server/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.84 2015/11/03 23:27:04 agc Exp $
+$NetBSD: distinfo,v 1.85 2016/01/31 07:01:55 richard Exp $
 
 SHA1 (evolution-data-server-2.32.3.tar.bz2) = cbf32c3438c4f1650b35b87007a337ebc1c56cec
 RMD160 (evolution-data-server-2.32.3.tar.bz2) = adc8b07aef41a89d16fc426541c12190a3688b8f
@@ -6,9 +6,11 @@ SHA512 (evolution-data-server-2.32.3.tar.bz2) = 863ccea7717a7fe743155513e74fc8ea
 Size (evolution-data-server-2.32.3.tar.bz2) = 4322281 bytes
 SHA1 (patch-aa) = 117f3ce1f2c948cae502486afdb62078e952afc0
 SHA1 (patch-ab) = fd27fd0a521899be568c843b24d9b6eeeb99a2bb
+SHA1 (patch-addressbook_libebook_e-book.c) = ac32dc97eb0a66bf0c912d384655fdde47d178ee
 SHA1 (patch-bd) = 8df85b9ab7ae71558fb939565e944b614de628bb
 SHA1 (patch-ca) = e879d29105997045e1293fe627ec55a05e5ba88d
 SHA1 (patch-calendar_backends_caldav_e-cal-backend-caldav.c) = 756ce60a8b684369bf7b0c14f2f52e735253c381
+SHA1 (patch-calendar_libecal_e-cal.c) = 0478b795b298bbab23db39f7a63bd3529691dd95
 SHA1 (patch-calendar_libedata-cal_e-cal-backend-intervaltree.c) = af78b5854666325a9dd1229702968c093805ec03
 SHA1 (patch-calendar_libegdbus_Makefile.in) = ac5aabae5160967c498f12c0f29be3e206e03622
 SHA1 (patch-cc) = a59bbc664a96f467888cae89cb00eb9a9033a925
@@ -16,7 +18,7 @@ SHA1 (patch-cd) = 6e366e65e68cd0c5a8eafa67c7f9152c6521de12
 SHA1 (patch-ce) = 1da2a3773ff89319bc79bbb7375e8259f0be89e4
 SHA1 (patch-cg) = ef8059123df8b774b75549e0cbb46d2976ed6aff
 SHA1 (patch-e_data_book_c) = b52f6f50cc19794b2acb9df401bc34eaf8ea7ec7
-SHA1 (patch-e_data_book_factory_c) = 889cc05bb7fb1656b7f770ce8caee2a6f14c061c
-SHA1 (patch-e_data_cal_factory_c) = 73d811a3a1b4881e0391ff2b81ad11f916ca1b8e
+SHA1 (patch-e_data_book_factory_c) = 263be8ddce6883293f68be0d90ca4c7e1afa6aca
+SHA1 (patch-e_data_cal_factory_c) = 0aad627e34d186e987884bab5259ab8859ae3f3e
 SHA1 (patch-e_data_server_util_c) = fb7d01a036883b22e51a11082ae15e3fe81d81f0
 SHA1 (patch-libedataserver_e-categories_c) = f4045926c8bfd7b6dd0f5905825dd4ece7c09ad1
diff --git a/mail/evolution-data-server/patches/patch-addressbook_libebook_e-book.c b/mail/evolution-data-server/patches/patch-addressbook_libebook_e-book.c
new file mode 100644
index 00000000000..c4dca80aad0
--- /dev/null
+++ b/mail/evolution-data-server/patches/patch-addressbook_libebook_e-book.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-addressbook_libebook_e-book.c,v 1.1 2016/01/31 07:01:55 richard Exp $
+
+The e-calendar-factory process did not terminate automatically
+when the user logged out of the graphical desktop environment, and
+e-calendar-factory thus redundantly consumed system resources.
+(https://bugzilla.redhat.com/show_bug.cgi?id=1141760 and upstream
+ https://bugzilla.gnome.org/show_bug.cgi?id=646117)
+
+--- addressbook/libebook/e-book.c.orig	2011-04-21 19:35:35.000000000 +0000
++++ addressbook/libebook/e-book.c
+@@ -333,7 +333,6 @@ e_book_activate (GError **error)
+ 	}
+ 
+ 	connection = g_dbus_proxy_get_connection (G_DBUS_PROXY (book_factory_proxy));
+-	g_dbus_connection_set_exit_on_close (connection, FALSE);
+ 	book_connection_closed_id = g_dbus_connection_signal_subscribe (connection,
+ 		NULL,						/* sender */
+ 		"org.freedesktop.DBus",				/* interface */
diff --git a/mail/evolution-data-server/patches/patch-calendar_libecal_e-cal.c b/mail/evolution-data-server/patches/patch-calendar_libecal_e-cal.c
new file mode 100644
index 00000000000..8afacd30078
--- /dev/null
+++ b/mail/evolution-data-server/patches/patch-calendar_libecal_e-cal.c
@@ -0,0 +1,18 @@
+$NetBSD: patch-calendar_libecal_e-cal.c,v 1.1 2016/01/31 07:01:55 richard Exp $
+
+The e-calendar-factory process did not terminate automatically
+when the user logged out of the graphical desktop environment, and
+e-calendar-factory thus redundantly consumed system resources.
+(https://bugzilla.redhat.com/show_bug.cgi?id=1141760 and upstream
+ https://bugzilla.gnome.org/show_bug.cgi?id=646117)
+
+--- calendar/libecal/e-cal.c.orig	2011-04-21 19:36:35.000000000 +0000
++++ calendar/libecal/e-cal.c
+@@ -709,7 +709,6 @@ e_cal_activate (GError **error)
+ 	}
+ 
+ 	connection = g_dbus_proxy_get_connection (G_DBUS_PROXY (cal_factory_proxy));
+-	g_dbus_connection_set_exit_on_close (connection, FALSE);
+ 	cal_connection_closed_id = g_dbus_connection_signal_subscribe (connection,
+ 		NULL,						/* sender */
+ 		"org.freedesktop.DBus",				/* interface */
diff --git a/mail/evolution-data-server/patches/patch-e_data_book_factory_c b/mail/evolution-data-server/patches/patch-e_data_book_factory_c
index 4748fe8ecbc..1a9be280159 100644
--- a/mail/evolution-data-server/patches/patch-e_data_book_factory_c
+++ b/mail/evolution-data-server/patches/patch-e_data_book_factory_c
@@ -1,8 +1,14 @@
-$NetBSD: patch-e_data_book_factory_c,v 1.1 2012/02/06 10:44:43 drochner Exp $
+$NetBSD: patch-e_data_book_factory_c,v 1.2 2016/01/31 07:01:55 richard Exp $
 
 Replace deprecated g_atomic_int_exchange_and_add()
 1886d3d0573388aa5c13af99f714687ba6a66ec6
 
+The e-calendar-factory process did not terminate automatically
+when the user logged out of the graphical desktop environment, and
+e-calendar-factory thus redundantly consumed system resources.
+(https://bugzilla.redhat.com/show_bug.cgi?id=1141760 and upstream
+https://bugzilla.gnome.org/show_bug.cgi?id=646117)
+
 --- addressbook/libedata-book/e-data-book-factory.c.orig	2011-04-21 19:36:35.000000000 +0000
 +++ addressbook/libedata-book/e-data-book-factory.c
 @@ -229,7 +229,7 @@ construct_book_factory_path (void)
@@ -14,3 +20,15 @@ Replace deprecated g_atomic_int_exchange_and_add()
  }
  
  static gboolean
+@@ -569,6 +569,11 @@ on_name_lost (GDBusConnection *connectio
+ 	}
+ 
+ 	g_mutex_unlock (factory->priv->connections_lock);
++	if (g_strcmp0 (name, E_DATA_BOOK_FACTORY_SERVICE_NAME) == 0) {
++		g_print ("Quitting on the D-Bus name lost...\n");
++		g_main_loop_quit (loop);
++	}
++ 
+ }
+ 
+ gint
diff --git a/mail/evolution-data-server/patches/patch-e_data_cal_factory_c b/mail/evolution-data-server/patches/patch-e_data_cal_factory_c
index 690c1963da0..4c0fdd773fc 100644
--- a/mail/evolution-data-server/patches/patch-e_data_cal_factory_c
+++ b/mail/evolution-data-server/patches/patch-e_data_cal_factory_c
@@ -1,8 +1,14 @@
-$NetBSD: patch-e_data_cal_factory_c,v 1.1 2012/02/06 10:44:44 drochner Exp $
+$NetBSD: patch-e_data_cal_factory_c,v 1.2 2016/01/31 07:01:55 richard Exp $
 
 Replace deprecated g_atomic_int_exchange_and_add()
 1886d3d0573388aa5c13af99f714687ba6a66ec6
 
+The e-calendar-factory process did not terminate automatically
+when the user logged out of the graphical desktop environment, and
+e-calendar-factory thus redundantly consumed system resources.
+(https://bugzilla.redhat.com/show_bug.cgi?id=1141760 and upstream
+https://bugzilla.gnome.org/show_bug.cgi?id=646117)
+
 --- calendar/libedata-cal/e-data-cal-factory.c.orig	2011-04-21 19:36:35.000000000 +0000
 +++ calendar/libedata-cal/e-data-cal-factory.c
 @@ -245,7 +245,7 @@ construct_cal_factory_path (void)
@@ -14,3 +20,16 @@ Replace deprecated g_atomic_int_exchange_and_add()
  }
  
  static gboolean
+@@ -863,6 +863,12 @@ on_name_lost (GDBusConnection *connectio
+ 		g_list_foreach (copy, remove_data_cal_cb, NULL);
+ 		g_list_free (copy);
+ 	}
++
++	if (g_strcmp0 (name, E_DATA_CAL_FACTORY_SERVICE_NAME) == 0) {
++		g_print ("Quitting on the D-Bus name lost...\n");
++		g_main_loop_quit (loop);
++	}
++ 
+ }
+ 
+ gint