pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

evolution-data-server: broken update to 3.18.4



Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Wed Jan 27 21:20:34 2016 +0200
Changeset:	43bcc58fae454788616c475e95073f56dc163e6c

Modified Files:
	evolution-data-server/Makefile
	evolution-data-server/distinfo
Added Files:
	evolution-data-server/TODO
Removed Files:
	evolution-data-server/patches/patch-aa
	evolution-data-server/patches/patch-ab
	evolution-data-server/patches/patch-ca
	evolution-data-server/patches/patch-calendar_backends_caldav_e-cal-backend-caldav.c
	evolution-data-server/patches/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c
	evolution-data-server/patches/patch-calendar_libegdbus_Makefile.in
	evolution-data-server/patches/patch-cc
	evolution-data-server/patches/patch-cd
	evolution-data-server/patches/patch-ce
	evolution-data-server/patches/patch-cg
	evolution-data-server/patches/patch-e_data_book_c
	evolution-data-server/patches/patch-e_data_book_factory_c
	evolution-data-server/patches/patch-e_data_cal_factory_c
	evolution-data-server/patches/patch-e_data_server_util_c
	evolution-data-server/patches/patch-libedataserver_e-categories_c

Log Message:
evolution-data-server: broken update to 3.18.4

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=43bcc58fae454788616c475e95073f56dc163e6c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 evolution-data-server/Makefile                     |  11 +-
 evolution-data-server/TODO                         |   1 +
 evolution-data-server/distinfo                     |  13 +--
 evolution-data-server/patches/patch-aa             |  16 ---
 evolution-data-server/patches/patch-ab             |  14 ---
 evolution-data-server/patches/patch-ca             |  58 -----------
 ...calendar_backends_caldav_e-cal-backend-caldav.c | 112 ---------------------
 ...endar_libedata-cal_e-cal-backend-intervaltree.c |  13 ---
 .../patches/patch-calendar_libegdbus_Makefile.in   |  14 ---
 evolution-data-server/patches/patch-cc             |  13 ---
 evolution-data-server/patches/patch-cd             |  13 ---
 evolution-data-server/patches/patch-ce             |  18 ----
 evolution-data-server/patches/patch-cg             |  13 ---
 evolution-data-server/patches/patch-e_data_book_c  |  16 ---
 .../patches/patch-e_data_book_factory_c            |  16 ---
 .../patches/patch-e_data_cal_factory_c             |  16 ---
 .../patches/patch-e_data_server_util_c             |  50 ---------
 .../patches/patch-libedataserver_e-categories_c    |  14 ---
 18 files changed, 12 insertions(+), 409 deletions(-)

diffs:
diff --git a/evolution-data-server/Makefile b/evolution-data-server/Makefile
index 59dec71..d548221 100644
--- a/evolution-data-server/Makefile
+++ b/evolution-data-server/Makefile
@@ -1,10 +1,9 @@
 # $NetBSD: Makefile,v 1.154 2015/10/10 01:57:53 ryoon Exp $
 
-DISTNAME=	evolution-data-server-2.32.3
-PKGREVISION=	37
+DISTNAME=	evolution-data-server-3.18.4
 CATEGORIES=	mail gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-data-server/2.32/}
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-data-server/3.18/}
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://www.gnome.org/projects/evolution/
@@ -63,6 +62,10 @@ BUILDLINK_TRANSFORM+=	l:db:${BDB_TYPE}
 BUILDLINK_TRANSFORM+=	rm:-ldl
 
 .include "../../devel/gperf/buildlink3.mk"
+.include "../../security/libgnome-keyring/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gtk3+=	gtk3+>=3.10
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
diff --git a/evolution-data-server/TODO b/evolution-data-server/TODO
new file mode 100644
index 0000000..57597f3
--- /dev/null
+++ b/evolution-data-server/TODO
@@ -0,0 +1 @@
+Add back old patches (malloc.h, etc)
diff --git a/evolution-data-server/distinfo b/evolution-data-server/distinfo
index b1de8bd..817a912 100644
--- a/evolution-data-server/distinfo
+++ b/evolution-data-server/distinfo
@@ -1,15 +1,10 @@
 $NetBSD: distinfo,v 1.84 2015/11/03 23:27:04 agc Exp $
 
