1 files changed, 100 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-soup-adapt-to-new-libxml2-API-from-2.9.0.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-soup-adapt-to-new-libxml2-API-from-2.9.0.patch
new file mode 100644
index 000000000..79058019b
--- /dev/null
+++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-soup-adapt-to-new-libxml2-API-from-2.9.0.patch
@@ -0,0 +1,100 @@
+From 5083b22669f0d2102b72956a2b8afd9432303ce5 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Tue, 27 Nov 2012 08:46:51 +0100
+Subject: [PATCH] soup: adapt to new libxml2 API from 2.9.0
+* for more info see
+  https://mail.gnome.org/archives/xml/2012-August/msg00005.html
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ calendar/backends/caldav/e-cal-backend-caldav.c | 21 +++++++++++++++++++++
+ servers/google/libgdata/gdata-entry.c           |  8 ++++++++
+ 2 files changed, 29 insertions(+)
+diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
+index 5e7ecc4..b7f4afb 100644
+--- a/calendar/backends/caldav/e-cal-backend-caldav.c
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
+@@ -1038,8 +1038,13 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav)
+        soup_message_set_request (message,
+                                  "application/xml",
+                                  SOUP_MEMORY_COPY,
+#ifdef LIBXML2_NEW_BUFFER
+                                 (gchar *) xmlOutputBufferGetContent(buf),
+                                 xmlOutputBufferGetSize(buf));
+#else
+                                  (gchar *) buf->buffer->content,
+                                  buf->buffer->use);
+#endif
+ 
+        /* Send the request now */
+        send_and_handle_redirection (priv->session, message, NULL);
+@@ -1180,8 +1185,13 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav, CalDAVObject **objs, gint
+        soup_message_set_request (message,
+                                  "application/xml",
+                                  SOUP_MEMORY_COPY,
+#ifdef LIBXML2_NEW_BUFFER
+                                 (gchar *) xmlOutputBufferGetContent(buf),
+                                 xmlOutputBufferGetSize(buf));
+#else
+                                  (gchar *) buf->buffer->content,
+                                  buf->buffer->use);
+#endif
+ 
+        /* Send the request now */
+        send_and_handle_redirection (priv->session, message, NULL);
+@@ -1502,8 +1512,14 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav)
+        soup_message_set_request (message,
+                                  "application/xml",
+                                  SOUP_MEMORY_COPY,
+#ifdef LIBXML2_NEW_BUFFER
+                                 (gchar *) xmlOutputBufferGetContent(buf),
+                                 xmlOutputBufferGetSize(buf));
+#else
+                                  (gchar *) buf->buffer->content,
+                                  buf->buffer->use);
+#endif
+
+ 
+        /* Send the request now */
+        send_and_handle_redirection (priv->session, message, NULL);
+@@ -1552,8 +1568,13 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav)
+                soup_message_set_request (message,
+                                  "application/xml",
+                                  SOUP_MEMORY_COPY,
+#ifdef LIBXML2_NEW_BUFFER
+                                 (gchar *) xmlOutputBufferGetContent(buf),
+                                 xmlOutputBufferGetSize(buf));
+#else
+                                  (gchar *) buf->buffer->content,
+                                  buf->buffer->use);
+#endif
+ 
+                /* Send the request now */
+                send_and_handle_redirection (priv->session, message, NULL);
+diff --git a/servers/google/libgdata/gdata-entry.c b/servers/google/libgdata/gdata-entry.c
+index ab69eb0..3f05b17 100644
+--- a/servers/google/libgdata/gdata-entry.c
+++ b/servers/google/libgdata/gdata-entry.c
+@@ -877,9 +877,17 @@ gdata_entry_new_from_xmlptr (xmlDocPtr doc, xmlNodePtr cur)
+                xmlOutputBufferFlush (buf);
+ 
+                if (buf->conv == NULL)
+#ifdef LIBXML2_NEW_BUFFER
+                       xmlString = g_strdup ((gchar *) xmlOutputBufferGetContent(buf));
+#else
+                        xmlString = g_strdup ((gchar *)buf->buffer->content);
+#endif
+                else
+#ifdef LIBXML2_NEW_BUFFER
+                       xmlString = g_strdup ((gchar *) xmlBufContent(buf));
+#else
+                        xmlString = g_strdup ((gchar *)buf->conv->content);
+#endif
+                xmlOutputBufferClose (buf);
+        }
+ 
+-- 
+1.8.0

diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-soup-adapt-to-new-libxml2-API-from-2.9.0.patch b/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-soup-adapt-to-new-libxml2-API-from-2.9.0.patch new file mode 100644 index 000000000..79058019b --- /dev/null +++ b/meta-gnome/recipes-gnome/eds/evolution-data-server/0001-soup-adapt-to-new-libxml2-API-from-2.9.0.patch
@@ -0,0 +1,100 @@
	1	From 5083b22669f0d2102b72956a2b8afd9432303ce5 Mon Sep 17 00:00:00 2001
	2	From: Martin Jansa <Martin.Jansa@gmail.com>
	3	Date: Tue, 27 Nov 2012 08:46:51 +0100
	4	Subject: [PATCH] soup: adapt to new libxml2 API from 2.9.0
	5
	6	* for more info see
	7	https://mail.gnome.org/archives/xml/2012-August/msg00005.html
	8
	9	Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
	10	---
	11	calendar/backends/caldav/e-cal-backend-caldav.c \| 21 +++++++++++++++++++++
	12	servers/google/libgdata/gdata-entry.c \| 8 ++++++++
	13	2 files changed, 29 insertions(+)
	14
	15	diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
	16	index 5e7ecc4..b7f4afb 100644
	17	--- a/calendar/backends/caldav/e-cal-backend-caldav.c
	18	+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
	19	@@ -1038,8 +1038,13 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav)
	20	soup_message_set_request (message,
	21	"application/xml",
	22	SOUP_MEMORY_COPY,
	23	+#ifdef LIBXML2_NEW_BUFFER
	24	+ (gchar *) xmlOutputBufferGetContent(buf),
	25	+ xmlOutputBufferGetSize(buf));
	26	+#else
	27	(gchar *) buf->buffer->content,
	28	buf->buffer->use);
	29	+#endif
	30
	31	/* Send the request now */
	32	send_and_handle_redirection (priv->session, message, NULL);
	33	@@ -1180,8 +1185,13 @@ caldav_server_list_objects (ECalBackendCalDAV cbdav, CalDAVObject *objs, gint
	34	soup_message_set_request (message,
	35	"application/xml",
	36	SOUP_MEMORY_COPY,
	37	+#ifdef LIBXML2_NEW_BUFFER
	38	+ (gchar *) xmlOutputBufferGetContent(buf),
	39	+ xmlOutputBufferGetSize(buf));
	40	+#else
	41	(gchar *) buf->buffer->content,
	42	buf->buffer->use);
	43	+#endif
	44
	45	/* Send the request now */
	46	send_and_handle_redirection (priv->session, message, NULL);
	47	@@ -1502,8 +1512,14 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav)
	48	soup_message_set_request (message,
	49	"application/xml",
	50	SOUP_MEMORY_COPY,
	51	+#ifdef LIBXML2_NEW_BUFFER
	52	+ (gchar *) xmlOutputBufferGetContent(buf),
	53	+ xmlOutputBufferGetSize(buf));
	54	+#else
	55	(gchar *) buf->buffer->content,
	56	buf->buffer->use);
	57	+#endif
	58	+
	59
	60	/* Send the request now */
	61	send_and_handle_redirection (priv->session, message, NULL);
	62	@@ -1552,8 +1568,13 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav)
	63	soup_message_set_request (message,
	64	"application/xml",
	65	SOUP_MEMORY_COPY,
	66	+#ifdef LIBXML2_NEW_BUFFER
	67	+ (gchar *) xmlOutputBufferGetContent(buf),
	68	+ xmlOutputBufferGetSize(buf));
	69	+#else
	70	(gchar *) buf->buffer->content,
	71	buf->buffer->use);
	72	+#endif
	73
	74	/* Send the request now */
	75	send_and_handle_redirection (priv->session, message, NULL);
	76	diff --git a/servers/google/libgdata/gdata-entry.c b/servers/google/libgdata/gdata-entry.c
	77	index ab69eb0..3f05b17 100644
	78	--- a/servers/google/libgdata/gdata-entry.c
	79	+++ b/servers/google/libgdata/gdata-entry.c
	80	@@ -877,9 +877,17 @@ gdata_entry_new_from_xmlptr (xmlDocPtr doc, xmlNodePtr cur)
	81	xmlOutputBufferFlush (buf);
	82
	83	if (buf->conv == NULL)
	84	+#ifdef LIBXML2_NEW_BUFFER
	85	+ xmlString = g_strdup ((gchar *) xmlOutputBufferGetContent(buf));
	86	+#else
	87	xmlString = g_strdup ((gchar *)buf->buffer->content);
	88	+#endif
	89	else
	90	+#ifdef LIBXML2_NEW_BUFFER
	91	+ xmlString = g_strdup ((gchar *) xmlBufContent(buf));
	92	+#else
	93	xmlString = g_strdup ((gchar *)buf->conv->content);
	94	+#endif
	95	xmlOutputBufferClose (buf);
	96	}
	97
	98	--
	99	1.8.0
	100