Merge branch 'i8c' with version 3.28.5-25 into 'i8'

9 months ago · 3fb55e9aa0
parent 8e979f0148 6fc9b1cfc1
commit 3fb55e9aa0
2 changed files with 16 additions and 199 deletions
--- a/SOURCES/evolution-3.28.5-webkitgtk-2.40.patch
+++ b/SOURCES/evolution-3.28.5-webkitgtk-2.40.patch
@ -1,5 +1,5 @@
 diff --git a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c
-index 3568f6e..35de5c0 100644
+index 3568f6e..f695ed8 100644
 --- a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c
 +++ b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c
@@ -626,6 +626,20 @@ e_editor_dom_exec_command (EEditorPage *editor_page,
@ -46,7 +46,7 @@ index 3568f6e..35de5c0 100644
 		}
 	}
 
-@@ -4120,7 +4134,7 @@ caret_is_on_the_line_beginning_html (WebKitDOMDocument *document)
+@@ -4120,7 +4135,7 @@ caret_is_on_the_line_beginning_html (WebKitDOMDocument *document)
 	dom_window = webkit_dom_document_get_default_view (document);
 	dom_selection = webkit_dom_dom_window_get_selection (dom_window);
 
@ -55,7 +55,7 @@ index 3568f6e..35de5c0 100644
 
 	webkit_dom_dom_selection_modify (dom_selection, "move", "left", "lineBoundary");
 
