diff --git a/SOURCES/evolution-3.28.5-webkitgtk-2.28.patch b/SOURCES/evolution-3.28.5-webkitgtk-2.28.patch new file mode 100644 index 0000000..d0f1de6 --- /dev/null +++ b/SOURCES/evolution-3.28.5-webkitgtk-2.28.patch @@ -0,0 +1,35 @@ +diff -up evolution-3.28.5/src/e-util/e-misc-utils.c.webkitgtk-2.28 evolution-3.28.5/src/e-util/e-misc-utils.c +--- evolution-3.28.5/src/e-util/e-misc-utils.c.webkitgtk-2.28 2020-06-11 15:56:03.324428384 +0200 ++++ evolution-3.28.5/src/e-util/e-misc-utils.c 2020-06-11 15:56:03.334428384 +0200 +@@ -3633,7 +3633,7 @@ e_util_claim_dbus_proxy_call_error (GDBu + g_return_if_fail (method_name != NULL); + + if (in_error && !g_error_matches (in_error, G_IO_ERROR, G_IO_ERROR_CANCELLED)) +- g_warning ("Failed to call a DBus Proxy method %s::%s: %s", ++ printf ("Failed to call a DBus Proxy method %s::%s: %s\n", + g_dbus_proxy_get_name (dbus_proxy), method_name, in_error->message); + } + +diff -up evolution-3.28.5/src/e-util/e-web-view.c.webkitgtk-2.28 evolution-3.28.5/src/e-util/e-web-view.c +--- evolution-3.28.5/src/e-util/e-web-view.c.webkitgtk-2.28 2018-07-30 15:37:05.000000000 +0200 ++++ evolution-3.28.5/src/e-util/e-web-view.c 2020-06-11 15:57:24.375430212 +0200 +@@ -1221,6 +1221,9 @@ web_view_initialize (WebKitWebView *web_ + g_object_unref (settings); + } + ++static void ++web_view_load_uri (EWebView *web_view, ++ const gchar *uri); + + static void + web_view_constructed (GObject *object) +@@ -1265,6 +1268,9 @@ web_view_constructed (GObject *object) + web_view_initialize (WEBKIT_WEB_VIEW (object)); + + web_view_set_find_controller (E_WEB_VIEW (object)); ++ ++ /* Initialize the WebPage content for WebKitGTK 2.28 */ ++ web_view_load_uri (E_WEB_VIEW (object), NULL); + } + + static void diff --git a/SPECS/evolution.spec b/SPECS/evolution.spec index 991661d..4a75431 100644 --- a/SPECS/evolution.spec +++ b/SPECS/evolution.spec @@ -31,7 +31,7 @@ Name: evolution Version: 3.28.5 -Release: 13%{?dist} +Release: 14%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -81,6 +81,9 @@ Patch09: evolution-3.28.5-gala11yetableitem-ref-child.patch # RH bug #1778799 Patch10: evolution-3.28.5-mail-account-name-sync-in-wizard.patch +# RH bug #1817143 +Patch11: evolution-3.28.5-webkitgtk-2.28.patch + ## Dependencies ### Requires: %{_bindir}/killall @@ -261,6 +264,7 @@ the functionality of the installed %{name} package. %patch08 -p1 -b .cve-2018-15587-reposition-signature-bar %patch09 -p1 -b .gala11yetableitem-ref-child %patch10 -p1 -b .mail-account-name-sync-in-wizard +%patch11 -p1 -b .webkitgtk-2.28 # Remove the welcome email from Novell for inbox in src/mail/default/*/Inbox; do @@ -559,6 +563,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %endif %changelog +* Thu Jun 11 2020 Milan Crha - 3.28.5-14 +- Related: #1817143 (Add a small patch to behave better with WebKitGTK 2.28) + * Fri May 15 2020 Milan Crha - 3.28.5-13 - Resolves: #1836165 (Cannot type the date of a meeting)