From c0178dddd07263f77fe3821a35fdd2501fcf344b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 3 Mar 2014 13:40:44 +0100 Subject: [PATCH] Update to 3.11.91 --- .gitignore | 1 + evolution-2.30.1-help-contents.patch | 52 ++++++++++++++-------------- evolution.spec | 7 ++-- sources | 2 +- 4 files changed, 33 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index a4ca67b..45839b7 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.11.4.tar.xz /evolution-3.11.5.tar.xz /evolution-3.11.90.tar.xz +/evolution-3.11.91.tar.xz diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch index b3750f5..a466d32 100644 --- a/evolution-2.30.1-help-contents.patch +++ b/evolution-2.30.1-help-contents.patch @@ -1,6 +1,6 @@ -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 +diff -up evolution-3.11.91/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.11.91/addressbook/gui/contact-editor/e-contact-editor.c +--- evolution-3.11.91/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-03-03 01:37:23.000000000 +0100 ++++ evolution-3.11.91/addressbook/gui/contact-editor/e-contact-editor.c 2014-03-03 13:37:40.924928474 +0100 @@ -4281,6 +4281,11 @@ e_contact_editor_init (EContactEditor *e g_signal_connect ( widget, "clicked", @@ -13,10 +13,10 @@ diff -up evolution-3.11.90/addressbook/gui/contact-editor/e-contact-editor.c.hel widget = e_builder_get_widget ( e_contact_editor->priv->builder, "button-web-expand"); g_signal_connect_swapped ( -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) +diff -up evolution-3.11.91/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.11.91/calendar/gui/dialogs/comp-editor.c +--- evolution-3.11.91/calendar/gui/dialogs/comp-editor.c.help-contents 2014-03-03 01:37:23.000000000 +0100 ++++ evolution-3.11.91/calendar/gui/dialogs/comp-editor.c 2014-03-03 13:37:40.924928474 +0100 +@@ -2168,6 +2168,12 @@ comp_editor_init (CompEditor *editor) G_BINDING_SYNC_CREATE); } @@ -29,9 +29,9 @@ diff -up evolution-3.11.90/calendar/gui/dialogs/comp-editor.c.help-contents evol action_group = gtk_action_group_new ("individual"); gtk_action_group_set_translation_domain ( action_group, GETTEXT_PACKAGE); -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 +diff -up evolution-3.11.91/e-util/e-misc-utils.c.help-contents evolution-3.11.91/e-util/e-misc-utils.c +--- evolution-3.11.91/e-util/e-misc-utils.c.help-contents 2014-02-11 14:39:16.000000000 +0100 ++++ evolution-3.11.91/e-util/e-misc-utils.c 2014-03-03 13:37:40.925928474 +0100 @@ -2102,3 +2102,20 @@ e_binding_transform_uid_to_source (GBind return success; @@ -53,9 +53,9 @@ diff -up evolution-3.11.90/e-util/e-misc-utils.c.help-contents evolution-3.11.90 + + return is_installed; +} -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 +diff -up evolution-3.11.91/e-util/e-misc-utils.h.help-contents evolution-3.11.91/e-util/e-misc-utils.h +--- evolution-3.11.91/e-util/e-misc-utils.h.help-contents 2014-03-03 01:37:23.000000000 +0100 ++++ evolution-3.11.91/e-util/e-misc-utils.h 2014-03-03 13:37:40.925928474 +0100 @@ -184,6 +184,8 @@ gboolean e_binding_transform_uid_to_sour GValue *target_value, ESourceRegistry *registry); @@ -65,9 +65,9 @@ diff -up evolution-3.11.90/e-util/e-misc-utils.h.help-contents evolution-3.11.90 G_END_DECLS #endif /* E_MISC_UTILS_H */ -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 +diff -up evolution-3.11.91/e-util/e-preferences-window.c.help-contents evolution-3.11.91/e-util/e-preferences-window.c +--- evolution-3.11.91/e-util/e-preferences-window.c.help-contents 2014-02-16 15:11:01.000000000 +0100 ++++ evolution-3.11.91/e-util/e-preferences-window.c 2014-03-03 13:37:40.925928474 +0100 @@ -385,6 +385,11 @@ e_preferences_window_init (EPreferencesW GTK_BUTTON_BOX (container), widget, TRUE); gtk_widget_show (widget); @@ -80,9 +80,9 @@ diff -up evolution-3.11.90/e-util/e-preferences-window.c.help-contents evolution widget = e_dialog_button_new_with_icon ("window-close", _("_Close")); g_signal_connect_swapped ( widget, "clicked", -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 +diff -up evolution-3.11.91/e-util/e-send-options.c.help-contents evolution-3.11.91/e-util/e-send-options.c +--- evolution-3.11.91/e-util/e-send-options.c.help-contents 2014-03-03 01:37:23.000000000 +0100 ++++ evolution-3.11.91/e-util/e-send-options.c 2014-03-03 13:37:40.925928474 +0100 @@ -439,6 +439,7 @@ get_widgets (ESendOptionsDialog *sod) { ESendOptionsDialogPrivate *priv; @@ -104,9 +104,9 @@ diff -up evolution-3.11.90/e-util/e-send-options.c.help-contents evolution-3.11. return (priv->priority && priv->security && priv->status -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 +diff -up evolution-3.11.91/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.11.91/plugins/email-custom-header/email-custom-header.c +--- evolution-3.11.91/plugins/email-custom-header/email-custom-header.c.help-contents 2014-03-03 01:37:23.000000000 +0100 ++++ evolution-3.11.91/plugins/email-custom-header/email-custom-header.c 2014-03-03 13:39:03.723924965 +0100 @@ -118,6 +118,8 @@ static gboolean epech_get_widgets (CustomHeaderOptionsDialog *mch) { @@ -118,7 +118,7 @@ diff -up evolution-3.11.90/plugins/email-custom-header/email-custom-header.c.hel #define EMAIL_CUSTOM_HEADER(name) e_builder_get_widget (priv->builder, name) @@ -128,6 +130,13 @@ epech_get_widgets (CustomHeaderOptionsDi - priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox"); + priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox"); priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options"); + + helpbutton = EMAIL_CUSTOM_HEADER ("helpbutton1"); @@ -130,9 +130,9 @@ diff -up evolution-3.11.90/plugins/email-custom-header/email-custom-header.c.hel #undef EMAIL_CUSTOM_HEADER return (priv->page -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 +diff -up evolution-3.11.91/shell/e-shell-window-actions.c.help-contents evolution-3.11.91/shell/e-shell-window-actions.c +--- evolution-3.11.91/shell/e-shell-window-actions.c.help-contents 2014-02-17 15:53:16.000000000 +0100 ++++ evolution-3.11.91/shell/e-shell-window-actions.c 2014-03-03 13:37:40.926928474 +0100 @@ -1413,6 +1413,11 @@ e_shell_window_actions_init (EShellWindo if (path == NULL) gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE); diff --git a/evolution.spec b/evolution.spec index 1b82b8d..6062392 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,8 +31,8 @@ ### Abstract ### Name: evolution -Version: 3.11.90 -Release: 2%{?dist} +Version: 3.11.91 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -518,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Mar 03 2014 Milan Crha - 3.11.91-1 +- Update to 3.11.91 + * Wed Feb 19 2014 Kalev Lember - 3.11.90-2 - Rebuilt for libgnome-desktop soname bump diff --git a/sources b/sources index c853713..e0f1d8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -837ffcf62b070cd9e9104bb4266a5c29 evolution-3.11.90.tar.xz +a26a512b2f48597f4679dba42b6498de evolution-3.11.91.tar.xz