From b8a6e7c0af01a828f874efe0bb020d01bad5fb83d29ea8e249a86e7ef2bc710c Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 17 Feb 2011 12:12:31 +0000 Subject: [PATCH 1/2] Accepting request 61579 from home:yvibha:evolution thanks OBS-URL: https://build.opensuse.org/request/show/61579 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=111 --- bnc-435668-hide-accept.patch | 19 --- ...440634-forwarded-hide-accept-decline.patch | 33 ----- bnc-445996-address-conflict.patch | 35 ----- bnc-449888-handle-no-workspace.patch | 62 -------- calendar-sendbutton.patch | 140 ------------------ evolution.changes | 6 + evolution.spec | 22 +-- 7 files changed, 8 insertions(+), 309 deletions(-) delete mode 100644 bnc-435668-hide-accept.patch delete mode 100644 bnc-440634-forwarded-hide-accept-decline.patch delete mode 100644 bnc-445996-address-conflict.patch delete mode 100644 bnc-449888-handle-no-workspace.patch delete mode 100644 calendar-sendbutton.patch diff --git a/bnc-435668-hide-accept.patch b/bnc-435668-hide-accept.patch deleted file mode 100644 index 163d570..0000000 --- a/bnc-435668-hide-accept.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: plugins/itip-formatter/itip-formatter.c -=================================================================== ---- plugins/itip-formatter/itip-formatter.c.orig -+++ plugins/itip-formatter/itip-formatter.c -@@ -2115,6 +2115,14 @@ in_proper_folder (CamelFolder *folder) - if (!folder) - return res; - -+ -+ /*FIXME Currently there is no other way to identify if its a sent items -+ folder, so we just compare the folder name */ -+ if (!g_ascii_strcasecmp (folder->name, _("Sent")) || -+ !g_ascii_strcasecmp (folder->name, _("Sent Items"))) -+ return FALSE; -+ -+ - uri = mail_tools_folder_to_url (folder); - - if (mail_folder_cache_get_folder_info_flags (mail_folder_cache_get_default (), diff --git a/bnc-440634-forwarded-hide-accept-decline.patch b/bnc-440634-forwarded-hide-accept-decline.patch deleted file mode 100644 index 360473c..0000000 --- a/bnc-440634-forwarded-hide-accept-decline.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: plugins/itip-formatter/itip-formatter.c -=================================================================== ---- plugins/itip-formatter/itip-formatter.c.orig -+++ plugins/itip-formatter/itip-formatter.c -@@ -2164,6 +2164,12 @@ in_proper_folder (CamelFolder *folder) - !em_utils_folder_is_drafts (folder, uri))); - } - -+ /*FIXME: GW needs to set the drafts_folder_uri and sent_folder_uri properly. -+ A workaround till then */ -+ if (res && (!g_ascii_strcasecmp (folder->name, _("Sent")) || -+ !g_ascii_strcasecmp (folder->name, _("Sent Items")))) -+ res = 0; -+ - g_free (uri); - - return res; -@@ -2210,6 +2216,15 @@ format_itip_object (EMFormatHTML *efh, G - - response_enabled = in_proper_folder (((EMFormat*)efh)->folder); - -+ /* Do not display Accept/Decline Buttons if its a forwarded meeting request */ -+ if (response_enabled) { -+ CamelMimeMessage *msg = info->msg; -+ const char *subject = camel_mime_message_get_subject (msg); -+ -+ if (!g_ascii_strncasecmp (subject, _("[Fwd: "), 6)) -+ response_enabled = 0; -+ } -+ - if (!response_enabled) { - itip_view_set_mode (ITIP_VIEW (info->view), ITIP_VIEW_MODE_HIDE_ALL); - } else { diff --git a/bnc-445996-address-conflict.patch b/bnc-445996-address-conflict.patch deleted file mode 100644 index 4c36ada..0000000 --- a/bnc-445996-address-conflict.patch +++ /dev/null @@ -1,35 +0,0 @@ -Index: e-util/e-gui-utils.c -=================================================================== ---- e-util/e-gui-utils.c (revision 36925) -+++ e-util/e-gui-utils.c (working copy) -@@ -64,3 +64,30 @@ - - return pixbuf; - } -+ -+GtkWidget *e_create_image_widget(gchar *name, -+ gchar *string1, gchar *string2, -+ gint int1, gint int2) -+{ -+ GtkWidget *alignment = NULL; -+ GtkWidget *w; -+ -+ if (string1) { -+ w = gtk_image_new_from_icon_name ( -+ string1, GTK_ICON_SIZE_DIALOG); -+ -+ gtk_misc_set_alignment (GTK_MISC (w), 0.5, 0.5); -+ -+ alignment = gtk_widget_new(gtk_alignment_get_type(), -+ "child", w, -+ "xalign", (double) 0, -+ "yalign", (double) 0, -+ "xscale", (double) 0, -+ "yscale", (double) 0, -+ NULL); -+ -+ gtk_widget_show_all (alignment); -+ } -+ -+ return alignment; -+} diff --git a/bnc-449888-handle-no-workspace.patch b/bnc-449888-handle-no-workspace.patch deleted file mode 100644 index 0fd11ca..0000000 --- a/bnc-449888-handle-no-workspace.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff --git a/plugins/sharepoint-account-setup/SharepointAccount.cs b/plugins/sharepoint-account-setup/SharepointAccount.cs -index 61959ac..a9fad5f 100644 ---- a/plugins/sharepoint-account-setup/SharepointAccount.cs -+++ b/plugins/sharepoint-account-setup/SharepointAccount.cs -@@ -85,6 +85,44 @@ namespace Sharepoint - } - } - -+ private static FileInfo [] GetWorkSpaces () -+ { -+ int tries = 0; -+ -+ TryAgain: -+ try -+ { -+ tries = tries + 1; -+ FileInfo [] workspaces = deskIceDaemon.EnumerateWorkspaces (); -+ -+ return workspaces; -+ } -+ catch (Exception ex) -+ { -+ if (tries > 5) -+ { -+ Console.WriteLine ("Three tries exceeded"); -+ Console.WriteLine ("Could not create the account"); -+ Console.WriteLine (ex.Message); -+ return null; -+ } -+ -+ NoWorkspacesException nwex = new NoWorkspacesException (); -+ if (ex.Message.Contains (nwex.Message)) { -+ Console.WriteLine ("No workspaces found"); -+ Console.WriteLine ("Sleeping for 4 seconds"); -+ System.Threading.Thread.Sleep (1000 * 4); -+ -+ goto TryAgain; -+ } else { -+ Console.WriteLine ("Error while getting workspace. Please try again after a minute"); -+ Console.WriteLine (ex.Message); -+ } -+ } -+ -+ return null; -+ } -+ - private static void SetupFolders () - { - Console.WriteLine ("Getting folders "); -@@ -97,7 +135,11 @@ namespace Sharepoint - return; - } - -- FileInfo [] workspaces = deskIceDaemon.EnumerateWorkspaces (); -+ FileInfo [] workspaces = GetWorkSpaces (); -+ -+ if (workspaces == null) -+ return; -+ - foreach (FileInfo workspace in workspaces) - { - Folder[] folders = null; diff --git a/calendar-sendbutton.patch b/calendar-sendbutton.patch deleted file mode 100644 index fdd74c2..0000000 --- a/calendar-sendbutton.patch +++ /dev/null @@ -1,140 +0,0 @@ -=== modified file 'calendar/gui/dialogs/comp-editor.c' ---- calendar/gui/dialogs/comp-editor.c 2007-12-18 20:23:31 +0000 -+++ calendar/gui/dialogs/comp-editor.c 2007-12-18 20:33:31 +0000 -@@ -880,8 +880,8 @@ - if (!save_comp (editor)) - return FALSE; - -- if ((delegate && !e_cal_get_save_schedules (priv->client)) || (send && send_component_dialog ((GtkWindow *) editor, priv->client, priv->comp, !priv->existing_org))) { -- if ((itip_organizer_is_user (priv->comp, priv->client) || itip_sentby_is_user (priv->comp))) { -+ if ((delegate && !e_cal_get_save_schedules (priv->client)) || send) { -+ if (itip_organizer_is_user (priv->comp, priv->client)) { - if (e_cal_component_get_vtype (priv->comp) == E_CAL_COMPONENT_JOURNAL) - return comp_editor_send_comp (editor, E_CAL_COMPONENT_METHOD_PUBLISH); - else -@@ -1476,6 +1476,7 @@ - static BonoboUIVerb verbs [] = { - - BONOBO_UI_VERB ("FileSave", menu_file_save_cb), -+ BONOBO_UI_VERB ("FileSend", menu_file_save_cb), - BONOBO_UI_VERB ("CalendarPrint", menu_file_print_cb), - BONOBO_UI_VERB ("CalendarPrintPreview", menu_file_print_preview_cb), - BONOBO_UI_VERB ("FileClose", menu_file_close_cb), -@@ -1503,6 +1504,7 @@ - E_PIXMAP ("/Toolbar/FileSave", "document-save", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/FileClose", "window-close", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR), - - E_PIXMAP_END - }; -@@ -1634,6 +1636,9 @@ - bonobo_ui_component_thaw (editor->uic, NULL); - - bonobo_ui_component_set_prop (editor->uic, "/commands/FileSave", "sensitive", "0", NULL); -+ bonobo_ui_component_set_prop (editor->uic, "/commands/FileSend", "sensitive", "0", NULL); -+ -+ bonobo_ui_component_set_prop (editor->uic, "/commands/FileSend", "hidden", "1", NULL); - - /* DND support */ - gtk_drag_dest_set (GTK_WIDGET (editor), GTK_DEST_DEFAULT_ALL, drop_types, num_drop_types, GDK_ACTION_COPY|GDK_ACTION_ASK|GDK_ACTION_MOVE); -@@ -1859,9 +1864,10 @@ - priv = editor->priv; - - priv->changed = changed; -- -+ bonobo_ui_component_set_prop (editor->uic, "/commands/FileSend", "sensitive", changed ? "1" : "0" -+ , NULL); - bonobo_ui_component_set_prop (editor->uic, "/commands/FileSave", "sensitive", changed ? "1" : "0" -- , NULL); -+ , NULL); - } - - /** -@@ -1927,6 +1933,11 @@ - priv = editor->priv; - - priv->needs_send = needs_send; -+ if (needs_send) { -+ bonobo_ui_component_set_prop (editor->uic, "/commands/FileSave", "hidden", "1", NULL); -+ bonobo_ui_component_set_prop (editor->uic, "/commands/FileSend", "hidden", "0", NULL); -+ } -+ - } - - /** - -=== modified file 'calendar/gui/dialogs/comp-editor.h' ---- calendar/gui/dialogs/comp-editor.h 2007-12-18 20:23:31 +0000 -+++ calendar/gui/dialogs/comp-editor.h 2007-12-18 20:33:31 +0000 -@@ -53,9 +53,9 @@ - BonoboWindowClass parent_class; - - /* Virtual functions */ -+ void (* object_created) (CompEditor *page); - void (* set_e_cal) (CompEditor *page, ECal *client); - void (* edit_comp) (CompEditor *page, ECalComponent *comp); -- void (* object_created) (CompEditor *page); - gboolean (* send_comp) (CompEditor *page, ECalComponentItipMethod method); - } CompEditorClass; - - -=== modified file 'calendar/gui/dialogs/event-editor.c' ---- calendar/gui/dialogs/event-editor.c 2007-12-18 20:23:31 +0000 -+++ calendar/gui/dialogs/event-editor.c 2007-12-18 20:33:31 +0000 -@@ -619,7 +619,8 @@ - - if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS)) - event_page_show_options (priv->event_page); -- -+ -+ comp_editor_set_needs_send (COMP_EDITOR (ee), TRUE); - comp_editor_set_group_item (COMP_EDITOR (ee), TRUE); - if (!((flags & COMP_EDITOR_USER_ORG) || (flags & COMP_EDITOR_DELEGATE)|| (flags & COMP_EDITOR_NEW_ITEM))) - bonobo_ui_component_set_prop (editor->uic, "/commands/ActionFreeBusy", "hidden", "1", NULL); - -=== modified file 'calendar/gui/dialogs/task-editor.c' ---- calendar/gui/dialogs/task-editor.c 2007-12-18 20:23:31 +0000 -+++ calendar/gui/dialogs/task-editor.c 2007-12-18 20:33:31 +0000 -@@ -446,6 +446,9 @@ - read_only = TRUE; - - if (priv->is_assigned) { -+ -+ comp_editor_set_needs_send (COMP_EDITOR (te), TRUE); -+ - if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS)) - task_page_show_options (priv->task_page); - - -=== modified file 'ui/evolution-editor.xml' ---- ui/evolution-editor.xml 2007-12-18 20:23:31 +0000 -+++ ui/evolution-editor.xml 2007-12-18 20:33:31 +0000 -@@ -1,6 +1,7 @@ - - - -+ - - - -@@ -18,6 +19,8 @@ - - - -+ -+ - - - -@@ -53,7 +56,8 @@ - - - -- -+ -+ - - - - diff --git a/evolution.changes b/evolution.changes index 46d10e6..baedbd0 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 17 08:37:57 UTC 2011 - yvibha@novell.com + +- Removing the patches that needs rebase + These are 2.28 specific. The same code is removed from 2.32. + ------------------------------------------------------------------- Sun Feb 13 14:03:33 CET 2011 - vuntz@opensuse.org diff --git a/evolution.spec b/evolution.spec index c9140bf..46b0e8c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # -# spec file for package evolution (Version 2.32.1) +# spec file for package evolution # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -69,29 +69,19 @@ Group: Productivity/Networking/Email/Clients # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. %define evolution_base_version 2.32 Version: 2.32.1 -Release: 3 +Release: 4 # FIXME: Check if libmono-2_0-1 is dragged in by libmono-2_0-devel, then remove this BR (in mono-plugins subpackage). # FIXME: check with upstream/meego if we want to enable clutter for express mode Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.25/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM evolution-mime-scheme-handler.patch bgo#631451 vuntz@opensuse.org -- Taken from git, register mailto-related mime type Patch0: evolution-mime-scheme-handler.patch -# PATCH-NEEDS-REBASE calendar-sendbutton.patch -- It also needs a proper description and a bug number -Patch7: calendar-sendbutton.patch # PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %{_libdir}/evoldap/include Patch15: evolution-custom-openldap-includes.patch -# PATCH-NEEDS-REBASE bnc-435668-hide-accept.patch bnc#435668 -- Meetings In SentItems Should Hide Accept/Decline. (WAS: PATCH-FIX-UPSTREAM) -Patch18: bnc-435668-hide-accept.patch # PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column. Patch19: bnc-435722-book-uri-long.patch # PATCH-FIX-UPSTREAM bnc-210959-evo-accept-ics.patch bnc210959 pchenthill@novell.com -- Patch yet to be pushed upstream. Patch35: bnc-210959-evo-accept-ics.patch -# PATCH-NEEDS-REBASE bnc-449888-handle-no-workspace.patch bnc449888 pchenthill@suse.de -- Patch needs to be upstreamed. (WAS: PATCH-FIX-UPSTREAM) -Patch42: bnc-449888-handle-no-workspace.patch -# PATCH-NEEDS-REBASE bnc-440634-forwarded-hide-accept-decline.patch bnc440634 abharath@suse.de -- Make GW understand folders better. (WAS: PATCH-FIX-SLED) -Patch53: bnc-440634-forwarded-hide-accept-decline.patch -# PATCH-NEEDS-REBASE bnc-445996-address-conflict.patch bnc445996 shashish@suse.de -- Needs to be moved out of glade files. (was PATCH-FIX-SLED) -Patch54: bnc-445996-address-conflict.patch # PATCH-FIX-UPSTREAM evolution-mono2.patch dimstar@opensuse.org -- Build against mono-2. Patch is not ready to be upstreamed in this form. Patch55: evolution-mono2.patch Url: http://gnome.org/projects/evolution/ @@ -180,19 +170,11 @@ Evolution or embed the existing ones in other applications. %setup -q translation-update-upstream %patch0 -p1 -# %patch7 %if %USE_EVOLDAP %patch15 -p1 %endif -# NEEDS REBASE -#%patch18 %patch19 %patch35 -# NEEDS-REBASE -#%patch42 -p1 -# NEEDS REBASE -#%patch53 -#%patch54 %if %{?suse_version} > 1130 %patch55 -p1 %endif From dd14a71df249a15b299ac30b4db6dd8521cad650b38d6fc850739629bd4f3ab8 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 17 Feb 2011 12:14:23 +0000 Subject: [PATCH 2/2] Accepting request 61592 from home:vuntz:branches:GNOME:Factory Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/61592 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=112 --- evolution.changes | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/evolution.changes b/evolution.changes index baedbd0..6652be5 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,8 +1,12 @@ ------------------------------------------------------------------- Thu Feb 17 08:37:57 UTC 2011 - yvibha@novell.com -- Removing the patches that needs rebase - These are 2.28 specific. The same code is removed from 2.32. +- Drop bnc-435668-hide-accept.patch, + bnc-440634-forwarded-hide-accept-decline.patch, + bnc-445996-address-conflict.patch, + bnc-449888-handle-no-workspace.patch, calendar-sendbutton.patch: + those patches all needed rebase, but were specific to evolution + 2.28. The code has been removed since then. ------------------------------------------------------------------- Sun Feb 13 14:03:33 CET 2011 - vuntz@opensuse.org