rpms/evolution
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: RHEL-111953 (WebKitGTK 2.49.4: JavaScript evaluation result serialization changes)

Browse Source
This commit is contained in:
Milan Crha 2025-09-01 11:21:02 +02:00
parent c1fe2ca63f
commit 56d6bbb2a4
2 changed files with 77 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
evolution.spec
View File

@ -43,7 +43,7 @@
Name: evolution
Version: 3.40.4
Release: 11%{?dist}
Release: 12%{?dist}
Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL
URL: https://wiki.gnome.org/Apps/Evolution
@ -60,6 +60,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
@ -576,6 +577,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
%endif
%changelog
* Mon Sep 01 2025 Milan Crha <mcrha@redhat.com> - 3.40.4-12
- Resolves: RHEL-111953 (WebKitGTK 2.49.4: JavaScript evaluation result serialization changes)
* Tue Oct 15 2024 Milan Crha <mcrha@redhat.com> - 3.40.4-11
- Resolves: RHEL-62668 (WebKitGTK 2.46.1: Middle mouse button inserts primary clipboard twice)

72
webkitgtk-2.49.4-fix-JavaScript-code.patch Normal file
View File

@ -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"