Update to 3.11.90

This commit is contained in:
Milan Crha 2014-02-17 09:19:15 +01:00
parent 0b4cc22c51
commit 00c8f531f5
4 changed files with 38 additions and 42 deletions

1
.gitignore vendored
View File

@ -68,3 +68,4 @@ evolution-2.31.5.tar.bz2
/evolution-3.11.2.tar.xz
/evolution-3.11.4.tar.xz
/evolution-3.11.5.tar.xz
/evolution-3.11.90.tar.xz

View File

@ -1,7 +1,7 @@
diff -up evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c
--- evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-01-13 08:31:03.314822806 +0100
+++ evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c 2014-01-13 08:32:38.787818761 +0100
@@ -4282,6 +4282,11 @@ e_contact_editor_init (EContactEditor *e
diff -up evolution-3.11.90/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.11.90/addressbook/gui/contact-editor/e-contact-editor.c
--- evolution-3.11.90/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-02-16 15:11:01.000000000 +0100
+++ evolution-3.11.90/addressbook/gui/contact-editor/e-contact-editor.c 2014-02-17 09:11:15.407454286 +0100
@@ -4281,6 +4281,11 @@ e_contact_editor_init (EContactEditor *e
g_signal_connect (
widget, "clicked",
G_CALLBACK (show_help_cb), e_contact_editor);
@ -13,9 +13,9 @@ diff -up evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c.help
widget = e_builder_get_widget (
e_contact_editor->priv->builder, "button-web-expand");
g_signal_connect_swapped (
diff -up evolution-3.11.4/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.11.4/calendar/gui/dialogs/comp-editor.c
--- evolution-3.11.4/calendar/gui/dialogs/comp-editor.c.help-contents 2014-01-13 00:02:51.000000000 +0100
+++ evolution-3.11.4/calendar/gui/dialogs/comp-editor.c 2014-01-13 08:31:03.315822806 +0100
diff -up evolution-3.11.90/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.11.90/calendar/gui/dialogs/comp-editor.c
--- evolution-3.11.90/calendar/gui/dialogs/comp-editor.c.help-contents 2014-02-16 15:11:01.000000000 +0100
+++ evolution-3.11.90/calendar/gui/dialogs/comp-editor.c 2014-02-17 09:11:15.408454286 +0100
@@ -2169,6 +2169,12 @@ comp_editor_init (CompEditor *editor)
G_BINDING_SYNC_CREATE);
}
@ -29,10 +29,10 @@ diff -up evolution-3.11.4/calendar/gui/dialogs/comp-editor.c.help-contents evolu
action_group = gtk_action_group_new ("individual");
gtk_action_group_set_translation_domain (
action_group, GETTEXT_PACKAGE);
diff -up evolution-3.11.4/e-util/e-misc-utils.c.help-contents evolution-3.11.4/e-util/e-misc-utils.c
--- evolution-3.11.4/e-util/e-misc-utils.c.help-contents 2014-01-07 22:05:51.000000000 +0100
+++ evolution-3.11.4/e-util/e-misc-utils.c 2014-01-13 08:31:03.315822806 +0100
@@ -2098,3 +2098,20 @@ e_binding_transform_uid_to_source (GBind
diff -up evolution-3.11.90/e-util/e-misc-utils.c.help-contents evolution-3.11.90/e-util/e-misc-utils.c
--- evolution-3.11.90/e-util/e-misc-utils.c.help-contents 2014-02-11 14:39:16.000000000 +0100
+++ evolution-3.11.90/e-util/e-misc-utils.c 2014-02-17 09:11:15.408454286 +0100
@@ -2102,3 +2102,20 @@ e_binding_transform_uid_to_source (GBind
return success;
}
@ -53,9 +53,9 @@ diff -up evolution-3.11.4/e-util/e-misc-utils.c.help-contents evolution-3.11.4/e
+
+ return is_installed;
+}
diff -up evolution-3.11.4/e-util/e-misc-utils.h.help-contents evolution-3.11.4/e-util/e-misc-utils.h
--- evolution-3.11.4/e-util/e-misc-utils.h.help-contents 2014-01-07 22:05:51.000000000 +0100
+++ evolution-3.11.4/e-util/e-misc-utils.h 2014-01-13 08:31:03.316822806 +0100
diff -up evolution-3.11.90/e-util/e-misc-utils.h.help-contents evolution-3.11.90/e-util/e-misc-utils.h
--- evolution-3.11.90/e-util/e-misc-utils.h.help-contents 2014-01-07 22:05:51.000000000 +0100
+++ evolution-3.11.90/e-util/e-misc-utils.h 2014-02-17 09:11:15.408454286 +0100
@@ -184,6 +184,8 @@ gboolean e_binding_transform_uid_to_sour
GValue *target_value,
ESourceRegistry *registry);
@ -65,10 +65,10 @@ diff -up evolution-3.11.4/e-util/e-misc-utils.h.help-contents evolution-3.11.4/e
G_END_DECLS
#endif /* E_MISC_UTILS_H */
diff -up evolution-3.11.4/e-util/e-preferences-window.c.help-contents evolution-3.11.4/e-util/e-preferences-window.c
--- evolution-3.11.4/e-util/e-preferences-window.c.help-contents 2014-01-07 22:05:51.000000000 +0100
+++ evolution-3.11.4/e-util/e-preferences-window.c 2014-01-13 08:31:03.316822806 +0100
@@ -384,6 +384,11 @@ e_preferences_window_init (EPreferencesW
diff -up evolution-3.11.90/e-util/e-preferences-window.c.help-contents evolution-3.11.90/e-util/e-preferences-window.c
--- evolution-3.11.90/e-util/e-preferences-window.c.help-contents 2014-02-17 09:11:15.408454286 +0100
+++ evolution-3.11.90/e-util/e-preferences-window.c 2014-02-17 09:14:41.257445705 +0100
@@ -385,6 +385,11 @@ e_preferences_window_init (EPreferencesW
GTK_BUTTON_BOX (container), widget, TRUE);
gtk_widget_show (widget);
@ -77,12 +77,12 @@ diff -up evolution-3.11.4/e-util/e-preferences-window.c.help-contents evolution-
+ gtk_widget_hide (widget);
+ }
+
widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
widget = e_dialog_button_new_with_icon ("window-close", _("_Close"));
g_signal_connect_swapped (
widget, "clicked",
diff -up evolution-3.11.4/e-util/e-send-options.c.help-contents evolution-3.11.4/e-util/e-send-options.c
--- evolution-3.11.4/e-util/e-send-options.c.help-contents 2014-01-07 22:05:51.000000000 +0100
+++ evolution-3.11.4/e-util/e-send-options.c 2014-01-13 08:31:03.316822806 +0100
diff -up evolution-3.11.90/e-util/e-send-options.c.help-contents evolution-3.11.90/e-util/e-send-options.c
--- evolution-3.11.90/e-util/e-send-options.c.help-contents 2014-01-07 22:05:51.000000000 +0100
+++ evolution-3.11.90/e-util/e-send-options.c 2014-02-17 09:11:15.408454286 +0100
@@ -439,6 +439,7 @@ get_widgets (ESendOptionsDialog *sod)
{
ESendOptionsDialogPrivate *priv;
@ -104,18 +104,10 @@ diff -up evolution-3.11.4/e-util/e-send-options.c.help-contents evolution-3.11.4
return (priv->priority
&& priv->security
&& priv->status
diff -up evolution-3.11.4/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.11.4/plugins/email-custom-header/email-custom-header.c
--- evolution-3.11.4/plugins/email-custom-header/email-custom-header.c.help-contents 2014-01-07 22:05:51.000000000 +0100
+++ evolution-3.11.4/plugins/email-custom-header/email-custom-header.c 2014-01-13 08:31:03.316822806 +0100
@@ -26,6 +26,7 @@
#include <string.h>
#include <glib/gi18n.h>
+#include "e-util/e-util.h"
#include "mail/em-utils.h"
#include "mail/em-event.h"
#include "composer/e-msg-composer.h"
@@ -116,6 +117,8 @@ static gboolean
diff -up evolution-3.11.90/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.11.90/plugins/email-custom-header/email-custom-header.c
--- evolution-3.11.90/plugins/email-custom-header/email-custom-header.c.help-contents 2014-02-16 15:11:01.000000000 +0100
+++ evolution-3.11.90/plugins/email-custom-header/email-custom-header.c 2014-02-17 09:11:15.409454286 +0100
@@ -118,6 +118,8 @@ static gboolean
epech_get_widgets (CustomHeaderOptionsDialog *mch)
{
CustomHeaderOptionsDialogPrivate *priv;
@ -124,7 +116,7 @@ diff -up evolution-3.11.4/plugins/email-custom-header/email-custom-header.c.help
priv = mch->priv;
#define EMAIL_CUSTOM_HEADER(name) e_builder_get_widget (priv->builder, name)
@@ -126,6 +129,13 @@ epech_get_widgets (CustomHeaderOptionsDi
@@ -128,6 +130,13 @@ epech_get_widgets (CustomHeaderOptionsDi
priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox");
priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options");
@ -138,9 +130,9 @@ diff -up evolution-3.11.4/plugins/email-custom-header/email-custom-header.c.help
#undef EMAIL_CUSTOM_HEADER
return (priv->page
diff -up evolution-3.11.4/shell/e-shell-window-actions.c.help-contents evolution-3.11.4/shell/e-shell-window-actions.c
--- evolution-3.11.4/shell/e-shell-window-actions.c.help-contents 2014-01-07 23:08:55.000000000 +0100
+++ evolution-3.11.4/shell/e-shell-window-actions.c 2014-01-13 08:31:03.317822806 +0100
diff -up evolution-3.11.90/shell/e-shell-window-actions.c.help-contents evolution-3.11.90/shell/e-shell-window-actions.c
--- evolution-3.11.90/shell/e-shell-window-actions.c.help-contents 2014-02-16 15:11:01.000000000 +0100
+++ evolution-3.11.90/shell/e-shell-window-actions.c 2014-02-17 09:11:15.409454286 +0100
@@ -1413,6 +1413,11 @@ e_shell_window_actions_init (EShellWindo
if (path == NULL)
gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE);

View File

@ -31,12 +31,12 @@
### Abstract ###
Name: evolution
Version: 3.11.5
Release: 2%{?dist}
Version: 3.11.90
Release: 1%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
URL: http://projects.gnome.org/evolution/
URL: https://wiki.gnome.org/Apps/Evolution
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Source: http://download.gnome.org/sources/%{name}/3.11/%{name}-%{version}.tar.xz
@ -518,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
* Mon Feb 17 2014 Milan Crha <mcrha@redhat.com> - 3.11.90-1
- Update to 3.11.90
* Mon Feb 03 2014 Milan Crha <mcrha@redhat.com> - 3.11.5-2
- Drop krb5 dependency

View File

@ -1 +1 @@
d42aef65bbc7418f7c73b4c1916d399d evolution-3.11.5.tar.xz
837ffcf62b070cd9e9104bb4266a5c29 evolution-3.11.90.tar.xz