rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

3.6.0

Browse Source
This commit is contained in:
Matthew Barnes 2012-09-25 00:01:33 -04:00
parent 6930262c10
commit cae36e1c5c
4 changed files with 8 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -43,3 +43,4 @@ evolution-2.31.5.tar.bz2
/evolution-3.5.90.tar.xz /evolution-3.5.90.tar.xz
/evolution-3.5.91.tar.xz /evolution-3.5.91.tar.xz
/evolution-3.5.92.tar.xz /evolution-3.5.92.tar.xz
/evolution-3.6.0.tar.xz

40
evolution-3.5.92-flatten.patch
View File

@ -1,40 +0,0 @@
diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c
index b1d726d..520d0b1 100644
--- a/widgets/misc/e-web-view.c
+++ b/widgets/misc/e-web-view.c
@@ -578,26 +578,23 @@ web_view_navigation_policy_decision_requested_cb (EWebView *web_view,
}
static void
-web_view_load_status_changed_cb (WebKitWebView *web_view,
+web_view_load_status_changed_cb (WebKitWebView *webkit_web_view,
GParamSpec *pspec,
gpointer user_data)
{
WebKitLoadStatus status;
- GtkAllocation allocation, allocation_copy;
+ EWebView *web_view;
- status = webkit_web_view_get_load_status (web_view);
+ status = webkit_web_view_get_load_status (webkit_web_view);
if (status != WEBKIT_LOAD_FINISHED)
return;
+ web_view = E_WEB_VIEW (webkit_web_view);
+ web_view_update_document_highlights (web_view);
+
/* 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));
+ e_web_view_zoom_in (web_view);
+ e_web_view_zoom_out (web_view);
}
static void

12
evolution.spec
View File

@ -28,8 +28,8 @@
### Abstract ### ### Abstract ###
Name: evolution Name: evolution
Version: 3.5.92 Version: 3.6.0
Release: 4%{?dist} Release: 1%{?dist}
Group: Applications/Productivity Group: Applications/Productivity
Summary: Mail and calendar client for GNOME Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL License: GPLv2+ and GFDL
@ -49,9 +49,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
# RH bug #589555 # RH bug #589555
Patch02: evolution-2.30.1-help-contents.patch Patch02: evolution-2.30.1-help-contents.patch
# BGO #678408
Patch03: evolution-3.5.92-flatten.patch
## Dependencies ### ## Dependencies ###
Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@ -194,7 +191,6 @@ This package contains the plugin to import Microsoft Personal Storage Table
%setup -q -n evolution-%{version} %setup -q -n evolution-%{version}
%patch01 -p1 -b .ldaphack %patch01 -p1 -b .ldaphack
%patch02 -p1 -b .help-contents %patch02 -p1 -b .help-contents
%patch03 -p1 -b .flatten
mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/lib
@ -531,6 +527,10 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Mon Sep 24 2012 Matthew Barnes <mbarnes@redhat.com> - 3.6.0-1
- Update to 3.6.0
- Remove patch for GNOME #678408 (fixed upstream).
* Mon Sep 24 2012 Bastien Nocera <bnocera@redhat.com> 3.5.92-4 * Mon Sep 24 2012 Bastien Nocera <bnocera@redhat.com> 3.5.92-4
- Use GStreamer 1.0 instead of 0.10 - Use GStreamer 1.0 instead of 0.10

2
sources
View File

@ -1 +1 @@
d598d3d2c80f3db4c5c7f06f9f96148a evolution-3.5.92.tar.xz 5ceb71ca0bcc1f706f1a3283585c048c evolution-3.6.0.tar.xz