diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile index c6fc89909e55..355d60d4b793 100644 --- a/databases/evolution-data-server/Makefile +++ b/databases/evolution-data-server/Makefile @@ -4,7 +4,7 @@ PORTNAME= evolution-data-server PORTVERSION= 2.32.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= databases gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/databases/evolution-data-server/files/patch-support-libxml2-2.9 b/databases/evolution-data-server/files/patch-support-libxml2-2.9 new file mode 100644 index 000000000000..9d8711600e5c --- /dev/null +++ b/databases/evolution-data-server/files/patch-support-libxml2-2.9 @@ -0,0 +1,118 @@ +From 679b10d75730e81fa268e11cfda289a27fd3e306 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Mon, 13 Aug 2012 09:50:50 -0400 +Subject: 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 + +diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c +index 0219b34..f96907e 100644 +--- calendar/backends/caldav/e-cal-backend-caldav.c ++++ calendar/backends/caldav/e-cal-backend-caldav.c +@@ -1188,6 +1188,19 @@ caldav_authenticate (ECalBackendCalDAV *cbdav, + return success; + } + ++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 +@@ -1198,6 +1211,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); +@@ -1230,11 +1245,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 (cbdav->priv->session, message, NULL); +@@ -1299,6 +1314,8 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav, + xmlDocPtr doc; + xmlNsPtr nsdav; + xmlNsPtr nscd; ++ gconstpointer buf_content; ++ gsize buf_size; + gboolean result; + + /* Allocate the soup message */ +@@ -1378,11 +1395,11 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav, + 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 (cbdav->priv->session, message, NULL); +@@ -1795,6 +1812,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 (E_IS_CAL_BACKEND_CALDAV (cbdav), FALSE); +@@ -1820,11 +1839,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 (cbdav->priv->session, message, NULL); +@@ -1870,11 +1889,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); ++ "application/xml", ++ SOUP_MEMORY_COPY, ++ buf_content, buf_size); + + /* Send the request now */ + send_and_handle_redirection (cbdav->priv->session, message, NULL); + 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); diff --git a/textproc/gdome2/Makefile b/textproc/gdome2/Makefile index 3c8df0791ad0..0acbac6ae420 100644 --- a/textproc/gdome2/Makefile +++ b/textproc/gdome2/Makefile @@ -3,7 +3,7 @@ PORTNAME= gdome2 PORTVERSION= 0.8.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= textproc MASTER_SITES= http://gdome2.cs.unibo.it/tarball/ diff --git a/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c b/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c new file mode 100644 index 000000000000..5b94efe8ecca --- /dev/null +++ b/textproc/gdome2/files/patch-libgdome_gdomecore_gdome-xml-documentt.c @@ -0,0 +1,20 @@ +Patch from Gentoo to fix libxml2 2.9 api change + +Patch by Harris Landgarten. + +The patch was submitted on bug 448236, following the announcement on +https://mail.gnome.org/archives/xml/2012-August/msg00005.html +--- libgdome/gdomecore/gdome-xml-documentt.c.orig 2003-07-13 06:47:54.000000000 -0400 ++++ libgdome/gdomecore/gdome-xml-documentt.c 2012-12-23 08:57:23.000000000 -0500 +@@ -342,7 +342,11 @@ + } + xmlNodeDumpOutput (out_buff, NULL, (xmlNode *)is, 0, 0, NULL); + xmlOutputBufferFlush(out_buff); ++#if LIBXML_VERSION < 20900 + ret = g_strndup (out_buff->buffer->content, out_buff->buffer->use); ++#else ++ ret = g_strndup (xmlBufContent(out_buff->buffer), xmlBufUse(out_buff->buffer)); ++#endif + (void)xmlOutputBufferClose(out_buff); + + return gdome_xml_str_mkref_own (ret);