rpms
/
evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import evolution-3.28.5-16.el8

This commit is contained in:
CentOS Sources 2020-11-30 18:09:17 +00:00 committed by Andrew Lukoshko
parent 064b03f136
commit c0dc8359e3
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
SOURCES/evolution-3.28.5-webkitgtk-2.30.patch Normal file
View File

@ -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

9
SPECS/evolution.spec
View File

@ -31,7 +31,7 @@
Name: evolution
Version: 3.28.5
Release: 15%{?dist}
Release: 16%{?dist}
Group: Applications/Productivity
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
@ -87,6 +87,9 @@ 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
@ -269,6 +272,7 @@ the functionality of the installed %{name} package.
%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
@ -567,6 +571,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
%endif
%changelog
* Mon Nov 30 2020 Milan Crha <mcrha@redhat.com> - 3.28.5-16
- Resolves: #1902630 (Crash on file drag into mail composer with WebKitGTK 2.30)
* Wed Sep 30 2020 Milan Crha <mcrha@redhat.com> - 3.28.5-15
- Resolves: #1883619 (ECalendarItem: Settings loaded only when being shown)