From c63d15b4065056ee7b9aded6fdf933d097270dc9 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 14 Feb 2020 11:09:54 +0100 Subject: [PATCH 01/10] Update to 3.35.91 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 0130cf8..7c674dd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -40,7 +40,7 @@ ### Abstract ### Name: evolution -Version: 3.35.90 +Version: 3.35.91 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Feb 14 2020 Milan Crha - 3.35.91-1 +- Update to 3.35.91 + * Fri Jan 31 2020 Milan Crha - 3.35.90-1 - Update to 3.35.90 diff --git a/sources b/sources index 32e14d3..30496e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.35.90.tar.xz) = f6f44ba79e1358679e25304e1c26be4c4fa1af22153ac3295bae614ff20a7643051332bba8d559576b98a6dadb621b446a991acc5aa9e48a3783112db843e1f4 +SHA512 (evolution-3.35.91.tar.xz) = 8595e0cd2e7873522cb0349a130020d5ad24c8bab03195e2377afde95edda1b01983302566f0e12fb4d131313f03ddb3ddb60791138e94ddbc6d7f4281e46b0d From 4765575e88160deb39cef9ca8c4546e98c4e4fc3 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 28 Feb 2020 10:28:43 +0100 Subject: [PATCH 02/10] Update to 3.35.92 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 7c674dd..0bc1369 100644 --- a/evolution.spec +++ b/evolution.spec @@ -40,7 +40,7 @@ ### Abstract ### Name: evolution -Version: 3.35.91 +Version: 3.35.92 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Feb 28 2020 Milan Crha - 3.35.92-1 +- Update to 3.35.92 + * Fri Feb 14 2020 Milan Crha - 3.35.91-1 - Update to 3.35.91 diff --git a/sources b/sources index 30496e6..df81f2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.35.91.tar.xz) = 8595e0cd2e7873522cb0349a130020d5ad24c8bab03195e2377afde95edda1b01983302566f0e12fb4d131313f03ddb3ddb60791138e94ddbc6d7f4281e46b0d +SHA512 (evolution-3.35.92.tar.xz) = ffd0feeae09bb56da9ce983de818da64cec137b9d1e0bbdf2fdf5e6cf992a4e9bc58e7fd9824db71a7459746211cf1dc4c6f3f4b9a2577a0362a6e4f105d01c1 From a7cc0c74b2059b37fdca891909b6bcccb81e53b1 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 6 Mar 2020 08:50:29 +0100 Subject: [PATCH 03/10] Update to 3.36.0 --- evolution.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 0bc1369..676691a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -40,12 +40,12 @@ ### Abstract ### Name: evolution -Version: 3.35.92 +Version: 3.36.0 Release: 1%{?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 @@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Mar 06 2020 Milan Crha - 3.36.0-1 +- Update to 3.36.0 + * Fri Feb 28 2020 Milan Crha - 3.35.92-1 - Update to 3.35.92 diff --git a/sources b/sources index df81f2b..393899b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.35.92.tar.xz) = ffd0feeae09bb56da9ce983de818da64cec137b9d1e0bbdf2fdf5e6cf992a4e9bc58e7fd9824db71a7459746211cf1dc4c6f3f4b9a2577a0362a6e4f105d01c1 +SHA512 (evolution-3.36.0.tar.xz) = 606584de713c637b95b190898c28b8d0670b7f5d700a36f8b613a135d79912141bfa14aad600c4d9b2227f9e2de982c1ca5894e69a78381a4e19abbc669906d5 From adc902860a02f3bb039fb6dbdf964ba63865efec Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 27 Mar 2020 09:41:35 +0100 Subject: [PATCH 04/10] Update to 3.36.1 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 676691a..1106855 100644 --- a/evolution.spec +++ b/evolution.spec @@ -40,7 +40,7 @@ ### Abstract ### Name: evolution -Version: 3.36.0 +Version: 3.36.1 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Mar 27 2020 Milan Crha - 3.36.1-1 +- Update to 3.36.1 + * Fri Mar 06 2020 Milan Crha - 3.36.0-1 - Update to 3.36.0 diff --git a/sources b/sources index 393899b..eb35eb9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.36.0.tar.xz) = 606584de713c637b95b190898c28b8d0670b7f5d700a36f8b613a135d79912141bfa14aad600c4d9b2227f9e2de982c1ca5894e69a78381a4e19abbc669906d5 +SHA512 (evolution-3.36.1.tar.xz) = 626e80494553dd2e9670d09453694a3d406924a961a4842720f5fdffbad7250922a3c0ccc5e1f477e6249767b2387e41c6b59db88948e4c74a1c6bb241354c3e From d3eebc2e94d09a00ee5a6810cd6a5c01025670a1 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 24 Apr 2020 10:37:54 +0200 Subject: [PATCH 05/10] Update to 3.36.2 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 1106855..fa4b1cd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -40,7 +40,7 @@ ### Abstract ### Name: evolution -Version: 3.36.1 +Version: 3.36.2 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Apr 24 2020 Milan Crha - 3.36.2-1 +- Update to 3.36.2 + * Fri Mar 27 2020 Milan Crha - 3.36.1-1 - Update to 3.36.1 diff --git a/sources b/sources index eb35eb9..8c27124 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.36.1.tar.xz) = 626e80494553dd2e9670d09453694a3d406924a961a4842720f5fdffbad7250922a3c0ccc5e1f477e6249767b2387e41c6b59db88948e4c74a1c6bb241354c3e +SHA512 (evolution-3.36.2.tar.xz) = 2dccf69d32c4381f40ccdf84b621b8241c22bdb992cb77a87ce2e62e3598c436e7d0f8b72ce4fe504399c04a38266b0b0c2abf04000267a16c242d2dec7b9e9c From 9f37d7f67ad4adba84ead6a9cd1548f5c6062496 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 29 May 2020 14:41:25 +0200 Subject: [PATCH 06/10] Update to 3.36.3 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index fa4b1cd..02bedf9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -40,7 +40,7 @@ ### Abstract ### Name: evolution -Version: 3.36.2 +Version: 3.36.3 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri May 29 2020 Milan Crha - 3.36.3-1 +- Update to 3.36.3 + * Fri Apr 24 2020 Milan Crha - 3.36.2-1 - Update to 3.36.2 diff --git a/sources b/sources index 8c27124..56116e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.36.2.tar.xz) = 2dccf69d32c4381f40ccdf84b621b8241c22bdb992cb77a87ce2e62e3598c436e7d0f8b72ce4fe504399c04a38266b0b0c2abf04000267a16c242d2dec7b9e9c +SHA512 (evolution-3.36.3.tar.xz) = 867482e4532ddddb63dbe382df0daa1058e1509172c1c80aa9f3b73574509f1def9ab0694f66ceaf9590bde761087ad7d0bcd62ddef3e477697614eb36ac530d From e66769759729ff1f1c36455a2a7e85783e0c9757 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 3 Jul 2020 09:42:55 +0200 Subject: [PATCH 07/10] Update to 3.36.4 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 02bedf9..9921e74 100644 --- a/evolution.spec +++ b/evolution.spec @@ -40,7 +40,7 @@ ### Abstract ### Name: evolution -Version: 3.36.3 +Version: 3.36.4 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Jul 03 2020 Milan Crha - 3.36.4-1 +- Update to 3.36.4 + * Fri May 29 2020 Milan Crha - 3.36.3-1 - Update to 3.36.3 diff --git a/sources b/sources index 56116e4..278ba3d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.36.3.tar.xz) = 867482e4532ddddb63dbe382df0daa1058e1509172c1c80aa9f3b73574509f1def9ab0694f66ceaf9590bde761087ad7d0bcd62ddef3e477697614eb36ac530d +SHA512 (evolution-3.36.4.tar.xz) = e5632dc5c88d60a517ab2858474d154df78f5ca85c2270329f2148647b177649174388091ed164e6162e1ada7d76bd7be63fb02bbb5926154af406e0b016b6a7 From f54ef08c3cd5b1e23ce867dae5917de3ebdbeca9 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 7 Aug 2020 10:01:12 +0200 Subject: [PATCH 08/10] Update to 3.36.5 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 9921e74..03548cf 100644 --- a/evolution.spec +++ b/evolution.spec @@ -40,7 +40,7 @@ ### Abstract ### Name: evolution -Version: 3.36.4 +Version: 3.36.5 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Aug 07 2020 Milan Crha - 3.36.5-1 +- Update to 3.36.5 + * Fri Jul 03 2020 Milan Crha - 3.36.4-1 - Update to 3.36.4 diff --git a/sources b/sources index 278ba3d..8d819c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.36.4.tar.xz) = e5632dc5c88d60a517ab2858474d154df78f5ca85c2270329f2148647b177649174388091ed164e6162e1ada7d76bd7be63fb02bbb5926154af406e0b016b6a7 +SHA512 (evolution-3.36.5.tar.xz) = 4f3a7e891f6e0bb8f3d44f838ecf0f373ad1133f465af3a0ab68e9ec9220e67025dc4e657c73bb8c212d958669e5285050234fb43b6bf0596bcd662de1ef9fd0 From 934340d9dfe2a1d6e4f7295cf9d5552737487bb7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 23 Nov 2020 11:28:57 +0100 Subject: [PATCH 09/10] Flatpak: Do not start gpg-agent in the Fedora build 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. --- flatpak-evolution-wrapper.sh.in | 4 ---- 1 file changed, 4 deletions(-) diff --git a/flatpak-evolution-wrapper.sh.in b/flatpak-evolution-wrapper.sh.in index c57bfbe..6a311fc 100644 --- a/flatpak-evolution-wrapper.sh.in +++ b/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 From cd8aa57c8b6a5162dbfa8a774965cdccbf85247e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 30 Nov 2020 09:27:46 +0100 Subject: [PATCH 10/10] Resolves: #1888558 (Crash on file drag into mail composer with WebKitGTK 2.30) --- evolution-3.36.5-webkitgtk-2.30.patch | 39 +++++++++++++++++++++++++++ evolution.spec | 8 +++++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 evolution-3.36.5-webkitgtk-2.30.patch diff --git a/evolution-3.36.5-webkitgtk-2.30.patch b/evolution-3.36.5-webkitgtk-2.30.patch new file mode 100644 index 0000000..d9135f9 --- /dev/null +++ b/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 diff --git a/evolution.spec b/evolution.spec index 03548cf..9ff3246 100644 --- a/evolution.spec +++ b/evolution.spec @@ -41,7 +41,7 @@ Name: evolution Version: 3.36.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution @@ -49,6 +49,8 @@ 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,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Mon Nov 30 2020 Milan Crha - 3.36.5-2 +- Resolves: #1888558 (Crash on file drag into mail composer with WebKitGTK 2.30) + * Fri Aug 07 2020 Milan Crha - 3.36.5-1 - Update to 3.36.5