From 007bd608c71064ef2a7605010f1ab9575579b7d9 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 18 May 2021 02:48:45 -0400 Subject: [PATCH] import evolution-3.28.5-16.el8 --- ...lution-3.28.5-ecalendaritem-settings.patch | 156 ++++++++++++++++++ SOURCES/evolution-3.28.5-webkitgtk-2.30.patch | 39 +++++ SPECS/evolution.spec | 16 +- 3 files changed, 210 insertions(+), 1 deletion(-) create mode 100644 SOURCES/evolution-3.28.5-ecalendaritem-settings.patch create mode 100644 SOURCES/evolution-3.28.5-webkitgtk-2.30.patch diff --git a/SOURCES/evolution-3.28.5-ecalendaritem-settings.patch b/SOURCES/evolution-3.28.5-ecalendaritem-settings.patch new file mode 100644 index 0000000..bcc24d1 --- /dev/null +++ b/SOURCES/evolution-3.28.5-ecalendaritem-settings.patch @@ -0,0 +1,156 @@ +diff -up evolution-3.28.5/src/e-util/e-calendar-item.c.ecalendaritem-settings evolution-3.28.5/src/e-util/e-calendar-item.c +--- evolution-3.28.5/src/e-util/e-calendar-item.c.ecalendaritem-settings 2018-07-30 15:37:05.000000000 +0200 ++++ evolution-3.28.5/src/e-util/e-calendar-item.c 2020-09-30 15:16:45.798634705 +0200 +@@ -45,6 +45,7 @@ static const gint e_calendar_item_days_i + e_calendar_item_days_in_month[month] + (((month) == 1 \ + && ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0))) ? 1 : 0) + ++static void e_calendar_item_constructed (GObject *object); + static void e_calendar_item_dispose (GObject *object); + static void e_calendar_item_get_property (GObject *object, + guint property_id, +@@ -264,6 +265,7 @@ e_calendar_item_class_init (ECalendarIte + GnomeCanvasItemClass *item_class; + + object_class = G_OBJECT_CLASS (class); ++ object_class->constructed = e_calendar_item_constructed; + object_class->dispose = e_calendar_item_dispose; + object_class->get_property = e_calendar_item_get_property; + object_class->set_property = e_calendar_item_set_property; +@@ -637,6 +639,16 @@ e_calendar_item_init (ECalendarItem *cal + } + + static void ++e_calendar_item_constructed (GObject *object) ++{ ++ ECalendarItem *calitem = E_CALENDAR_ITEM (object); ++ ++ G_OBJECT_CLASS (e_calendar_item_parent_class)->constructed (object); ++ ++ e_extensible_load_extensions (E_EXTENSIBLE (calitem)); ++} ++ ++static void + e_calendar_item_dispose (GObject *object) + { + ECalendarItem *calitem; +@@ -787,28 +799,32 @@ e_calendar_item_set_property (GObject *o + dvalue = g_value_get_double (value); + if (calitem->x1 != dvalue) { + calitem->x1 = dvalue; +- gnome_canvas_item_request_update (item); ++ if (item->canvas) ++ gnome_canvas_item_request_update (item); + } + return; + case PROP_Y1: + dvalue = g_value_get_double (value); + if (calitem->y1 != dvalue) { + calitem->y1 = dvalue; +- gnome_canvas_item_request_update (item); ++ if (item->canvas) ++ gnome_canvas_item_request_update (item); + } + return; + case PROP_X2: + dvalue = g_value_get_double (value); + if (calitem->x2 != dvalue) { + calitem->x2 = dvalue; +- gnome_canvas_item_request_update (item); ++ if (item->canvas) ++ gnome_canvas_item_request_update (item); + } + return; + case PROP_Y2: + dvalue = g_value_get_double (value); + if (calitem->y2 != dvalue) { + calitem->y2 = dvalue; +- gnome_canvas_item_request_update (item); ++ if (item->canvas) ++ gnome_canvas_item_request_update (item); + } + return; + case PROP_FONT_DESC: +@@ -816,21 +832,24 @@ e_calendar_item_set_property (GObject *o + if (calitem->font_desc) + pango_font_description_free (calitem->font_desc); + calitem->font_desc = pango_font_description_copy (font_desc); +- gnome_canvas_item_request_update (item); ++ if (item->canvas) ++ gnome_canvas_item_request_update (item); + return; + case PROP_WEEK_NUMBER_FONT_DESC: + font_desc = g_value_get_boxed (value); + if (calitem->week_number_font_desc) + pango_font_description_free (calitem->week_number_font_desc); + calitem->week_number_font_desc = pango_font_description_copy (font_desc); +- gnome_canvas_item_request_update (item); ++ if (item->canvas) ++ gnome_canvas_item_request_update (item); + return; + case PROP_MINIMUM_ROWS: + ivalue = g_value_get_int (value); + ivalue = MAX (1, ivalue); + if (calitem->min_rows != ivalue) { + calitem->min_rows = ivalue; +- gnome_canvas_item_request_update (item); ++ if (item->canvas) ++ gnome_canvas_item_request_update (item); + } + return; + case PROP_MINIMUM_COLUMNS: +@@ -838,35 +857,40 @@ e_calendar_item_set_property (GObject *o + ivalue = MAX (1, ivalue); + if (calitem->min_cols != ivalue) { + calitem->min_cols = ivalue; +- gnome_canvas_item_request_update (item); ++ if (item->canvas) ++ gnome_canvas_item_request_update (item); + } + return; + case PROP_MAXIMUM_ROWS: + ivalue = g_value_get_int (value); + if (calitem->max_rows != ivalue) { + calitem->max_rows = ivalue; +- gnome_canvas_item_request_update (item); ++ if (item->canvas) ++ gnome_canvas_item_request_update (item); + } + return; + case PROP_MAXIMUM_COLUMNS: + ivalue = g_value_get_int (value); + if (calitem->max_cols != ivalue) { + calitem->max_cols = ivalue; +- gnome_canvas_item_request_update (item); ++ if (item->canvas) ++ gnome_canvas_item_request_update (item); + } + return; + case PROP_WEEK_START_DAY: + ivalue = g_value_get_enum (value); + if (calitem->week_start_day != ivalue) { + calitem->week_start_day = ivalue; +- gnome_canvas_item_request_update (item); ++ if (item->canvas) ++ gnome_canvas_item_request_update (item); + } + return; + case PROP_SHOW_WEEK_NUMBERS: + bvalue = g_value_get_boolean (value); + if (calitem->show_week_numbers != bvalue) { + calitem->show_week_numbers = bvalue; +- gnome_canvas_item_request_update (item); ++ if (item->canvas) ++ gnome_canvas_item_request_update (item); + } + return; + case PROP_KEEP_WDAYS_ON_WEEKNUM_CLICK: +@@ -908,8 +932,6 @@ e_calendar_item_realize (GnomeCanvasItem + calitem = E_CALENDAR_ITEM (item); + + e_calendar_item_style_updated (GTK_WIDGET (item->canvas), calitem); +- +- e_extensible_load_extensions (E_EXTENSIBLE (calitem)); + } + + static void diff --git a/SOURCES/evolution-3.28.5-webkitgtk-2.30.patch b/SOURCES/evolution-3.28.5-webkitgtk-2.30.patch new file mode 100644 index 0000000..7ec8815 --- /dev/null +++ b/SOURCES/evolution-3.28.5-webkitgtk-2.30.patch @@ -0,0 +1,39 @@ +diff -up evolution-3.28.5/src/modules/webkit-editor/e-webkit-editor.c.webkitgtk-2.30 evolution-3.28.5/src/modules/webkit-editor/e-webkit-editor.c +--- evolution-3.28.5/src/modules/webkit-editor/e-webkit-editor.c.webkitgtk-2.30 2018-07-30 15:37:05.000000000 +0200 ++++ evolution-3.28.5/src/modules/webkit-editor/e-webkit-editor.c 2020-11-30 10:37:53.797115765 +0100 +@@ -6111,11 +6111,12 @@ webkit_editor_drag_data_received_cb (Gtk + info == E_DND_TARGET_TYPE_UTF8_STRING || info == E_DND_TARGET_TYPE_STRING || + info == E_DND_TARGET_TYPE_TEXT_PLAIN || info == E_DND_TARGET_TYPE_TEXT_PLAIN_UTF8) { + gdk_drag_status (context, gdk_drag_context_get_selected_action(context), time); +- if (!GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->drag_drop (widget, context, x, y, time)) { +- g_warning ("Drop failed in WebKit"); ++ if (!GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->drag_drop || ++ !GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->drag_drop (widget, context, x, y, time)) { + goto process_ourselves; + } else { +- GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->drag_leave(widget, context, time); ++ if (GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->drag_leave) ++ GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->drag_leave (widget, context, time); + g_signal_stop_emission_by_name (widget, "drag-data-received"); + if (!is_move) + webkit_editor_call_simple_extension_function (wk_editor, "DOMLastDropOperationDidCopy"); +@@ -6321,7 +6322,8 @@ webkit_editor_button_press_event (GtkWid + } + + /* Chain up to parent's button_press_event() method. */ +- return GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->button_press_event (widget, event); ++ return GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->button_press_event && ++ GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->button_press_event (widget, event); + } + + static gboolean +@@ -6378,7 +6380,8 @@ webkit_editor_key_press_event (GtkWidget + } + + /* Chain up to parent's key_press_event() method. */ +- return GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->key_press_event (widget, event); ++ return GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->key_press_event && ++ GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->key_press_event (widget, event); + } + + static void diff --git a/SPECS/evolution.spec b/SPECS/evolution.spec index 4a75431..bd7cb10 100644 --- a/SPECS/evolution.spec +++ b/SPECS/evolution.spec @@ -31,7 +31,7 @@ Name: evolution Version: 3.28.5 -Release: 14%{?dist} +Release: 16%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -84,6 +84,12 @@ Patch10: evolution-3.28.5-mail-account-name-sync-in-wizard.patch # RH bug #1817143 Patch11: evolution-3.28.5-webkitgtk-2.28.patch +# RH bug #1883619 +Patch12: evolution-3.28.5-ecalendaritem-settings.patch + +# RH bug #1902630 +Patch13: evolution-3.28.5-webkitgtk-2.30.patch + ## Dependencies ### Requires: %{_bindir}/killall @@ -265,6 +271,8 @@ the functionality of the installed %{name} package. %patch09 -p1 -b .gala11yetableitem-ref-child %patch10 -p1 -b .mail-account-name-sync-in-wizard %patch11 -p1 -b .webkitgtk-2.28 +%patch12 -p1 -b .ecalendaritem-settings +%patch13 -p1 -b .webkitgtk-2.30 # Remove the welcome email from Novell for inbox in src/mail/default/*/Inbox; do @@ -563,6 +571,12 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %endif %changelog +* Mon Nov 30 2020 Milan Crha - 3.28.5-16 +- Resolves: #1902630 (Crash on file drag into mail composer with WebKitGTK 2.30) + +* Wed Sep 30 2020 Milan Crha - 3.28.5-15 +- Resolves: #1883619 (ECalendarItem: Settings loaded only when being shown) + * Thu Jun 11 2020 Milan Crha - 3.28.5-14 - Related: #1817143 (Add a small patch to behave better with WebKitGTK 2.28)