backport the fix for BGO #678408
This commit is contained in:
parent
fe21b3d328
commit
c4d09a38f6
26
evolution-3.5.5-bgo678408.patch
Normal file
26
evolution-3.5.5-bgo678408.patch
Normal file
@ -0,0 +1,26 @@
|
||||
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));
|
||||
}
|
||||
|
||||
|
@ -29,7 +29,7 @@
|
||||
|
||||
Name: evolution
|
||||
Version: 3.5.5
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Group: Applications/Productivity
|
||||
Summary: Mail and calendar client for GNOME
|
||||
License: GPLv2+ and GFDL
|
||||
@ -49,6 +49,10 @@ 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
|
||||
|
||||
## Dependencies ###
|
||||
|
||||
Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
|
||||
@ -189,6 +193,7 @@ 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
|
||||
|
||||
mkdir -p krb5-fakeprefix/include
|
||||
mkdir -p krb5-fakeprefix/lib
|
||||
@ -525,6 +530,9 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Aug 15 2012 Adam Williamson <awilliam@redhat.com> - 3.5.5-2
|
||||
- backport the fix for BGO #678408
|
||||
|
||||
* Mon Aug 06 2012 Milan Crha <mcrha@redhat.com> - 3.5.5-1
|
||||
- Update to 3.5.5
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user