diff --git a/dist b/dist index 635820538d487259e6dce4499a172e3066902da5..1f9f8c9bbdfdaf483d0bfdf0bf3c48d3cad6b1b9 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an9_5 +an9_6 diff --git a/evolution.spec b/evolution.spec index 87984f5a6ac3fdd56128408fccdd1d316ffc8fc2..1e45143ea3aa355832b147ccc52f7e464124f9f8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 3.40.4 -Release: 10%{anolis_release}%{?dist}.1 +Release: 11%{anolis_release}%{?dist}.1 Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution @@ -61,6 +61,7 @@ Patch05: webkitgtk-2.36.0-disable-hw-accel.patch Patch06: evolution-3.40.4-frame-flattenning.patch Patch07: evolution-3.40.4-new-button.patch Patch08: webkitgtk-2.46.1-middle-click-paste.patch +Patch09: webkitgtk-2.49.4-fix-JavaScript-code.patch # Approximate version number Provides: bundled(libgnomecanvas) = 2.30.0 @@ -590,11 +591,14 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog -* Fri Nov 22 2024 mgb01105731 - 3.40.4-10.0.1.1 +* Tue Oct 21 2025 mgb01105731 - 3.40.4-11.0.1.1 - Add doc sub package -* Tue Oct 15 2024 Milan Crha - 3.40.4-10.1 -- Resolves: RHEL-62680 (WebKitGTK 2.46.1: Middle mouse button inserts primary clipboard twice) +* Mon Sep 01 2025 Milan Crha - 3.40.4-11.1 +- Resolves: RHEL-111959 (WebKitGTK 2.49.4: JavaScript evaluation result serialization changes) + +* Tue Oct 15 2024 Milan Crha - 3.40.4-11 +- Resolves: RHEL-62668 (WebKitGTK 2.46.1: Middle mouse button inserts primary clipboard twice) * Wed Oct 11 2023 Milan Crha - 3.40.4-10 - Related: RHEL-12405 (Move WebKitGTK parts in Evolution Data Server into optional subpackage) diff --git a/webkitgtk-2.49.4-fix-JavaScript-code.patch b/webkitgtk-2.49.4-fix-JavaScript-code.patch new file mode 100644 index 0000000000000000000000000000000000000000..55a1638edae2954be3a66c36fa7432c53bc06a9d --- /dev/null +++ b/webkitgtk-2.49.4-fix-JavaScript-code.patch @@ -0,0 +1,72 @@ +diff -up evolution-3.40.4/data/webkit/e-editor.js.9 evolution-3.40.4/data/webkit/e-editor.js +--- evolution-3.40.4/data/webkit/e-editor.js.9 2021-08-13 11:50:35.000000000 +0200 ++++ evolution-3.40.4/data/webkit/e-editor.js 2025-09-01 10:37:18.105962005 +0200 +@@ -4060,7 +4060,7 @@ EvoEditor.LinkGetProperties = function() + var res = null, anchor = EvoEditor.getParentElement("A", null, false); + + if (anchor) { +- res = []; ++ res = {}; + res["href"] = anchor.href; + res["text"] = anchor.innerText; + } else if (!document.getSelection().isCollapsed && document.getSelection().rangeCount > 0) { +@@ -4069,7 +4069,7 @@ EvoEditor.LinkGetProperties = function() + range = document.getSelection().getRangeAt(0); + + if (range) { +- res = []; ++ res = {}; + res["text"] = range.toString(); + } + } +@@ -5131,7 +5131,7 @@ EvoEditor.InsertSignature = function(con + EvoUndoRedo.StopRecord(EvoUndoRedo.RECORD_KIND_GROUP, "InsertSignature"); + } + +- var res = []; ++ var res = {}; + + res["fromMessage"] = fromMessage; + res["checkChanged"] = checkChanged; +@@ -6277,7 +6277,7 @@ EvoEditor.onContextMenu = function(event + if (document.getSelection().isCollapsed) + nodeFlags |= EvoEditor.E_CONTENT_EDITOR_NODE_IS_TEXT_COLLAPSED; + +- res = []; ++ res = {}; + + res["nodeFlags"] = nodeFlags; + res["caretWord"] = EvoEditor.GetCaretWord(); +diff -up evolution-3.40.4/data/webkit/e-web-view.js.9 evolution-3.40.4/data/webkit/e-web-view.js +--- evolution-3.40.4/data/webkit/e-web-view.js.9 2025-09-01 10:31:15.781824966 +0200 ++++ evolution-3.40.4/data/webkit/e-web-view.js 2025-09-01 10:31:15.809863550 +0200 +@@ -357,7 +357,7 @@ Evo.elementClicked = function(elem) + dom_window = parent_dom_window; + } + +- var res = []; ++ var res = {}; + + res["iframe-id"] = parent_iframe_id; + res["elem-id"] = elem.id; +@@ -575,7 +575,7 @@ Evo.GetElementFromPoint = function(xx, y + if (!elem) + return null; + +- var res = [], iframe; ++ var res = {}, iframe; + + iframe = elem.ownerDocument.defaultView.frameElement; + +diff -up evolution-3.40.4/src/e-util/test-web-view-jsc.c.9 evolution-3.40.4/src/e-util/test-web-view-jsc.c +--- evolution-3.40.4/src/e-util/test-web-view-jsc.c.9 2021-08-13 11:50:35.000000000 +0200 ++++ evolution-3.40.4/src/e-util/test-web-view-jsc.c 2025-09-01 10:31:15.810142321 +0200 +@@ -536,7 +536,7 @@ test_jsc_object_properties (TestFixture + str = e_web_view_jsc_printf_script ( + "test_obj_props = function()\n" + "{\n" +- " var arrobj = [];\n" ++ " var arrobj = {};\n" + " arrobj[\"btrue\"] = true;\n" + " arrobj[\"bfalse\"] = false;\n" + " arrobj[\"i2\"] = 2;\n"