From 8eff4e18ea164aed13698390781d1d196f5a3fd5 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Fri, 6 Jan 2023 04:12:23 +0000 Subject: [PATCH] Auto sync2gitlab import of evolution-3.28.5-22.el8.src.rpm --- evolution-3.28.5-frame-flattenning.patch | 216 +++++++++++++++++++++-- evolution.spec | 5 +- 2 files changed, 206 insertions(+), 15 deletions(-) diff --git a/evolution-3.28.5-frame-flattenning.patch b/evolution-3.28.5-frame-flattenning.patch index 6ae018c..b6f940c 100644 --- a/evolution-3.28.5-frame-flattenning.patch +++ b/evolution-3.28.5-frame-flattenning.patch @@ -1,6 +1,6 @@ diff -up evolution-3.28.5/data/webview.css.frame-flattenning evolution-3.28.5/data/webview.css --- evolution-3.28.5/data/webview.css.frame-flattenning 2018-07-30 15:37:05.000000000 +0200 -+++ evolution-3.28.5/data/webview.css 2022-09-14 11:12:42.996943588 +0200 ++++ evolution-3.28.5/data/webview.css 2023-01-04 09:25:06.252929132 +0100 @@ -8,8 +8,8 @@ img { } @@ -104,7 +104,7 @@ diff -up evolution-3.28.5/data/webview.css.frame-flattenning evolution-3.28.5/da diff -up evolution-3.28.5/src/em-format/e-mail-formatter-text-plain.c.frame-flattenning evolution-3.28.5/src/em-format/e-mail-formatter-text-plain.c --- evolution-3.28.5/src/em-format/e-mail-formatter-text-plain.c.frame-flattenning 2018-07-30 15:37:05.000000000 +0200 -+++ evolution-3.28.5/src/em-format/e-mail-formatter-text-plain.c 2022-09-14 11:12:42.996943588 +0200 ++++ evolution-3.28.5/src/em-format/e-mail-formatter-text-plain.c 2023-01-04 09:25:06.252929132 +0100 @@ -111,7 +111,7 @@ emfe_text_plain_format (EMailFormatterEx string = "
priv->settings, monospace, variable); } @@ -152,9 +152,197 @@ diff -up evolution-3.28.5/src/mail/e-mail-display.c.frame-flattenning evolution- } static void +diff -up evolution-3.28.5/src/modules/itip-formatter/web-extension/module-itip-formatter-web-extension.c.frame-flattenning evolution-3.28.5/src/modules/itip-formatter/web-extension/module-itip-formatter-web-extension.c +--- evolution-3.28.5/src/modules/itip-formatter/web-extension/module-itip-formatter-web-extension.c.frame-flattenning 2018-07-30 15:37:05.000000000 +0200 ++++ evolution-3.28.5/src/modules/itip-formatter/web-extension/module-itip-formatter-web-extension.c 2023-01-04 09:25:06.253929132 +0100 +@@ -259,7 +259,7 @@ handle_method_call (GDBusConnection *con + gpointer user_data) + { + WebKitWebExtension *web_extension = WEBKIT_WEB_EXTENSION (user_data); +- WebKitDOMDocument *document; ++ WebKitDOMDocument *document = NULL, *top_document = NULL; + const gchar *part_id = NULL; + guint64 page_id; + +@@ -281,11 +281,12 @@ handle_method_call (GDBusConnection *con + + g_variant_get (parameters, "(t&s&s)", &page_id, &part_id, &button_id); + +- document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); +- if (document) +- document = find_webkit_document_for_partid_or_return_dbus_error (invocation, document, part_id); ++ top_document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); ++ if (top_document) ++ document = find_webkit_document_for_partid_or_return_dbus_error (invocation, top_document, part_id); + if (document) { + module_itip_formatter_dom_utils_show_button (document, button_id); ++ e_dom_update_iframe_height (top_document); + g_dbus_method_invocation_return_value (invocation, NULL); + } + } else if (g_strcmp0 (method_name, "EnableButton") == 0) { +@@ -306,11 +307,12 @@ handle_method_call (GDBusConnection *con + + g_variant_get (parameters, "(t&s&s&s)", &page_id, &part_id, &element_id, &inner_html); + +- document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); +- if (document) +- document = find_webkit_document_for_partid_or_return_dbus_error (invocation, document, part_id); ++ top_document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); ++ if (top_document) ++ document = find_webkit_document_for_partid_or_return_dbus_error (invocation, top_document, part_id); + if (document) { + e_dom_utils_element_set_inner_html (document, element_id, inner_html); ++ e_dom_update_iframe_height (top_document); + g_dbus_method_invocation_return_value (invocation, NULL); + } + } else if (g_strcmp0 (method_name, "RemoveElement") == 0) { +@@ -318,11 +320,12 @@ handle_method_call (GDBusConnection *con + + g_variant_get (parameters, "(t&s&s)", &page_id, &part_id, &element_id); + +- document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); +- if (document) +- document = find_webkit_document_for_partid_or_return_dbus_error (invocation, document, part_id); ++ top_document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); ++ if (top_document) ++ document = find_webkit_document_for_partid_or_return_dbus_error (invocation, top_document, part_id); + if (document) { + e_dom_utils_remove_element (document, element_id); ++ e_dom_update_iframe_height (top_document); + g_dbus_method_invocation_return_value (invocation, NULL); + } + } else if (g_strcmp0 (method_name, "ElementRemoveChildNodes") == 0) { +@@ -330,11 +333,12 @@ handle_method_call (GDBusConnection *con + + g_variant_get (parameters, "(t&s&s)", &page_id, &part_id, &element_id); + +- document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); +- if (document) +- document = find_webkit_document_for_partid_or_return_dbus_error (invocation, document, part_id); ++ top_document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); ++ if (top_document) ++ document = find_webkit_document_for_partid_or_return_dbus_error (invocation, top_document, part_id); + if (document) { + e_dom_utils_element_remove_child_nodes (document, element_id); ++ e_dom_update_iframe_height (top_document); + g_dbus_method_invocation_return_value (invocation, NULL); + } + } else if (g_strcmp0 (method_name, "HideElement") == 0) { +@@ -343,11 +347,12 @@ handle_method_call (GDBusConnection *con + + g_variant_get (parameters, "(t&s&sb)", &page_id, &part_id, &element_id, &hide); + +- document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); +- if (document) +- document = find_webkit_document_for_partid_or_return_dbus_error (invocation, document, part_id); ++ top_document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); ++ if (top_document) ++ document = find_webkit_document_for_partid_or_return_dbus_error (invocation, top_document, part_id); + if (document) { + e_dom_utils_hide_element (document, element_id, hide); ++ e_dom_update_iframe_height (top_document); + g_dbus_method_invocation_return_value (invocation, NULL); + } + } else if (g_strcmp0 (method_name, "ElementIsHidden") == 0) { +@@ -395,11 +400,12 @@ handle_method_call (GDBusConnection *con + + g_variant_get (parameters, "(t&s&sbb)", &page_id, &part_id, &id, &show, &update_second); + +- document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); +- if (document) +- document = find_webkit_document_for_partid_or_return_dbus_error (invocation, document, part_id); ++ top_document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); ++ if (top_document) ++ document = find_webkit_document_for_partid_or_return_dbus_error (invocation, top_document, part_id); + if (document) { + module_itip_formatter_dom_utils_show_checkbox (document, id, show, update_second); ++ e_dom_update_iframe_height (top_document); + g_dbus_method_invocation_return_value (invocation, NULL); + } + } else if (g_strcmp0 (method_name, "SetButtonsSensitive") == 0) { +@@ -419,11 +425,12 @@ handle_method_call (GDBusConnection *con + + g_variant_get (parameters, "(t&s&s&s)", &page_id, &part_id, &id, &text); + +- document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); +- if (document) +- document = find_webkit_document_for_partid_or_return_dbus_error (invocation, document, part_id); ++ top_document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); ++ if (top_document) ++ document = find_webkit_document_for_partid_or_return_dbus_error (invocation, top_document, part_id); + if (document) { + module_itip_formatter_dom_utils_set_area_text (document, id, text); ++ e_dom_update_iframe_height (top_document); + g_dbus_method_invocation_return_value (invocation, NULL); + } + } else if (g_strcmp0 (method_name, "ElementSetAccessKey") == 0) { +@@ -443,11 +450,12 @@ handle_method_call (GDBusConnection *con + + g_variant_get (parameters, "(t&s&s)", &page_id, &part_id, &element_id); + +- document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); +- if (document) +- document = find_webkit_document_for_partid_or_return_dbus_error (invocation, document, part_id); ++ top_document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); ++ if (top_document) ++ document = find_webkit_document_for_partid_or_return_dbus_error (invocation, top_document, part_id); + if (document) { + module_itip_formatter_dom_utils_element_hide_child_nodes (document, element_id); ++ e_dom_update_iframe_height (top_document); + g_dbus_method_invocation_return_value (invocation, NULL); + } + } else if (g_strcmp0 (method_name, "EnableSelect") == 0) { +@@ -509,11 +517,12 @@ handle_method_call (GDBusConnection *con + + g_variant_get (parameters, "(t&s&s&s&s)", &page_id, &part_id, &element_id, &header, &label); + +- document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); +- if (document) +- document = find_webkit_document_for_partid_or_return_dbus_error (invocation, document, part_id); ++ top_document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); ++ if (top_document) ++ document = find_webkit_document_for_partid_or_return_dbus_error (invocation, top_document, part_id); + if (document) { + module_itip_formatter_dom_utils_update_times (document, element_id, header, label); ++ e_dom_update_iframe_height (top_document); + g_dbus_method_invocation_return_value (invocation, NULL); + } + } else if (g_strcmp0 (method_name, "AppendInfoItemRow") == 0) { +@@ -521,11 +530,12 @@ handle_method_call (GDBusConnection *con + + g_variant_get (parameters, "(t&s&s&s&s&s)", &page_id, &part_id, &table_id, &row_id, &icon_name, &message); + +- document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); +- if (document) +- document = find_webkit_document_for_partid_or_return_dbus_error (invocation, document, part_id); ++ top_document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); ++ if (top_document) ++ document = find_webkit_document_for_partid_or_return_dbus_error (invocation, top_document, part_id); + if (document) { + module_itip_formatter_dom_utils_append_info_item_row (document, table_id, row_id, icon_name, message); ++ e_dom_update_iframe_height (top_document); + g_dbus_method_invocation_return_value (invocation, NULL); + } + } else if (g_strcmp0 (method_name, "EnableTextArea") == 0) { +@@ -546,11 +556,12 @@ handle_method_call (GDBusConnection *con + + g_variant_get (parameters, "(t&s&s&s)", &page_id, &part_id, &area_id, &value); + +- document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); +- if (document) +- document = find_webkit_document_for_partid_or_return_dbus_error (invocation, document, part_id); ++ top_document = get_webkit_document_or_return_dbus_error (invocation, web_extension, page_id); ++ if (top_document) ++ document = find_webkit_document_for_partid_or_return_dbus_error (invocation, top_document, part_id); + if (document) { + module_itip_formatter_dom_utils_text_area_set_value (document, area_id, value); ++ e_dom_update_iframe_height (top_document); + g_dbus_method_invocation_return_value (invocation, NULL); + } + } else if (g_strcmp0 (method_name, "TextAreaGetValue") == 0) { diff -up evolution-3.28.5/src/modules/text-highlight/e-mail-formatter-text-highlight.c.frame-flattenning evolution-3.28.5/src/modules/text-highlight/e-mail-formatter-text-highlight.c --- evolution-3.28.5/src/modules/text-highlight/e-mail-formatter-text-highlight.c.frame-flattenning 2018-07-30 15:37:05.000000000 +0200 -+++ evolution-3.28.5/src/modules/text-highlight/e-mail-formatter-text-highlight.c 2022-09-14 11:12:42.997943589 +0200 ++++ evolution-3.28.5/src/modules/text-highlight/e-mail-formatter-text-highlight.c 2023-01-04 09:25:06.252929132 +0100 @@ -122,16 +122,26 @@ text_hightlight_read_data_thread (gpoint { TextHighlightClosure *closure = user_data; @@ -186,7 +374,7 @@ diff -up evolution-3.28.5/src/modules/text-highlight/e-mail-formatter-text-highl if (read < 0 || closure->error) diff -up evolution-3.28.5/src/web-extensions/e-dom-utils.c.frame-flattenning evolution-3.28.5/src/web-extensions/e-dom-utils.c --- evolution-3.28.5/src/web-extensions/e-dom-utils.c.frame-flattenning 2018-07-30 15:37:05.000000000 +0200 -+++ evolution-3.28.5/src/web-extensions/e-dom-utils.c 2022-09-14 11:12:42.997943589 +0200 ++++ evolution-3.28.5/src/web-extensions/e-dom-utils.c 2023-01-04 09:25:06.253929132 +0100 @@ -837,9 +837,8 @@ set_iframe_and_body_width (WebKitDOMDocu gchar *style; @@ -275,7 +463,7 @@ diff -up evolution-3.28.5/src/web-extensions/e-dom-utils.c.frame-flattenning evo +e_dom_update_iframe_height_recursive (WebKitDOMDocument *document) +{ + WebKitDOMHTMLCollection *frames = NULL; -+ WebKitDOMHTMLElement *body; ++ WebKitDOMElement *scrolling_elem; + gulong ii, length; + + frames = webkit_dom_document_get_elements_by_tag_name_as_html_collection (document, "iframe"); @@ -293,8 +481,8 @@ diff -up evolution-3.28.5/src/web-extensions/e-dom-utils.c.frame-flattenning evo + e_dom_update_iframe_height_recursive (content_document); + } + -+ body = webkit_dom_document_get_body (document); -+ if (body) { ++ scrolling_elem = webkit_dom_document_get_scrolling_element (document); ++ if (scrolling_elem) { + WebKitDOMDOMWindow *default_view; + + default_view = webkit_dom_document_get_default_view (document); @@ -304,18 +492,18 @@ diff -up evolution-3.28.5/src/web-extensions/e-dom-utils.c.frame-flattenning evo + frame_elem = webkit_dom_dom_window_get_frame_element (default_view); + if (frame_elem) { + WebKitDOMHTMLIFrameElement *iframe = WEBKIT_DOM_HTML_IFRAME_ELEMENT (frame_elem); -+ WebKitDOMElement *body_elem = WEBKIT_DOM_ELEMENT (body); + glong scroll_height; + gchar *height; + -+ scroll_height = webkit_dom_element_get_scroll_height (body_elem); ++ scroll_height = webkit_dom_element_get_scroll_height (scrolling_elem); + height = webkit_dom_html_iframe_element_get_height (iframe); -+ if (!height || scroll_height != (glong) g_ascii_strtoll (height, NULL, 10)) ++ if (!height || scroll_height == (glong) g_ascii_strtoll (height, NULL, 10)) + webkit_dom_html_iframe_element_set_height (iframe, "10"); + g_free (height); + ++ scroll_height = webkit_dom_element_get_scroll_height (scrolling_elem); + height = g_strdup_printf ("%" G_GINT64_FORMAT, (gint64) (scroll_height + 2 + -+ (webkit_dom_element_get_scroll_width (body_elem) > webkit_dom_element_get_client_width (body_elem) ? 20 : 0))); ++ (webkit_dom_element_get_scroll_width (scrolling_elem) > webkit_dom_element_get_client_width (scrolling_elem) ? 20 : 0))); + webkit_dom_html_iframe_element_set_height (iframe, height); + g_free (height); + } @@ -369,7 +557,7 @@ diff -up evolution-3.28.5/src/web-extensions/e-dom-utils.c.frame-flattenning evo { diff -up evolution-3.28.5/src/web-extensions/e-dom-utils.h.frame-flattenning evolution-3.28.5/src/web-extensions/e-dom-utils.h --- evolution-3.28.5/src/web-extensions/e-dom-utils.h.frame-flattenning 2018-07-30 15:37:05.000000000 +0200 -+++ evolution-3.28.5/src/web-extensions/e-dom-utils.h 2022-09-14 11:12:42.997943589 +0200 ++++ evolution-3.28.5/src/web-extensions/e-dom-utils.h 2023-01-04 09:25:06.253929132 +0100 @@ -69,6 +69,7 @@ void e_dom_utils_e_mail_display_bind_do GDBusConnection *connection); void e_dom_utils_e_mail_display_unstyle_blockquotes @@ -380,7 +568,7 @@ diff -up evolution-3.28.5/src/web-extensions/e-dom-utils.h.frame-flattenning evo (WebKitDOMDocument *document, diff -up evolution-3.28.5/src/web-extensions/e-web-extension.c.frame-flattenning evolution-3.28.5/src/web-extensions/e-web-extension.c --- evolution-3.28.5/src/web-extensions/e-web-extension.c.frame-flattenning 2018-07-30 15:37:05.000000000 +0200 -+++ evolution-3.28.5/src/web-extensions/e-web-extension.c 2022-09-14 11:12:42.997943589 +0200 ++++ evolution-3.28.5/src/web-extensions/e-web-extension.c 2023-01-04 09:25:06.253929132 +0100 @@ -613,8 +613,10 @@ handle_method_call (GDBusConnection *con e_dom_utils_hide_element (document, element_id, hidden); diff --git a/evolution.spec b/evolution.spec index 81b960d..9929364 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ Name: evolution Version: 3.28.5 -Release: 21%{?dist} +Release: 22%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -590,6 +590,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %endif %changelog +* Wed Jan 04 2023 Milan Crha - 3.28.5-22 +- Resolves: #2126523 (Update patch to handle frame flattening change in WebKitGTK) + * Mon Sep 26 2022 Milan Crha - 3.28.5-21 - Resolves: #2129702 (EShellWindow: The 'New' menu is not filled after start)