-SHA1 (evolution-data-server-2.32.3.tar.bz2) = cbf32c3438c4f1650b35b87007a337ebc1c56cec
-RMD160 (evolution-data-server-2.32.3.tar.bz2) = adc8b07aef41a89d16fc426541c12190a3688b8f
-SHA512 (evolution-data-server-2.32.3.tar.bz2) = 863ccea7717a7fe743155513e74fc8ea35f558702bd4ff1075e15d1a36c1ecd9d5e285bd2a81245d680c05cf0521029583134b4e1d12668244042df3f5e62dfb
-Size (evolution-data-server-2.32.3.tar.bz2) = 4322281 bytes
-SHA1 (patch-aa) = 117f3ce1f2c948cae502486afdb62078e952afc0
-SHA1 (patch-ab) = fd27fd0a521899be568c843b24d9b6eeeb99a2bb
+SHA1 (evolution-data-server-3.18.4.tar.xz) = 8c982e5ce5f609ffafe8d68b0db8366ceb95d1de
+RMD160 (evolution-data-server-3.18.4.tar.xz) = 7b2ce154239840aab2a756937e773b56ecf0c5a5
+SHA512 (evolution-data-server-3.18.4.tar.xz) = eb5a7d869f60ec104bdc778c6fc1d2e38aec5983e5996f3dff3fe582649074ba4e4a111d593729587ddbf36a43f76475370e7d70f21e95f9c63f1bbfe877adb3
+Size (evolution-data-server-3.18.4.tar.xz) = 5413312 bytes
 SHA1 (patch-bd) = 8df85b9ab7ae71558fb939565e944b614de628bb
-SHA1 (patch-ca) = e879d29105997045e1293fe627ec55a05e5ba88d
-SHA1 (patch-calendar_backends_caldav_e-cal-backend-caldav.c) = 756ce60a8b684369bf7b0c14f2f52e735253c381
-SHA1 (patch-calendar_libedata-cal_e-cal-backend-intervaltree.c) = af78b5854666325a9dd1229702968c093805ec03
 SHA1 (patch-calendar_libegdbus_Makefile.in) = ac5aabae5160967c498f12c0f29be3e206e03622
 SHA1 (patch-cc) = a59bbc664a96f467888cae89cb00eb9a9033a925
 SHA1 (patch-cd) = 6e366e65e68cd0c5a8eafa67c7f9152c6521de12
diff --git a/evolution-data-server/patches/patch-aa b/evolution-data-server/patches/patch-aa
deleted file mode 100644
index ce61382..0000000
--- a/evolution-data-server/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2012/05/06 04:15:43 dholland Exp $
-
---- configure.orig	2011-04-21 19:41:16.000000000 +0000
-+++ configure
-@@ -4275,10 +4275,8 @@ fi
- 
- 
- 
--  list="-DG_DISABLE_DEPRECATED
--	-DPANGO_DISABLE_DEPRECATED
-+  list="-DPANGO_DISABLE_DEPRECATED
- 	-DGDK_PIXBUF_DISABLE_DEPRECATED
--	-DGTK_DISABLE_DEPRECATED
- 	-DG_DISABLE_SINGLE_INCLUDES
- 	-DGTK_DISABLE_SINGLE_INCLUDES
- 	-DGSEAL_ENABLE
diff --git a/evolution-data-server/patches/patch-ab b/evolution-data-server/patches/patch-ab
deleted file mode 100644
index 287d206..0000000
--- a/evolution-data-server/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2011/07/21 17:05:36 joerg Exp $
-
-For localtime_r, safer than adjusting the _XOPEN_SOURCE earlier in the file.
-
---- libedataserver/e-time-utils.c.orig	2011-07-20 12:30:18.000000000 +0000
-+++ libedataserver/e-time-utils.c
-@@ -13,6 +13,7 @@
- 
- /* For tm_gmtoff */
- #define _BSD_SOURCE
-+#define _NETBSD_SOURCE
- 
- #include <time.h>
- #include <sys/time.h>
diff --git a/evolution-data-server/patches/patch-ca b/evolution-data-server/patches/patch-ca
deleted file mode 100644
index fe443dc..0000000
--- a/evolution-data-server/patches/patch-ca
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ca,v 1.2 2010/11/24 20:19:44 drochner Exp $
-
---- camel/camel-search-sql-sexp.c.orig	2010-09-21 06:21:00.000000000 +0000
-+++ camel/camel-search-sql-sexp.c
-@@ -176,7 +176,7 @@ eval_eq(struct _ESExp *f, gint argc, str
- 		if (r1->type == ESEXP_RES_INT)
- 			g_string_append_printf(str, "%d", r1->value.number);
- 		else if (r1->type == ESEXP_RES_TIME)
--			g_string_append_printf(str, "%ld", r1->value.time);
-+			g_string_append_printf(str, "%lld", (long long)r1->value.time);
- 		else if (r1->type == ESEXP_RES_STRING)
- 			g_string_append_printf(str, "%s", r1->value.string);
- 
-@@ -194,7 +194,7 @@ eval_eq(struct _ESExp *f, gint argc, str
- 			if (r2->type == ESEXP_RES_BOOL)
- 				g_string_append_printf(str, "%d", r2->value.boolean);
- 			else if (r2->type == ESEXP_RES_TIME)
--				g_string_append_printf(str, "%ld", r2->value.time);
-+				g_string_append_printf(str, "%lld", (long long)r2->value.time);
- 			else if (r2->type == ESEXP_RES_STRING) {
- 				gchar *tmp = g_strdup_printf("%c%s%c", ut ? '%':' ', r2->value.string, ut?'%':' ');
- 				gchar *safe = get_db_safe_string(tmp);
-@@ -229,7 +229,7 @@ eval_lt(struct _ESExp *f, gint argc, str
- 		if (r1->type == ESEXP_RES_INT)
- 			g_string_append_printf(str, "%d", r1->value.number);
- 		else if (r1->type == ESEXP_RES_TIME)
--			g_string_append_printf(str, "%ld", r1->value.time);
-+			g_string_append_printf(str, "%lld", (long long)r1->value.time);
- 		else if (r1->type == ESEXP_RES_STRING)
- 			g_string_append_printf(str, "%s", r1->value.string);
- 
-@@ -239,7 +239,7 @@ eval_lt(struct _ESExp *f, gint argc, str
- 		if (r2->type == ESEXP_RES_BOOL)
- 			g_string_append_printf(str, "%d", r2->value.boolean);
- 		else if (r2->type == ESEXP_RES_TIME)
--			g_string_append_printf(str, "%ld", r2->value.time);
-+			g_string_append_printf(str, "%lld", (long long)r2->value.time);
- 		else if (r2->type == ESEXP_RES_STRING)
- 			g_string_append_printf(str, "%s", r2->value.string);
- 		e_sexp_result_free(f, r1);
-@@ -268,7 +268,7 @@ eval_gt(struct _ESExp *f, gint argc, str
- 		if (r1->type == ESEXP_RES_INT)
- 			g_string_append_printf(str, "%d", r1->value.number);
- 		else if (r1->type == ESEXP_RES_TIME)
--			g_string_append_printf(str, "%ld", r1->value.time);
-+			g_string_append_printf(str, "%lld", (long long)r1->value.time);
- 		else if (r1->type == ESEXP_RES_STRING)
- 			g_string_append_printf(str, "%s", r1->value.string);
- 
-@@ -278,7 +278,7 @@ eval_gt(struct _ESExp *f, gint argc, str
- 		if (r2->type == ESEXP_RES_BOOL)
- 			g_string_append_printf(str, "%d", r2->value.boolean);
- 		else if (r2->type == ESEXP_RES_TIME)
--			g_string_append_printf(str, "%ld", r2->value.time);
-+			g_string_append_printf(str, "%lld", (long long)r2->value.time);
- 		else if (r2->type == ESEXP_RES_STRING)
- 			g_string_append_printf(str, "%s", r2->value.string);
- 		e_sexp_result_free(f, r1);
diff --git a/evolution-data-server/patches/patch-calendar_backends_caldav_e-cal-backend-caldav.c b/evolution-data-server/patches/patch-calendar_backends_caldav_e-cal-backend-caldav.c
deleted file mode 100644
index 450d9b1..0000000
--- a/evolution-data-server/patches/patch-calendar_backends_caldav_e-cal-backend-caldav.c
+++ /dev/null
@@ -1,112 +0,0 @@
-$NetBSD: patch-calendar_backends_caldav_e-cal-backend-caldav.c,v 1.1 2012/09/20 11:53:19 obache Exp $
-
-* Support both old and new-buf libxml2 APIs
-  http://git.gnome.org/browse/evolution-data-server/commit/calendar/backends/caldav/e-cal-backend-caldav.c?id=679b10d75730e81fa268e11cfda289a27fd3e306
-
---- calendar/backends/caldav/e-cal-backend-caldav.c.orig	2011-04-21 19:35:36.000000000 +0000
-+++ calendar/backends/caldav/e-cal-backend-caldav.c
-@@ -1024,6 +1024,19 @@ caldav_server_open_calendar (ECalBackend
- 	return FALSE;
- }
- 
-+static gconstpointer
-+compat_libxml_output_buffer_get_content (xmlOutputBufferPtr buf,
-+                                         gsize *out_len)
-+{
-+#ifdef LIBXML2_NEW_BUFFER
-+	*out_len = xmlOutputBufferGetSize (buf);
-+	return xmlOutputBufferGetContent (buf);
-+#else
-+	*out_len = buf->buffer->use;
-+	return buf->buffer->content;
-+#endif
-+}
-+
- /* Returns whether calendar changed on the server. This works only when server
-    supports 'getctag' extension. */
- static gboolean
-@@ -1035,6 +1048,8 @@ check_calendar_changed_on_server (ECalBa
- 	xmlDocPtr		  doc;
- 	xmlNodePtr		  root, node;
- 	xmlNsPtr		  ns, nsdav;
-+	gconstpointer		  buf_content;
-+	gsize			  buf_size;
- 	gboolean		  result = TRUE;
- 
- 	g_return_val_if_fail (cbdav != NULL, TRUE);
-@@ -1069,11 +1084,11 @@ check_calendar_changed_on_server (ECalBa
- 	soup_message_headers_append (message->request_headers,
- 				     "Depth", "0");
- 
-+	buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size);
- 	soup_message_set_request (message,
- 				  "application/xml",
- 				  SOUP_MEMORY_COPY,
--				  (gchar *) buf->buffer->content,
--				  buf->buffer->use);
-+				  buf_content, buf_size);
- 
- 	/* Send the request now */
- 	send_and_handle_redirection (priv->session, message, NULL);
-@@ -1131,6 +1146,8 @@ caldav_server_list_objects (ECalBackendC
- 	xmlDocPtr            doc;
- 	xmlNsPtr             nsdav;
- 	xmlNsPtr             nscd;
-+	gconstpointer        buf_content;
-+	gsize                buf_size;
- 	gboolean             result;
- 
- 	priv = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav);
-@@ -1211,11 +1228,11 @@ caldav_server_list_objects (ECalBackendC
- 	soup_message_headers_append (message->request_headers,
- 				     "Depth", "1");
- 
-+	buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size);
- 	soup_message_set_request (message,
- 				  "application/xml",
- 				  SOUP_MEMORY_COPY,
--				  (gchar *) buf->buffer->content,
--				  buf->buffer->use);
-+				  buf_content, buf_size);
- 
- 	/* Send the request now */
- 	send_and_handle_redirection (priv->session, message, NULL);
-@@ -1499,6 +1516,8 @@ caldav_receive_schedule_outbox_url (ECal
- 	xmlDocPtr doc;
- 	xmlNodePtr root, node;
- 	xmlNsPtr nsdav;
-+	gconstpointer buf_content;
-+	gsize buf_size;
- 	gchar *owner = NULL;
- 
- 	g_return_val_if_fail (cbdav != NULL, FALSE);
-@@ -1527,11 +1546,11 @@ caldav_receive_schedule_outbox_url (ECal
- 	soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION);
- 	soup_message_headers_append (message->request_headers, "Depth", "0");
- 
-+	buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size);
- 	soup_message_set_request (message,
- 				  "application/xml",
- 				  SOUP_MEMORY_COPY,
--				  (gchar *) buf->buffer->content,
--				  buf->buffer->use);
-+				  buf_content, buf_size);
- 
- 	/* Send the request now */
- 	send_and_handle_redirection (priv->session, message, NULL);
-@@ -1577,11 +1596,11 @@ caldav_receive_schedule_outbox_url (ECal
- 		soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION);
- 		soup_message_headers_append (message->request_headers, "Depth", "0");
- 
-+		buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size);
- 		soup_message_set_request (message,
--				  "application/xml",
--				  SOUP_MEMORY_COPY,
--				  (gchar *) buf->buffer->content,
--				  buf->buffer->use);
-+					  "application/xml",
-+					  SOUP_MEMORY_COPY,
-+					  buf_content, buf_size);
- 
- 		/* Send the request now */
- 		send_and_handle_redirection (priv->session, message, NULL);
diff --git a/evolution-data-server/patches/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c b/evolution-data-server/patches/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c
deleted file mode 100644
index 5a867ab..0000000
--- a/evolution-data-server/patches/patch-calendar_libedata-cal_e-cal-backend-intervaltree.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-calendar_libedata-cal_e-cal-backend-intervaltree.c,v 1.1 2013/12/16 08:32:24 asau Exp $
-
---- calendar/libedata-cal/e-cal-backend-intervaltree.c.orig	2011-04-21 19:35:36.000000000 +0000
-+++ calendar/libedata-cal/e-cal-backend-intervaltree.c	2013-12-16 08:17:33.117504301 +0000
-@@ -26,7 +26,7 @@
- 
- #include <stdio.h>
- #include <string.h>
--#include <malloc.h>
-+#include <stdlib.h>
- 
- #include "e-cal-backend-intervaltree.h"
- 
diff --git a/evolution-data-server/patches/patch-calendar_libegdbus_Makefile.in b/evolution-data-server/patches/patch-calendar_libegdbus_Makefile.in
deleted file mode 100644
index 7cb1f6a..0000000
--- a/evolution-data-server/patches/patch-calendar_libegdbus_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-calendar_libegdbus_Makefile.in,v 1.1 2012/02/16 19:02:48 hans Exp $
-
---- calendar/libegdbus/Makefile.in.orig	2011-04-21 21:41:20.000000000 +0200
-+++ calendar/libegdbus/Makefile.in	2012-01-26 12:39:33.239925972 +0100
-@@ -387,9 +387,6 @@ libegdbus_cal_la_SOURCES = \
- 	e-gdbus-marshallers.c			\
- 	e-gdbus-typemappers.h
- 
--libegdbus_cal_la_LIBADD = \
--	$(GNOME_PLATFORM_LIBS)
--
- libegdbus_cal_la_LDFLAGS = $(NO_UNDEFINED)
- EXTRA_DIST = e-gdbus-marshallers.list
- all: all-am
diff --git a/evolution-data-server/patches/patch-cc b/evolution-data-server/patches/patch-cc
deleted file mode 100644
index 1fe539f..0000000
--- a/evolution-data-server/patches/patch-cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cc,v 1.3 2011/05/13 17:18:35 drochner Exp $
-
---- camel/providers/local/camel-maildir-summary.c.orig	2011-04-21 19:35:37.000000000 +0000
-+++ camel/providers/local/camel-maildir-summary.c
-@@ -379,7 +379,7 @@ static gchar *maildir_summary_next_uid_s
- 				g_free(uid);
- 				g_usleep(2*G_USEC_PER_SEC);
- 			}
--			uid = g_strdup_printf("%ld.%d_%u.%s", time(NULL), getpid(), nextuid, mds->priv->hostname);
-+			uid = g_strdup_printf("%lld.%d_%u.%s", (long long)time(NULL), getpid(), nextuid, mds->priv->hostname);
- 			name = g_strdup_printf("%s/tmp/%s", cls->folder_path, uid);
- 			retry++;
- 		} while (g_stat(name, &st) == 0 && retry<3);
diff --git a/evolution-data-server/patches/patch-cd b/evolution-data-server/patches/patch-cd
deleted file mode 100644
index 4a64cef..0000000
--- a/evolution-data-server/patches/patch-cd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cd,v 1.1 2010/07/12 17:52:29 drochner Exp $
-
---- addressbook/backends/vcf/e-book-backend-vcf.c.orig	2010-06-11 17:49:13.000000000 +0000
-+++ addressbook/backends/vcf/e-book-backend-vcf.c
-@@ -77,7 +77,7 @@ e_book_backend_vcf_create_unique_id (voi
- 	   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
diff --git a/evolution-data-server/patches/patch-ce b/evolution-data-server/patches/patch-ce
deleted file mode 100644
index 058ff67..0000000
--- a/evolution-data-server/patches/patch-ce
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ce,v 1.1 2010/07/12 17:52:29 drochner Exp $
-
---- addressbook/backends/ldap/e-book-backend-ldap.c.orig	2010-06-11 17:50:57.000000000 +0000
-+++ addressbook/backends/ldap/e-book-backend-ldap.c
-@@ -1267,11 +1267,11 @@ create_dn_from_contact (EContact *contac
- 		}
- 	}
- 
--	dn = g_strdup_printf ("%s=%s%s%lu",
-+	dn = g_strdup_printf ("%s=%s%s%llu",
- 			      get_dn_attribute_name (rootdn),
- 			      (cn_part && *cn_part) ? cn_part : "",
- 			      (cn_part && *cn_part) ? "." : "",
--			      time (NULL));
-+			      (long long)time (NULL));
- 
- 	g_free (cn_part);
- 
diff --git a/evolution-data-server/patches/patch-cg b/evolution-data-server/patches/patch-cg
deleted file mode 100644
index 05ddeda..0000000
--- a/evolution-data-server/patches/patch-cg
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cg,v 1.1 2011/07/30 11:16:06 shattered Exp $
-
---- calendar/libedata-cal/Makefile.in.orig	2011-07-13 20:22:21.000000000 +0000
-+++ calendar/libedata-cal/Makefile.in
-@@ -120,7 +120,7 @@ libedata_cal_1_2_la_LINK = $(LIBTOOL) $(
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- 	$(AM_CFLAGS) $(CFLAGS) $(libedata_cal_1_2_la_LDFLAGS) \
- 	$(LDFLAGS) -o $@
--PROGRAMS = $(factory_PROGRAMS) $(noinst_PROGRAMS)
-+PROGRAMS = $(factory_PROGRAMS)
- am_e_calendar_factory_OBJECTS =  \
- 	e_calendar_factory-e-data-cal-factory.$(OBJEXT) \
- 	e_calendar_factory-e-data-cal-migrate.$(OBJEXT) \
diff --git a/evolution-data-server/patches/patch-e_data_book_c b/evolution-data-server/patches/patch-e_data_book_c
deleted file mode 100644
index 7c1d28a..0000000
--- a/evolution-data-server/patches/patch-e_data_book_c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-e_data_book_c,v 1.1 2012/02/06 10:44:43 drochner Exp $
-
-Replace deprecated g_atomic_int_exchange_and_add()
-1886d3d0573388aa5c13af99f714687ba6a66ec6
-
---- addressbook/libedata-book/e-data-book.c.orig	2011-04-21 19:35:36.000000000 +0000
-+++ addressbook/libedata-book/e-data-book.c
-@@ -632,7 +632,7 @@ construct_bookview_path (void)
- 
- 	return g_strdup_printf ("/org/gnome/evolution/dataserver/addressbook/BookView/%d/%d",
- 				getpid (),
--				g_atomic_int_exchange_and_add ((int*)&counter, 1));
-+				g_atomic_int_add ((int*)&counter, 1));
- }
- 
- static gboolean
diff --git a/evolution-data-server/patches/patch-e_data_book_factory_c b/evolution-data-server/patches/patch-e_data_book_factory_c
deleted file mode 100644
index 4748fe8..0000000
--- a/evolution-data-server/patches/patch-e_data_book_factory_c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-e_data_book_factory_c,v 1.1 2012/02/06 10:44:43 drochner Exp $
-
-Replace deprecated g_atomic_int_exchange_and_add()
-1886d3d0573388aa5c13af99f714687ba6a66ec6
-
---- 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)
- 
- 	return g_strdup_printf (
- 		"/org/gnome/evolution/dataserver/addressbook/%d/%u",
--		getpid (), g_atomic_int_exchange_and_add (&counter, 1));
-+		getpid (), g_atomic_int_add (&counter, 1));
- }
- 
- static gboolean
diff --git a/evolution-data-server/patches/patch-e_data_cal_factory_c b/evolution-data-server/patches/patch-e_data_cal_factory_c
deleted file mode 100644
index 690c196..0000000
--- a/evolution-data-server/patches/patch-e_data_cal_factory_c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-e_data_cal_factory_c,v 1.1 2012/02/06 10:44:44 drochner Exp $
-
-Replace deprecated g_atomic_int_exchange_and_add()
-1886d3d0573388aa5c13af99f714687ba6a66ec6
-
---- 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)
- 
- 	return g_strdup_printf (
- 		"/org/gnome/evolution/dataserver/calendar/%d/%u",
--		getpid (), g_atomic_int_exchange_and_add (&counter, 1));
-+		getpid (), g_atomic_int_add (&counter, 1));
- }
- 
- static gboolean
diff --git a/evolution-data-server/patches/patch-e_data_server_util_c b/evolution-data-server/patches/patch-e_data_server_util_c
deleted file mode 100644
index a0b7b52..0000000
--- a/evolution-data-server/patches/patch-e_data_server_util_c
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-e_data_server_util_c,v 1.2 2012/05/06 04:34:03 dholland Exp $
-
-In glib 2.30 G_UNICODE_COMBINING_MARK became known as
-G_UNICODE_SPACING_MARK, and g_unicode_canonical_decomposition was
-deprecated in favour of g_unichar_fully_decompose.
-
---- libedataserver/e-data-server-util.c.orig	2011-04-21 19:35:37.000000000 +0000
-+++ libedataserver/e-data-server-util.c
-@@ -245,7 +245,12 @@ e_util_utf8_strstrcase (const gchar *hay
- static gunichar
- stripped_char (gunichar ch)
- {
--	gunichar *decomp, retval;
-+#ifdef G_UNICODE_COMBINING_MARK
-+	gunichar *decomp;
-+#else
-+	gunichar decomp[4];
-+#endif
-+	gunichar retval;
- 	GUnicodeType utype;
- 	gsize dlen;
- 
-@@ -255,16 +260,27 @@ stripped_char (gunichar ch)
- 	case G_UNICODE_CONTROL:
- 	case G_UNICODE_FORMAT:
- 	case G_UNICODE_UNASSIGNED:
-+#ifdef G_UNICODE_COMBINING_MARK
- 	case G_UNICODE_COMBINING_MARK:
-+#endif
-+#ifdef G_UNICODE_SPACING_MARK
-+	case G_UNICODE_SPACING_MARK:
-+#endif
- 		/* Ignore those */
- 		return 0;
- 	default:
- 		/* Convert to lowercase, fall through */
- 		ch = g_unichar_tolower (ch);
- 	case G_UNICODE_LOWERCASE_LETTER:
-+#ifdef G_UNICODE_COMBINING_MARK
- 		if ((decomp = g_unicode_canonical_decomposition (ch, &dlen))) {
-+#else
-+		if ((dlen = g_unichar_fully_decompose(ch, FALSE, decomp, 4))) {
-+#endif
- 			retval = decomp[0];
-+#ifdef G_UNICODE_COMBINING_MARK
- 			g_free (decomp);
-+#endif
- 			return retval;
- 		}
- 		break;
diff --git a/evolution-data-server/patches/patch-libedataserver_e-categories_c b/evolution-data-server/patches/patch-libedataserver_e-categories_c
deleted file mode 100644
index 10d2e24..0000000
--- a/evolution-data-server/patches/patch-libedataserver_e-categories_c
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-libedataserver_e-categories_c,v 1.1 2012/05/06 04:34:03 dholland Exp $
-
-Fix build with latest glib2.
-
---- libedataserver/e-categories.c~	2011-04-21 19:35:37.000000000 +0000
-+++ libedataserver/e-categories.c
-@@ -20,6 +20,7 @@
- #include <config.h>
- #include <string.h>
- #include <libxml/parser.h>
-+#include <glib.h>
- #include <glib/gstdio.h>
- #include <glib/gi18n-lib.h>
- #include <gconf/gconf-client.h>


Home | Main Index | Thread Index | Old Index