From bd4d130074f605f44e3063127423a2931a62dc80 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 14 Apr 2014 11:17:09 +0200 Subject: [PATCH] Update to 3.12.1 --- .gitignore | 1 + evolution-2.30.1-help-contents.patch | 65 +++++++++++++++------------- evolution.spec | 5 ++- sources | 2 +- 4 files changed, 40 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index b135ad9..641882e 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.11.91.tar.xz /evolution-3.11.92.tar.xz /evolution-3.12.0.tar.xz +/evolution-3.12.1.tar.xz diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch index a466d32..ba5c29b 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.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 +diff -up evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c +--- evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-04-13 16:33:29.000000000 +0200 ++++ evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c 2014-04-14 11:15:36.606320997 +0200 @@ -4281,6 +4281,11 @@ e_contact_editor_init (EContactEditor *e g_signal_connect ( widget, "clicked", @@ -13,9 +13,9 @@ diff -up evolution-3.11.91/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.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 +diff -up evolution-3.12.1/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.12.1/calendar/gui/dialogs/comp-editor.c +--- evolution-3.12.1/calendar/gui/dialogs/comp-editor.c.help-contents 2014-04-13 16:33:29.000000000 +0200 ++++ evolution-3.12.1/calendar/gui/dialogs/comp-editor.c 2014-04-14 11:15:36.606320997 +0200 @@ -2168,6 +2168,12 @@ comp_editor_init (CompEditor *editor) G_BINDING_SYNC_CREATE); } @@ -29,14 +29,13 @@ diff -up evolution-3.11.91/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.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 - +diff -up evolution-3.12.1/e-util/e-misc-utils.c.help-contents evolution-3.12.1/e-util/e-misc-utils.c +--- evolution-3.12.1/e-util/e-misc-utils.c.help-contents 2014-04-14 11:15:36.606320997 +0200 ++++ evolution-3.12.1/e-util/e-misc-utils.c 2014-04-14 11:15:47.698320550 +0200 +@@ -2103,6 +2103,23 @@ e_binding_transform_uid_to_source (GBind return success; } -+ + +gboolean +e_misc_utils_is_help_package_installed (void) +{ @@ -53,21 +52,25 @@ diff -up evolution-3.11.91/e-util/e-misc-utils.c.help-contents evolution-3.11.91 + + return is_installed; +} -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 ++ + /** + * e_binding_transform_text_non_null: + * @binding: a #GBinding +diff -up evolution-3.12.1/e-util/e-misc-utils.h.help-contents evolution-3.12.1/e-util/e-misc-utils.h +--- evolution-3.12.1/e-util/e-misc-utils.h.help-contents 2014-04-14 11:15:36.607320997 +0200 ++++ evolution-3.12.1/e-util/e-misc-utils.h 2014-04-14 11:16:06.930319775 +0200 @@ -184,6 +184,8 @@ gboolean e_binding_transform_uid_to_sour GValue *target_value, ESourceRegistry *registry); +gboolean e_misc_utils_is_help_package_installed (void); + - G_END_DECLS - - #endif /* E_MISC_UTILS_H */ -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 + gboolean e_binding_transform_text_non_null + (GBinding *binding, + const GValue *source_value, +diff -up evolution-3.12.1/e-util/e-preferences-window.c.help-contents evolution-3.12.1/e-util/e-preferences-window.c +--- evolution-3.12.1/e-util/e-preferences-window.c.help-contents 2014-03-23 02:13:17.000000000 +0100 ++++ evolution-3.12.1/e-util/e-preferences-window.c 2014-04-14 11:15:36.607320997 +0200 @@ -385,6 +385,11 @@ e_preferences_window_init (EPreferencesW GTK_BUTTON_BOX (container), widget, TRUE); gtk_widget_show (widget); @@ -80,9 +83,9 @@ diff -up evolution-3.11.91/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.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 +diff -up evolution-3.12.1/e-util/e-send-options.c.help-contents evolution-3.12.1/e-util/e-send-options.c +--- evolution-3.12.1/e-util/e-send-options.c.help-contents 2014-04-13 16:33:29.000000000 +0200 ++++ evolution-3.12.1/e-util/e-send-options.c 2014-04-14 11:15:36.607320997 +0200 @@ -439,6 +439,7 @@ get_widgets (ESendOptionsDialog *sod) { ESendOptionsDialogPrivate *priv; @@ -104,9 +107,9 @@ diff -up evolution-3.11.91/e-util/e-send-options.c.help-contents evolution-3.11. return (priv->priority && priv->security && priv->status -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 +diff -up evolution-3.12.1/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.12.1/plugins/email-custom-header/email-custom-header.c +--- evolution-3.12.1/plugins/email-custom-header/email-custom-header.c.help-contents 2014-03-23 02:13:18.000000000 +0100 ++++ evolution-3.12.1/plugins/email-custom-header/email-custom-header.c 2014-04-14 11:15:36.607320997 +0200 @@ -118,6 +118,8 @@ static gboolean epech_get_widgets (CustomHeaderOptionsDialog *mch) { @@ -130,10 +133,10 @@ diff -up evolution-3.11.91/plugins/email-custom-header/email-custom-header.c.hel #undef EMAIL_CUSTOM_HEADER return (priv->page -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 +diff -up evolution-3.12.1/shell/e-shell-window-actions.c.help-contents evolution-3.12.1/shell/e-shell-window-actions.c +--- evolution-3.12.1/shell/e-shell-window-actions.c.help-contents 2014-03-23 02:13:19.000000000 +0100 ++++ evolution-3.12.1/shell/e-shell-window-actions.c 2014-04-14 11:15:36.607320997 +0200 +@@ -1458,6 +1458,11 @@ e_shell_window_actions_init (EShellWindo if (path == NULL) gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE); g_free (path); diff --git a/evolution.spec b/evolution.spec index b190b45..c6b53d9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,7 +30,7 @@ ### Abstract ### Name: evolution -Version: 3.12.0 +Version: 3.12.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -529,6 +529,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Apr 14 2014 Milan Crha - 3.12.1-1 +- Update to 3.12.1 + * Mon Mar 24 2014 Milan Crha - 3.12.0-1 - Update to 3.12.0 diff --git a/sources b/sources index 4f277f7..5c2ceb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5ec7a2828eef2dac3da2a1de18d1188c evolution-3.12.0.tar.xz +03fd35c2ec39a90221c16400f8797623 evolution-3.12.1.tar.xz