aboutsummaryrefslogtreecommitdiffstats
path: root/mail/evolution
diff options
context:
space:
mode:
authorkwm <kwm@FreeBSD.org>2014-05-18 05:28:59 +0800
committerkwm <kwm@FreeBSD.org>2014-05-18 05:28:59 +0800
commit5853ed7be0fbb4412287cb16d9438a58e0c59494 (patch)
tree20f89221f13a3554807c823b94c32e2ce26d93fa /mail/evolution
parente11d09a62b6aeed3ba558fb4b4d509ccc36fc034 (diff)
downloadfreebsd-ports-gnome-5853ed7be0fbb4412287cb16d9438a58e0c59494.tar.gz
freebsd-ports-gnome-5853ed7be0fbb4412287cb16d9438a58e0c59494.tar.zst
freebsd-ports-gnome-5853ed7be0fbb4412287cb16d9438a58e0c59494.zip
Catch up with libxml2 api breakage in 2.9.x
Diffstat (limited to 'mail/evolution')
-rw-r--r--mail/evolution/Makefile2
-rw-r--r--mail/evolution/files/patch-support-libxml2-2.943
2 files changed, 44 insertions, 1 deletions
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 5bd12279545f..2f099a799a9f 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -4,7 +4,7 @@
PORTNAME= evolution
PORTVERSION= 2.32.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/mail/evolution/files/patch-support-libxml2-2.9 b/mail/evolution/files/patch-support-libxml2-2.9
new file mode 100644
index 000000000000..57f833cc9cea
--- /dev/null
+++ b/mail/evolution/files/patch-support-libxml2-2.9
@@ -0,0 +1,43 @@
+--- plugins/caldav/caldav-browse-server.c.ori 2013-03-02 12:33:59.220751490 -0300
++++ plugins/caldav/caldav-browse-server.c 2013-03-02 16:47:55.601296985 -0300
+@@ -63,6 +63,18 @@
+
+ typedef void (*process_message_cb) (GObject *dialog, const gchar *msg_path, guint status_code, const gchar *msg_body, gpointer user_data);
+
++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 void send_xml_message (xmlDocPtr doc, gboolean depth_1, const gchar *url, GObject *dialog, process_message_cb cb, gpointer cb_user_data, const gchar *info);
+
+ static gchar *
+@@ -953,6 +965,8 @@
+ SoupSession *session;
+ SoupMessage *message;
+ xmlOutputBufferPtr buf;
++ gconstpointer content;
++ gsize length;
+ guint poll_id;
+ struct poll_data *pd;
+
+@@ -977,9 +991,11 @@
+ xmlNodeDumpOutput (buf, doc, xmlDocGetRootElement (doc), 0, 1, NULL);
+ xmlOutputBufferFlush (buf);
+
++ content = compat_libxml_output_buffer_get_content (buf, &length);
++
+ soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION);
+ soup_message_headers_append (message->request_headers, "Depth", depth_1 ? "1" : "0");
+- soup_message_set_request (message, "application/xml", SOUP_MEMORY_COPY, (const gchar *) buf->buffer->content, buf->buffer->use);
++ soup_message_set_request (message, "application/xml", SOUP_MEMORY_COPY, content, length);
+
+ /* Clean up the memory */
+ xmlOutputBufferClose (buf);