mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +00:00
Martin Jansa
c52054f338
* I've only build tested this, because it was broken for long time and bothering me in world builds (and test-dependencies builds), but I'm not using any eds dependant app, so I cannot test it properly in runtime * I've dropped some patches with unclear purpose * enabled nss/nspr as they are now available in oe-core and simplifies the build (needs patch to fix build when nss is disabled) * it was broken for more then 4 months since glib upgrade to 2.36.* and nobody complained, I'm tempted to just remove it next time (together with cheese, dates, contacts, tasks) * too late I've found this commit https://lists.yoctoproject.org/pipermail/poky/2010-November/000526.html which does some similar things but only for 2.32.1 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
78 lines
2.5 KiB
Diff
78 lines
2.5 KiB
Diff
From ac95e89749a01618f98b554a98e78d7c988bfc10 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 5/5] 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 +++++++++++++++++++++
|
|
1 file changed, 21 insertions(+)
|
|
|
|
diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
|
|
index 12f8f22..5555a3e 100644
|
|
--- a/calendar/backends/caldav/e-cal-backend-caldav.c
|
|
+++ b/calendar/backends/caldav/e-cal-backend-caldav.c
|
|
@@ -1172,8 +1172,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);
|
|
@@ -1321,8 +1326,13 @@ caldav_server_list_objects (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);
|
|
@@ -1715,8 +1725,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);
|
|
@@ -1765,8 +1781,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);
|
|
--
|
|
1.8.3.2
|
|
|