Update to 3.5.91

This commit is contained in:
Milan Crha 2012-09-03 08:24:10 +02:00
parent b5971448f7
commit 042591d1ee
4 changed files with 9 additions and 39 deletions

1
.gitignore vendored
View File

@ -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

View File

@ -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);

View File

@ -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 <mcrha@redhat.com> - 3.5.91-1
- Update to 3.5.91
- Remove patch for new xmlOutputBuffer API (fixed upstream)
* Mon Aug 20 2012 Milan Crha <mcrha@redhat.com> - 3.5.90-1
- Update to 3.5.90
- Add patch for new xmlOutputBuffer API

View File

@ -1 +1 @@
6ca3ef99a38a5a132a6aee42d212bb20 evolution-ews-3.5.90.tar.xz
85552e4f9d405c1301c9cd5b037a54b3 evolution-ews-3.5.91.tar.xz