Compare commits
6 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f68015d7fa | ||
|
|
74f6ae9eda | ||
|
|
92e65d961d | ||
|
|
36afeb1fd5 | ||
|
|
c07676e5a8 | ||
|
|
8c11b1c2eb |
3 changed files with 119 additions and 3 deletions
95
0001-Fix-JavaScript-code-for-WebKitGTK-2.49.4.patch
Normal file
95
0001-Fix-JavaScript-code-for-WebKitGTK-2.49.4.patch
Normal file
|
|
@ -0,0 +1,95 @@
|
||||||
|
From 811a6df1f990855e49ecc0ba7b1a7f7a5ec251e6 Mon Sep 17 00:00:00 2001
|
||||||
|
Date: Fri, 29 Aug 2025 07:42:10 +0200
|
||||||
|
Subject: I#3124 - JavaScript: Correct dictionary objects creation (WebKitGTK
|
||||||
|
2.49.4)
|
||||||
|
|
||||||
|
The arrays do not have named indexes, though it worked only by a chance
|
||||||
|
with the previous WebKitGTK versions. Correct how the objects are created
|
||||||
|
to follow the standard.
|
||||||
|
|
||||||
|
Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/3124
|
||||||
|
|
||||||
|
diff --git a/data/webkit/e-editor.js b/data/webkit/e-editor.js
|
||||||
|
index c4e643d9ea..340ff54643 100644
|
||||||
|
--- a/data/webkit/e-editor.js
|
||||||
|
+++ b/data/webkit/e-editor.js
|
||||||
|
@@ -4409,7 +4409,7 @@ EvoEditor.LinkGetProperties = function()
|
||||||
|
var res = null, anchor = EvoEditor.getParentElement("A", null, false);
|
||||||
|
|
||||||
|
if (anchor) {
|
||||||
|
- res = [];
|
||||||
|
+ res = {};
|
||||||
|
res["href"] = anchor.hasAttribute("href") ? anchor.getAttribute("href") : "";
|
||||||
|
res["text"] = anchor.innerText;
|
||||||
|
res["name"] = anchor.name;
|
||||||
|
@@ -4419,7 +4419,7 @@ EvoEditor.LinkGetProperties = function()
|
||||||
|
range = document.getSelection().getRangeAt(0);
|
||||||
|
|
||||||
|
if (range) {
|
||||||
|
- res = [];
|
||||||
|
+ res = {};
|
||||||
|
res["text"] = range.toString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@@ -5513,7 +5513,7 @@ EvoEditor.InsertSignature = function(content, isHTML, canRepositionCaret, uid, f
|
||||||
|
EvoUndoRedo.StopRecord(EvoUndoRedo.RECORD_KIND_GROUP, "InsertSignature");
|
||||||
|
}
|
||||||
|
|
||||||
|
- var res = [];
|
||||||
|
+ var res = {};
|
||||||
|
|
||||||
|
res["fromMessage"] = fromMessage;
|
||||||
|
res["checkChanged"] = checkChanged;
|
||||||
|
@@ -6722,7 +6722,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();
|
||||||
|
@@ -6743,7 +6743,7 @@ document.onselectionchange = function() {
|
||||||
|
EvoEditor.maybeUpdateFormattingState(EvoEditor.forceFormatStateUpdate ? EvoEditor.FORCE_YES : EvoEditor.FORCE_MAYBE);
|
||||||
|
EvoEditor.forceFormatStateUpdate = false;
|
||||||
|
|
||||||
|
- var sel = document.getSelection(), args = [];
|
||||||
|
+ var sel = document.getSelection(), args = {};
|
||||||
|
|
||||||
|
args["isCollapsed"] = sel.isCollapsed;
|
||||||
|
|
||||||
|
diff --git a/data/webkit/e-web-view.js b/data/webkit/e-web-view.js
|
||||||
|
index 591ee4f20e..b83899ba32 100644
|
||||||
|
--- a/data/webkit/e-web-view.js
|
||||||
|
+++ b/data/webkit/e-web-view.js
|
||||||
|
@@ -399,7 +399,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;
|
||||||
|
@@ -617,7 +617,7 @@ Evo.GetElementFromPoint = function(xx, yy)
|
||||||
|
if (!elem)
|
||||||
|
return null;
|
||||||
|
|
||||||
|
- var res = [], iframe;
|
||||||
|
+ var res = {}, iframe;
|
||||||
|
|
||||||
|
iframe = elem.ownerDocument.defaultView.frameElement;
|
||||||
|
|
||||||
|
diff --git a/src/e-util/test-web-view-jsc.c b/src/e-util/test-web-view-jsc.c
|
||||||
|
index e765161925..7a877b62e7 100644
|
||||||
|
--- a/src/e-util/test-web-view-jsc.c
|
||||||
|
+++ b/src/e-util/test-web-view-jsc.c
|
||||||
|
@@ -531,7 +531,7 @@ test_jsc_object_properties (TestFixture *fixture)
|
||||||
|
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"
|
||||||
|
|
@ -43,17 +43,20 @@
|
||||||
### Abstract ###
|
### Abstract ###
|
||||||
|
|
||||||
Name: evolution
|
Name: evolution
|
||||||
Version: 3.53.2
|
Version: 3.54.3
|
||||||
Release: 2%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Mail and calendar client for GNOME
|
Summary: Mail and calendar client for GNOME
|
||||||
License: GPL-2.0-or-later AND GFDL-1.3-or-later
|
License: GPL-2.0-or-later AND GFDL-1.3-or-later
|
||||||
URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
|
URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
|
||||||
Source: http://download.gnome.org/sources/%{name}/3.53/%{name}-%{version}.tar.xz
|
Source: http://download.gnome.org/sources/%{name}/3.54/%{name}-%{version}.tar.xz
|
||||||
Source1: flatpak-evolution-fix-service-names.sh
|
Source1: flatpak-evolution-fix-service-names.sh
|
||||||
Source2: flatpak-evolution-wrapper.sh.in
|
Source2: flatpak-evolution-wrapper.sh.in
|
||||||
|
|
||||||
# 0-99: General patches
|
# 0-99: General patches
|
||||||
|
|
||||||
|
# https://gitlab.gnome.org/GNOME/evolution/-/issues/3124
|
||||||
|
Patch01: 0001-Fix-JavaScript-code-for-WebKitGTK-2.49.4.patch
|
||||||
|
|
||||||
# 100-199: Flatpak-specific patches
|
# 100-199: Flatpak-specific patches
|
||||||
# https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/144
|
# https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/144
|
||||||
Patch100: configurable-dbus-prefix.patch
|
Patch100: configurable-dbus-prefix.patch
|
||||||
|
|
@ -593,6 +596,24 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Aug 29 2025 Milan Crha <mcrha@redhat.com> - 3.54.3-2
|
||||||
|
- Add patch to fix JavaScript dictionary objects creation
|
||||||
|
|
||||||
|
* Tue Jan 07 2025 Milan Crha <mcrha@redhat.com> - 3.54.3-1
|
||||||
|
- Update to 3.54.3
|
||||||
|
|
||||||
|
* Fri Nov 22 2024 Milan Crha <mcrha@redhat.com> - 3.54.2-1
|
||||||
|
- Update to 3.54.2
|
||||||
|
|
||||||
|
* Fri Oct 18 2024 Milan Crha <mcrha@redhat.com> - 3.54.1-1
|
||||||
|
- Update to 3.54.1
|
||||||
|
|
||||||
|
* Fri Sep 13 2024 Milan Crha <mcrha@redhat.com> - 3.54.0-1
|
||||||
|
- Update to 3.54.0
|
||||||
|
|
||||||
|
* Fri Aug 30 2024 Milan Crha <mcrha@redhat.com> - 3.53.3-1
|
||||||
|
- Update to 3.53.3
|
||||||
|
|
||||||
* Mon Aug 26 2024 David King <amigadave@amigadave.com> - 3.53.2-2
|
* Mon Aug 26 2024 David King <amigadave@amigadave.com> - 3.53.2-2
|
||||||
- Rebuild against gspell
|
- Rebuild against gspell
|
||||||
|
|
||||||
|
|
|
||||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
||||||
SHA512 (evolution-3.53.2.tar.xz) = 62ad602790fcb6aa5d9adc4a79ee0e7d998f89e09ac0c3ec8a8930e40d1e6bf76d701a4e57e59de1b9cf94c820aa5c8b01a261dbab54d6246e2e2bef43da1289
|
SHA512 (evolution-3.54.3.tar.xz) = 05427f389ddf8a7f72be906ce1b5de78c55b6bd7d66df76ab14e9950ec927da1b51b1d42d8d75acde6d6e5f42d3d319df1c04f318436390288fe8fb3529b1b81
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue