2.32.3-r3: add patch to fix build failure with libxml2-2.9 (bug #448798). 3.6.3: propagate ~arm keyword from 3.6.2-r1.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

1 files changed, 121 insertions, 0 deletions

diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libxml2-2.9.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libxml2-2.9.patch
new file mode 100644
index 000000000000..765e4aea8ca1
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libxml2-2.9.patch
@@ -0,0 +1,121 @@
+From 9792cbd0f131a972e132a60fa59c89244dea793d Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Mon, 13 Aug 2012 09:50:50 -0400
+Subject: [PATCH] Bug 681321 - Support both old and new-buf libxml2 APIs
+
+libxml2 changed the API for xmlOutputBuffer incompatibly.
+See https://mail.gnome.org/archives/desktop-devel-list/2012-August/msg00004.html
+---
+ calendar/backends/caldav/e-cal-backend-caldav.c | 35 +++++++++++++++++++------
+ 1 file changed, 27 insertions(+), 8 deletions(-)
+
+diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
+index 80c5a39..4343857 100644
+--- a/calendar/backends/caldav/e-cal-backend-caldav.c
++++ b/calendar/backends/caldav/e-cal-backend-caldav.c
+@@ -499,6 +499,19 @@ quote_etag (const gchar *etag)
+ 	return ret;
+ }
+ 
++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
++}
++
+ /* ************************************************************************* */
+ 
+ static gboolean
+@@ -1035,6 +1048,8 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav)
+ 	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 (ECalBackendCalDAV *cbdav)
+ 	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 (ECalBackendCalDAV *cbdav, CalDAVObject **objs, gint
+ 	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 (ECalBackendCalDAV *cbdav, CalDAVObject **objs, gint
+ 	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 (ECalBackendCalDAV *cbdav)
+ 	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 (ECalBackendCalDAV *cbdav)
+ 	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 (ECalBackendCalDAV *cbdav)
+ 		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);
+-- 
+1.8.1.2
+