From 042591d1ee284872f58772d97ef780e157dfbe2d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 3 Sep 2012 08:24:10 +0200 Subject: [PATCH] Update to 3.5.91 --- .gitignore | 1 + evolution-ews-3.5.90-xmlbuffer.patch | 35 ---------------------------- evolution-ews.spec | 10 +++++--- sources | 2 +- 4 files changed, 9 insertions(+), 39 deletions(-) delete mode 100644 evolution-ews-3.5.90-xmlbuffer.patch diff --git a/.gitignore b/.gitignore index 5b9efa3..f21ddda 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /evolution-ews-3.5.4.tar.xz /evolution-ews-3.5.5.tar.xz /evolution-ews-3.5.90.tar.xz +/evolution-ews-3.5.91.tar.xz diff --git a/evolution-ews-3.5.90-xmlbuffer.patch b/evolution-ews-3.5.90-xmlbuffer.patch deleted file mode 100644 index e6675b2..0000000 --- a/evolution-ews-3.5.90-xmlbuffer.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/src/server/e-ews-connection.c b/src/server/e-ews-connection.c -index e3ec167..b239e61 100644 ---- a/src/server/e-ews-connection.c -+++ b/src/server/e-ews-connection.c -@@ -1956,8 +1956,13 @@ static void post_restarted (SoupMessage *msg, gpointer data) - - soup_message_set_request ( - msg, "text/xml; charset=utf-8", SOUP_MEMORY_COPY, -- (gchar *) buf->buffer->content, -- buf->buffer->use); -+ (gchar *) -+ #ifdef LIBXML2_NEW_BUFFER -+ xmlOutputBufferGetContent (buf), xmlOutputBufferGetSize (buf) -+ #else -+ buf->buffer->content, buf->buffer->use -+ #endif -+ ); - } - - static SoupMessage * -@@ -1978,7 +1983,13 @@ e_ews_get_msg_for_url (const gchar *url, - if (buf != NULL) { - soup_message_set_request ( - msg, "text/xml; charset=utf-8", SOUP_MEMORY_COPY, -- (gchar *) buf->buffer->content, buf->buffer->use); -+ (gchar *) -+ #ifdef LIBXML2_NEW_BUFFER -+ xmlOutputBufferGetContent (buf), xmlOutputBufferGetSize (buf) -+ #else -+ buf->buffer->content, buf->buffer->use -+ #endif -+ ); - g_signal_connect ( - msg, "restarted", - G_CALLBACK (post_restarted), buf); diff --git a/evolution-ews.spec b/evolution-ews.spec index 3c6c0e1..df9b8d1 100644 --- a/evolution-ews.spec +++ b/evolution-ews.spec @@ -1,7 +1,7 @@ %global evo_base_version 3.6 Name: evolution-ews -Version: 3.5.90 +Version: 3.5.91 Release: 1%{?dist} Group: Applications/Productivity Summary: Evolution extension for Exchange Web Services @@ -9,7 +9,7 @@ License: LGPLv2 URL: http://projects.gnome.org/evolution Source: http://download.gnome.org/sources/%{name}/3.5/%{name}-%{version}.tar.xz -Patch01: evolution-ews-3.5.90-xmlbuffer.patch +#Patch01: evolution-ews-3.5.90-xmlbuffer.patch Requires: evolution >= %{version} Requires: evolution-data-server >= %{version} @@ -24,7 +24,7 @@ versions 2007 and later, through its Exchange Web Services (EWS) interface. %prep %setup -q -%patch01 -p1 -b .xmlbuffer +#%patch01 -p1 -b .xmlbuffer %build %configure @@ -68,6 +68,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/*.pc %{_libdir}/liblzx.so.* %changelog +* Mon Sep 03 2012 Milan Crha - 3.5.91-1 +- Update to 3.5.91 +- Remove patch for new xmlOutputBuffer API (fixed upstream) + * Mon Aug 20 2012 Milan Crha - 3.5.90-1 - Update to 3.5.90 - Add patch for new xmlOutputBuffer API diff --git a/sources b/sources index a14f7d0..c15ef4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6ca3ef99a38a5a132a6aee42d212bb20 evolution-ews-3.5.90.tar.xz +85552e4f9d405c1301c9cd5b037a54b3 evolution-ews-3.5.91.tar.xz