Update to 3.5.90
This commit is contained in:
Milan Crha
parent
5c67ec72e5
commit
2cbe1c6e69
1
.gitignore
vendored
1
.gitignore
vendored
@ -40,3 +40,4 @@ evolution-2.31.5.tar.bz2
|
||||
/evolution-3.5.3.1.tar.xz
|
||||
/evolution-3.5.4.tar.xz
|
||||
/evolution-3.5.5.tar.xz
|
||||
/evolution-3.5.90.tar.xz
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
|
||||
index 5a65ad7..0d9b5a3 100644
|
||||
--- a/widgets/misc/e-web-view.c
|
||||
+++ b/widgets/misc/e-web-view.c
|
||||
@@ -578,11 +578,20 @@ web_view_load_status_changed_cb (WebKitWebView *web_view,
|
||||
gpointer user_data)
|
||||
{
|
||||
WebKitLoadStatus status;
|
||||
+ GtkAllocation allocation, allocation_copy;
|
||||
|
||||
status = webkit_web_view_get_load_status (web_view);
|
||||
if (status != WEBKIT_LOAD_FINISHED)
|
||||
return;
|
||||
|
||||
+ /* Workaround webkit bug https://bugs.webkit.org/show_bug.cgi?id=89553 */
|
||||
+ gtk_widget_get_allocation (GTK_WIDGET (web_view), &allocation_copy);
|
||||
+ allocation = allocation_copy;
|
||||
+ allocation.width -= 10;
|
||||
+ allocation.height -= 10;
|
||||
+ gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation);
|
||||
+ gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation_copy);
|
||||
+
|
||||
web_view_update_document_highlights (E_WEB_VIEW (web_view));
|
||||
}
|
||||
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
From ff88d1f11176233438cace72da46a54c479495ab Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Barnes <mbarnes@redhat.com>
|
||||
Date: Mon, 13 Aug 2012 15:41:10 +0000
|
||||
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/modules/cal-config-caldav/e-caldav-chooser.c b/modules/cal-config-caldav/e-caldav-chooser.c
|
||||
index 55143f0..fa5c9b7 100644
|
||||
--- a/modules/cal-config-caldav/e-caldav-chooser.c
|
||||
+++ b/modules/cal-config-caldav/e-caldav-chooser.c
|
||||
@@ -111,6 +111,19 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (
|
||||
E_TYPE_SOURCE_AUTHENTICATOR,
|
||||
e_caldav_chooser_authenticator_init))
|
||||
|
||||
+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
|
||||
context_cancel_message (GCancellable *cancellable,
|
||||
Context *context)
|
||||
@@ -203,6 +216,8 @@ caldav_chooser_new_propfind (SoupSession *session,
|
||||
xmlNodePtr node;
|
||||
xmlNsPtr ns;
|
||||
xmlOutputBufferPtr output;
|
||||
+ gconstpointer content;
|
||||
+ gsize length;
|
||||
gpointer key;
|
||||
va_list va;
|
||||
|
||||
@@ -268,9 +283,11 @@ caldav_chooser_new_propfind (SoupSession *session,
|
||||
xmlNodeDumpOutput (output, doc, root, 0, 1, NULL);
|
||||
xmlOutputBufferFlush (output);
|
||||
|
||||
+ content = compat_libxml_output_buffer_get_content (output, &length);
|
||||
+
|
||||
soup_message_set_request (
|
||||
message, "application/xml", SOUP_MEMORY_COPY,
|
||||
- (gchar *) output->buffer->content, output->buffer->use);
|
||||
+ content, length);
|
||||
|
||||
xmlOutputBufferClose (output);
|
||||
|
||||
--
|
||||
cgit v0.9.0.2
|
||||
|
||||
@ -28,8 +28,8 @@
|
||||
### Abstract ###
|
||||
|
||||
Name: evolution
|
||||
Version: 3.5.5
|
||||
Release: 2%{?dist}
|
||||
Version: 3.5.90
|
||||
Release: 1%{?dist}
|
||||
Group: Applications/Productivity
|
||||
Summary: Mail and calendar client for GNOME
|
||||
License: GPLv2+ and GFDL
|
||||
@ -49,13 +49,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
|
||||
# RH bug #589555
|
||||
Patch02: evolution-2.30.1-help-contents.patch
|
||||
|
||||
# BGO #678408: tiny pane used for non-multipart MIME mails. Upstream
|
||||
# commit ad93908, will be in Evo 3.5.90 - adamw
|
||||
Patch03: evolution-3.5.5-bgo678408.patch
|
||||
|
||||
# Upstream ff88d1f11: fix build with new libxml2
|
||||
Patch04: evolution-3.5.5-libxml2.patch
|
||||
|
||||
## Dependencies ###
|
||||
|
||||
Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
|
||||
@ -196,8 +189,6 @@ This package contains the plugin to import Microsoft Personal Storage Table
|
||||
%setup -q -n evolution-%{version}
|
||||
%patch01 -p1 -b .ldaphack
|
||||
%patch02 -p1 -b .help-contents
|
||||
%patch03 -p1 -b .bgo678408
|
||||
%patch04 -p1 -b .libxml2
|
||||
|
||||
mkdir -p krb5-fakeprefix/include
|
||||
mkdir -p krb5-fakeprefix/lib
|
||||
@ -534,6 +525,10 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Aug 20 2012 Milan Crha <mcrha@redhat.com> - 3.5.90-1
|
||||
- Update to 3.5.90
|
||||
- Remove patches for BGO #678408 and #681321 (fixed upstream)
|
||||
|
||||
* Wed Aug 15 2012 Adam Williamson <awilliam@redhat.com> - 3.5.5-2
|
||||
- backport the fix for BGO #678408 and #681321 (libxml2 build)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user