diff options
author | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-02-20 14:44:59 +0000 |
---|---|---|
committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2013-02-20 14:44:59 +0000 |
commit | 8da9c6434c08bfe47ee25ae64644a07bfd0dc0ad (patch) | |
tree | 77b057b7078e66266b03c009f4dde72856e323d8 /gnome-extra | |
parent | x86 stable, see bug 437432 (diff) | |
download | gentoo-2-8da9c6434c08bfe47ee25ae64644a07bfd0dc0ad.tar.gz gentoo-2-8da9c6434c08bfe47ee25ae64644a07bfd0dc0ad.tar.bz2 gentoo-2-8da9c6434c08bfe47ee25ae64644a07bfd0dc0ad.zip |
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.
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'gnome-extra')
4 files changed, 135 insertions, 4 deletions
diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog index 2339e0d7b80c..830e329663d1 100644 --- a/gnome-extra/evolution-data-server/ChangeLog +++ b/gnome-extra/evolution-data-server/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-extra/evolution-data-server # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.353 2013/02/02 22:36:37 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.354 2013/02/20 14:44:58 tetromino Exp $ + + 20 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org> + evolution-data-server-2.32.3-r3.ebuild, + +files/evolution-data-server-2.32.3-libxml2-2.9.patch, + evolution-data-server-3.6.3.ebuild: + 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. 02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> evolution-data-server-3.6.2-r1.ebuild: diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild index fe254129e297..7298e646aa95 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild,v 1.1 2013/01/22 19:59:23 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild,v 1.2 2013/02/20 14:44:58 tetromino Exp $ EAPI="5" GCONF_DEBUG="no" @@ -95,6 +95,9 @@ src_prepare() { # Upstream bug #669003 - CalDAV: Cannot modify calendar object (libical 0.48) epatch "${FILESDIR}/${P}-libical-0.48.patch" + # Fix building with libxml2-2.9, backported from eds-3.6 + epatch "${FILESDIR}/${P}-libxml2-2.9.patch" + # /usr/include/db.h is always db-1 on FreeBSD # so include the right dir in CPPFLAGS append-cppflags "-I$(db_includedir)" diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.6.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.6.3.ebuild index cecc6959e7ae..f6078dfabddd 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.6.3.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-3.6.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.6.3.ebuild,v 1.1 2013/01/22 03:47:14 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.6.3.ebuild,v 1.2 2013/02/20 14:44:58 tetromino Exp $ EAPI="5" GCONF_DEBUG="no" @@ -20,7 +20,7 @@ SLOT="0/40" # subslot = libcamel-1.2 soname version IUSE="api-doc-extras +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather" REQUIRED_USE="vala? ( introspection )" -KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" RDEPEND=">=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.2:3 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 + |