-@@ -9388,7 +9402,7 @@ save_history_for_delete_or_backspace (EEditorPage *editor_page,
+@@ -9388,7 +9403,7 @@ save_history_for_delete_or_backspace (EEditorPage *editor_page,
 		return;
 	}
 
@ -64,7 +64,7 @@ index 3568f6e..35de5c0 100644
 
 	/* Check if we can delete something */
 	if (webkit_dom_range_get_collapsed (range, NULL)) {
-@@ -9503,7 +9517,7 @@ save_history_for_delete_or_backspace (EEditorPage *editor_page,
+@@ -9503,7 +9518,7 @@ save_history_for_delete_or_backspace (EEditorPage *editor_page,
 				} else {
 					WebKitDOMRange *tmp_range = NULL, *actual_range = NULL;
 
@ -73,7 +73,7 @@ index 3568f6e..35de5c0 100644
 
 					webkit_dom_dom_selection_modify (
 						dom_selection, "move", delete_key ? "right" : "left", "character");
-@@ -11348,7 +11362,7 @@ e_editor_dom_save_history_for_drag (EEditorPage *editor_page)
+@@ -11348,7 +11363,7 @@ e_editor_dom_save_history_for_drag (EEditorPage *editor_page)
 	}
 
 	/* Obtain the dragged content. */
@ -82,7 +82,7 @@ index 3568f6e..35de5c0 100644
 	range_clone = webkit_dom_range_clone_range (range, NULL);
 
 	/* Create the history event for the content that will
-@@ -11708,7 +11722,7 @@ e_editor_dom_get_current_range (EEditorPage *editor_page)
+@@ -11708,7 +11723,7 @@ e_editor_dom_get_current_range (EEditorPage *editor_page)
 	if (webkit_dom_dom_selection_get_range_count (dom_selection) < 1)
 		goto exit;
 
@ -91,198 +91,6 @@ index 3568f6e..35de5c0 100644
  exit:
 	g_clear_object (&dom_selection);
 	g_clear_object (&dom_window);
-@@ -13515,6 +13529,107 @@ e_editor_dom_is_selection_position_node (WebKitDOMNode *node)
- 	       element_has_id (element, "-x-evo-selection-end-marker");
- }
- 
-+static void
-+e_editor_shift_for_normalize (WebKitDOMNode **inout_node,
-+			      glong *inout_offset)
-+{
-+	WebKitDOMNode *node = *inout_node;
-+	glong offset = *inout_offset;
-+
-+	node = *inout_node;
-+	while (node = webkit_dom_node_get_previous_sibling (node), node && WEBKIT_DOM_IS_TEXT (node)) {
-+		gchar *text;
-+
-+		text = webkit_dom_node_get_node_value (node);
-+		if (text) {
-+			offset += g_utf8_strlen (text, -1);
-+			g_free (text);
-+		}
-+
-+		*inout_node = node;
-+	}
-+
-+	*inout_offset = offset;
-+}
-+
-+static WebKitDOMNode *
-+e_editor_get_previous_node (WebKitDOMNode *in_node,
-+			    glong *out_offset)
-+{
-+	WebKitDOMNode *node, *child;
-+
-+	*out_offset = 0;
-+
-+	node = webkit_dom_node_get_previous_sibling (in_node);
-+	if (!node)
-+		return webkit_dom_node_get_parent_node (in_node);
-+
-+	while (child = webkit_dom_node_get_last_child (node), child) {
-+		node = child;
-+	}
-+
-+	if (WEBKIT_DOM_IS_TEXT (node)) {
-+		gchar *text;
-+
-+		text = webkit_dom_node_get_node_value (node);
-+		if (text) {
-+			*out_offset = g_utf8_strlen (text, -1);
-+			g_free (text);
-+		}
-+	}
-+
-+	return node;
-+}
-+
-+static WebKitDOMNode *
-+e_editor_get_next_node (WebKitDOMNode *in_node,
-+			glong *out_offset)
-+{
-+	WebKitDOMNode *node;
-+
-+	*out_offset = 0;
-+
-+	node = webkit_dom_node_get_next_sibling (in_node);
-+	if (!node) {
-+		node = webkit_dom_node_get_previous_sibling (in_node);
-+		if (node) {
-+			WebKitDOMNode *child = node;
-+
-+			while (child = webkit_dom_node_get_last_child (child), child) {
-+				node = child;
-+			}
-+
-+			if (WEBKIT_DOM_IS_TEXT (node)) {
-+				gchar *text;
-+
-+				text = webkit_dom_node_get_node_value (node);
-+				if (text) {
-+					*out_offset += g_utf8_strlen (text, -1);
-+					g_free (text);
-+				}
-+			}
-+		}
-+	}
-+
-+	if (!node) {
-+		WebKitDOMNode *parent;
-+
-+		parent = in_node;
-+
-+		while (parent = webkit_dom_node_get_parent_node (parent), parent) {
-+			if (WEBKIT_DOM_IS_HTML_BODY_ELEMENT (parent)) {
-+				node = in_node;
-+				break;
-+			}
-+			node = webkit_dom_node_get_first_child (parent);
-+			if (node)
-+				break;
-+		}
-+	}
-+
-+	return node;
-+}
-+
- /*
-  * e_html_editor_selection_restore:
-  * @selection: an #EEditorSelection
-@@ -13531,12 +13646,13 @@ e_editor_dom_selection_restore (EEditorPage *editor_page)
- 	WebKitDOMDocument *document;
- 	WebKitDOMElement *marker;
- 	WebKitDOMNode *selection_start_marker, *selection_end_marker;
-	WebKitDOMNode *parent_start, *parent_end, *anchor;
-+	WebKitDOMNode *parent_start, *parent_end, *start_node, *end_node, *anchor;
- 	WebKitDOMRange *range = NULL;
- 	WebKitDOMDOMSelection *dom_selection = NULL;
- 	WebKitDOMDOMWindow *dom_window = NULL;
- 	gboolean start_is_anchor = FALSE;
-	glong offset;
-+	glong start_offset, end_offset;
-+	gchar *str;
- 
- 	g_return_if_fail (E_IS_EDITOR_PAGE (editor_page));
- 
-@@ -13614,7 +13730,7 @@ e_editor_dom_selection_restore (EEditorPage *editor_page)
- 	start_is_anchor = webkit_dom_element_has_attribute (marker, "data-anchor");
- 	parent_start = webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (marker));
- 
-	webkit_dom_range_set_start_after (range, WEBKIT_DOM_NODE (marker), NULL);
-+	start_node = e_editor_get_previous_node (WEBKIT_DOM_NODE (marker), &start_offset);
- 	remove_node (WEBKIT_DOM_NODE (marker));
- 
- 	marker = webkit_dom_document_get_element_by_id (
-@@ -13631,30 +13747,47 @@ e_editor_dom_selection_restore (EEditorPage *editor_page)
- 
- 	parent_end = webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (marker));
- 
-	webkit_dom_range_set_end_before (range, WEBKIT_DOM_NODE (marker), NULL);
-+	end_node = e_editor_get_next_node (WEBKIT_DOM_NODE (marker), &end_offset);
- 	remove_node (WEBKIT_DOM_NODE (marker));
- 
-+	e_editor_shift_for_normalize (&start_node, &start_offset);
-+	e_editor_shift_for_normalize (&end_node, &end_offset);
- 	webkit_dom_dom_selection_remove_all_ranges (dom_selection);
-	if (webkit_dom_node_is_same_node (parent_start, parent_end))
-+	if (webkit_dom_node_is_same_node (parent_start, parent_end)) {
- 		webkit_dom_node_normalize (parent_start);
-	else {
-+	} else {
- 		webkit_dom_node_normalize (parent_start);
- 		webkit_dom_node_normalize (parent_end);
- 	}
- 
- 	if (start_is_anchor) {
-		anchor = webkit_dom_range_get_end_container (range, NULL);
-		offset = webkit_dom_range_get_end_offset (range, NULL);
-
-		webkit_dom_range_collapse (range, TRUE, NULL);
-+		anchor = start_node;
-+		if (webkit_dom_node_is_same_node (start_node, end_node) && start_offset == end_offset)
-+			end_node = NULL;
- 	} else {
-		anchor = webkit_dom_range_get_start_container (range, NULL);
-		offset = webkit_dom_range_get_start_offset (range, NULL);
-+		glong tmp_offset;
-+
-+		anchor = end_node;
-+		end_node = start_node;
-+		start_node = anchor;
-+		tmp_offset = start_offset;
-+		start_offset = end_offset;
-+		end_offset = tmp_offset;
-+	}
-+
-+	webkit_dom_range_set_start (range, WEBKIT_DOM_NODE (anchor), start_offset, NULL);
- 
-+	if (end_node) {
-+		webkit_dom_range_set_end (range, WEBKIT_DOM_NODE (end_node), end_offset, NULL);
- 		webkit_dom_range_collapse (range, FALSE, NULL);
-+		webkit_dom_dom_selection_add_range (dom_selection, range);
-+		webkit_dom_dom_selection_set_base_and_extent (dom_selection, anchor, start_offset, end_node, end_offset);
-+	} else {
-+		webkit_dom_range_set_end (range, WEBKIT_DOM_NODE (anchor), start_offset, NULL);
-+		webkit_dom_range_collapse (range, TRUE, NULL);
-+		webkit_dom_dom_selection_add_range (dom_selection, range);
-+		webkit_dom_dom_selection_set_position (dom_selection, anchor, start_offset);
- 	}
-	webkit_dom_dom_selection_add_range (dom_selection, range);
-	webkit_dom_dom_selection_extend (dom_selection, anchor, offset, NULL);
- 
- 	g_clear_object (&dom_selection);
- 	g_clear_object (&range);
 diff --git a/src/modules/webkit-editor/web-extension/e-editor-web-extension.c b/src/modules/webkit-editor/web-extension/e-editor-web-extension.c
 index d799db4..a286583 100644
 --- a/src/modules/webkit-editor/web-extension/e-editor-web-extension.c
--- a/SPECS/evolution.spec
+++ b/SPECS/evolution.spec
@ -31,7 +31,7 @@

 Name: evolution
 Version: 3.28.5
-Release: 23%{?dist}.inferit
+Release: 25%{?dist}.inferit
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@ -596,6 +596,15 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif

 %changelog
+* Fri Apr 05 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 3.28.5-25.inferit
+- Update to 3.28.5-25
+
+* Mon Mar 18 2024 Milan Crha <mcrha@redhat.com> - 3.28.5-25
+- Resolves: RHEL-29199 (Composer: Cursor jumps to the starting line when "return" key is pressed at the end of the line)
+
+* Thu Mar 14 2024 Milan Crha <mcrha@redhat.com> - 3.28.5-24
+- Resolves: RHEL-29199 (Composer: Cursor jumps to the starting line when "return" key is pressed at the end of the line)
+
 * Wed Mar 13 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 3.28.5-23.inferit
 - Update Russian translation (help)
 - Rebuilt for MSVSphere 8.9