diff -Nru evolution-3.28.5/debian/changelog evolution-3.28.5/debian/changelog --- evolution-3.28.5/debian/changelog 2018-07-31 14:34:24.000000000 +0000 +++ evolution-3.28.5/debian/changelog 2020-03-24 15:27:49.000000000 +0000 @@ -1,3 +1,11 @@ +evolution (3.28.5-0ubuntu0.18.04.2) bionic; urgency=medium + + * debian/patches/ubuntu_gettext_domain.patch: + - backport an upstream commit to fix a regression with newer webkitgtk + which leads html email to be rendered in white (lp: #1841646) + + -- Sebastien Bacher Tue, 24 Mar 2020 16:27:49 +0100 + evolution (3.28.5-0ubuntu0.18.04.1) bionic; urgency=medium * New upstream release (LP: #1784522) diff -Nru evolution-3.28.5/debian/patches/git_webkitgtk_regression.patch evolution-3.28.5/debian/patches/git_webkitgtk_regression.patch --- evolution-3.28.5/debian/patches/git_webkitgtk_regression.patch 1970-01-01 00:00:00.000000000 +0000 +++ evolution-3.28.5/debian/patches/git_webkitgtk_regression.patch 2020-03-24 15:27:33.000000000 +0000 @@ -0,0 +1,55 @@ +From eb0a0708976d06ee992235085a947769c4274ab5 Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Fri, 13 Sep 2019 10:56:28 +0200 +Subject: [PATCH] I#617 - Font color in iframe not inherited in WebKitGTK+ 2.26 + +Closes https://gitlab.gnome.org/GNOME/evolution/issues/617 +--- + src/web-extensions/e-dom-utils.c | 25 ++++++++++++++++++++++--- + 1 file changed, 22 insertions(+), 3 deletions(-) + +Index: evolution-3.28.5/src/web-extensions/e-dom-utils.c +=================================================================== +--- evolution-3.28.5.orig/src/web-extensions/e-dom-utils.c ++++ evolution-3.28.5/src/web-extensions/e-dom-utils.c +@@ -918,18 +918,37 @@ set_iframe_and_body_width (WebKitDOMDocu + for (ii = 0; ii < length; ii++) { + gint64 tmp_local_width = local_width; + WebKitDOMDocument *iframe_document; ++ WebKitDOMElement *iframe_doc_elem; + WebKitDOMNode *node; + + node = webkit_dom_html_collection_item (frames, ii); +- if (!force_width_is_valid_element (WEBKIT_DOM_ELEMENT (node))) +- continue; +- + iframe_document = webkit_dom_html_iframe_element_get_content_document ( + WEBKIT_DOM_HTML_IFRAME_ELEMENT (node)); + + if (!iframe_document) + continue; + ++ iframe_doc_elem = webkit_dom_document_get_document_element (iframe_document); ++ if (iframe_doc_elem) { ++ WebKitDOMCSSStyleDeclaration *cssstyle; ++ gchar *value; ++ ++ cssstyle = webkit_dom_element_get_style (iframe_doc_elem); ++ value = webkit_dom_css_style_declaration_get_property_value (cssstyle, "color"); ++ if (!value || !g_ascii_strcasecmp (value, "text")) { ++ /* WebKitGTK+ 2.26.0 has style on for 'color' set to 'text', which overrides ++ what the iframe has set or inherited, thus explicitly inherit it and, just in case, ++ also the 'background-color' property. */ ++ webkit_dom_css_style_declaration_set_property (cssstyle, "color", "inherit", "", NULL); ++ webkit_dom_css_style_declaration_set_property (cssstyle, "background-color", "inherit", "", NULL); ++ } ++ g_clear_object (&cssstyle); ++ g_free (value); ++ } ++ ++ if (!force_width_is_valid_element (WEBKIT_DOM_ELEMENT (node))) ++ continue; ++ + if (level == 0) { + gchar *style = NULL; + diff -Nru evolution-3.28.5/debian/patches/series evolution-3.28.5/debian/patches/series --- evolution-3.28.5/debian/patches/series 2018-07-31 14:34:24.000000000 +0000 +++ evolution-3.28.5/debian/patches/series 2020-03-24 15:27:26.000000000 +0000 @@ -1,3 +1,4 @@ +git_webkitgtk_regression.patch 02_nss_paths.patch 10_revert_libevolution_avoid-version.patch ubuntu_gettext_domain.patch