Resolves: #1888558 (Crash on file drag into mail composer with WebKitGTK 2.30)

This is looking for a system-installed pinentry, in contrast to
the Flathub build, which builds its own pinentry, thus no need
to override where the pinentry is installed in the Fedora Flatpak.

evolution-3.36.5-webkitgtk-2.30.patch

@@ -0,0 +1,39 @@
+diff -up evolution-3.36.5/src/modules/webkit-editor/e-webkit-editor.c.webkitgtk-2.30 evolution-3.36.5/src/modules/webkit-editor/e-webkit-editor.c
+--- evolution-3.36.5/src/modules/webkit-editor/e-webkit-editor.c.webkitgtk-2.30	2020-08-07 09:38:49.000000000 +0200
++++ evolution-3.36.5/src/modules/webkit-editor/e-webkit-editor.c	2020-11-30 09:25:45.562429340 +0100
+@@ -6152,11 +6152,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");
+@@ -6384,7 +6385,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
+@@ -6457,7 +6459,8 @@ webkit_editor_key_press_event (GtkWidget
+ 		return FALSE;
+ 
+ 	/* 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

evolution.spec

@@ -40,15 +40,17 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.35.90
-Release: 1%{?dist}
+Version: 3.36.5
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.35/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.36/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
+Patch01: evolution-3.36.5-webkitgtk-2.30.patch
+
 Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
 Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
@@ -235,6 +237,7 @@ the functionality of the installed %{name} package.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch01 -p1 -b .webkitgtk-2.30
 
 # Remove the welcome email from Novell
 for inbox in src/mail/default/*/Inbox; do
@@ -560,6 +563,33 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Nov 30 2020 Milan Crha <mcrha@redhat.com> - 3.36.5-2
+- Resolves: #1888558 (Crash on file drag into mail composer with WebKitGTK 2.30)
+
+* Fri Aug 07 2020 Milan Crha <mcrha@redhat.com> - 3.36.5-1
+- Update to 3.36.5
+
+* Fri Jul 03 2020 Milan Crha <mcrha@redhat.com> - 3.36.4-1
+- Update to 3.36.4
+
+* Fri May 29 2020 Milan Crha <mcrha@redhat.com> - 3.36.3-1
+- Update to 3.36.3
+
+* Fri Apr 24 2020 Milan Crha <mcrha@redhat.com> - 3.36.2-1
+- Update to 3.36.2
+
+* Fri Mar 27 2020 Milan Crha <mcrha@redhat.com> - 3.36.1-1
+- Update to 3.36.1
+
+* Fri Mar 06 2020 Milan Crha <mcrha@redhat.com> - 3.36.0-1
+- Update to 3.36.0
+
+* Fri Feb 28 2020 Milan Crha <mcrha@redhat.com> - 3.35.92-1
+- Update to 3.35.92
+
+* Fri Feb 14 2020 Milan Crha <mcrha@redhat.com> - 3.35.91-1
+- Update to 3.35.91
+
 * Fri Jan 31 2020 Milan Crha <mcrha@redhat.com> - 3.35.90-1
 - Update to 3.35.90
 

flatpak-evolution-wrapper.sh.in

@@ -7,8 +7,6 @@ else
    export GIO_USE_NETWORK_MONITOR=base
    gsettings reset org.gnome.evolution-data-server network-monitor-gio-name
 
-   gpg-agent --homedir ~/.gnupg --daemon --pinentry-program=/app/bin/pinentry
-
    LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc -l)
    if [ "${LINES}" = "0" ]; then
       /app/libexec/evolution-source-registry &
@@ -28,6 +26,4 @@ else
    fi
 
    /app/bin/evolution.bin "$@"
-
-   pkill -TERM gpg-agent
 fi

sources

@@ -1 +1 @@
-SHA512 (evolution-3.35.90.tar.xz) = f6f44ba79e1358679e25304e1c26be4c4fa1af22153ac3295bae614ff20a7643051332bba8d559576b98a6dadb621b446a991acc5aa9e48a3783112db843e1f4
+SHA512 (evolution-3.36.5.tar.xz) = 4f3a7e891f6e0bb8f3d44f838ecf0f373ad1133f465af3a0ab68e9ec9220e67025dc4e657c73bb8c212d958669e5285050234fb43b6bf0596bcd662de1ef9fd0