From 8c11b1c2eb7e56d82bd31f6dbdb49d946bf9737a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 30 Aug 2024 04:08:45 +0200 Subject: [PATCH 1/6] Update to 3.53.3 --- evolution.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 9dd1c71..731b333 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,8 +43,8 @@ ### Abstract ### Name: evolution -Version: 3.53.2 -Release: 2%{?dist} +Version: 3.53.3 +Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home @@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Aug 30 2024 Milan Crha - 3.53.3-1 +- Update to 3.53.3 + * Mon Aug 26 2024 David King - 3.53.2-2 - Rebuild against gspell diff --git a/sources b/sources index 4720c6f..9af84d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.53.2.tar.xz) = 62ad602790fcb6aa5d9adc4a79ee0e7d998f89e09ac0c3ec8a8930e40d1e6bf76d701a4e57e59de1b9cf94c820aa5c8b01a261dbab54d6246e2e2bef43da1289 +SHA512 (evolution-3.53.3.tar.xz) = 49ba3e7b6676918b22bdfd126ae7197074f5fd197b30d574ce4e8d2f94edb03396c97abb2792007a3c7db43de64e7e573206dc7da65a1f01865d6c31405aade3 From c07676e5a80b98fe07b485858da4c175dc81f1e5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 13 Sep 2024 10:16:48 +0200 Subject: [PATCH 2/6] Update to 3.54.0 --- evolution.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 731b333..b9aea02 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,12 +43,12 @@ ### Abstract ### Name: evolution -Version: 3.53.3 +Version: 3.54.0 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later 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 Source2: flatpak-evolution-wrapper.sh.in @@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Sep 13 2024 Milan Crha - 3.54.0-1 +- Update to 3.54.0 + * Fri Aug 30 2024 Milan Crha - 3.53.3-1 - Update to 3.53.3 diff --git a/sources b/sources index 9af84d0..c5d66a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.53.3.tar.xz) = 49ba3e7b6676918b22bdfd126ae7197074f5fd197b30d574ce4e8d2f94edb03396c97abb2792007a3c7db43de64e7e573206dc7da65a1f01865d6c31405aade3 +SHA512 (evolution-3.54.0.tar.xz) = 03c715aeaab5e4728467f378ae4609726ea4b66ecf2975d7f94897e1cdddb5a89dd4a6cdc49b6661874ab9f20f82ce6641cfdb463272708b2adabcd89cfa1ff1 From 36afeb1fd50e13ec421376d50a42c7e97401b62e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 18 Oct 2024 09:28:03 +0200 Subject: [PATCH 3/6] Update to 3.54.1 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index b9aea02..7c01e5c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.54.0 +Version: 3.54.1 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later @@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Oct 18 2024 Milan Crha - 3.54.1-1 +- Update to 3.54.1 + * Fri Sep 13 2024 Milan Crha - 3.54.0-1 - Update to 3.54.0 diff --git a/sources b/sources index c5d66a5..c98e2ad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.54.0.tar.xz) = 03c715aeaab5e4728467f378ae4609726ea4b66ecf2975d7f94897e1cdddb5a89dd4a6cdc49b6661874ab9f20f82ce6641cfdb463272708b2adabcd89cfa1ff1 +SHA512 (evolution-3.54.1.tar.xz) = d9b1e7bdd6c572080c09c5bb608e3d14fa2b044754f45296aaff7973a34176623c1ba92bfb43ee9d346d46aac73f4039cb2460b16babc22cd7d3cf28d2c90ffa From 92e65d961dd9b59f1928377cb02ecdd7571526b6 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 22 Nov 2024 09:14:31 +0100 Subject: [PATCH 4/6] Update to 3.54.2 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 7c01e5c..f152fbf 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.54.1 +Version: 3.54.2 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later @@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Nov 22 2024 Milan Crha - 3.54.2-1 +- Update to 3.54.2 + * Fri Oct 18 2024 Milan Crha - 3.54.1-1 - Update to 3.54.1 diff --git a/sources b/sources index c98e2ad..76ccf8d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.54.1.tar.xz) = d9b1e7bdd6c572080c09c5bb608e3d14fa2b044754f45296aaff7973a34176623c1ba92bfb43ee9d346d46aac73f4039cb2460b16babc22cd7d3cf28d2c90ffa +SHA512 (evolution-3.54.2.tar.xz) = 7f9f0b48ea88c9c07c05bc7439f2c97ea5449c968823ef899d17451202849edfe69c4ca1bc8316980d5ea9e03fa395f727900c2bbe90c5639f09339f8ec79e00 From 74f6ae9eda014f7d390bcfb9180a01e98b52cd62 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 7 Jan 2025 09:07:10 +0100 Subject: [PATCH 5/6] Update to 3.54.3 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index f152fbf..7995a63 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.54.2 +Version: 3.54.3 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later @@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Tue Jan 07 2025 Milan Crha - 3.54.3-1 +- Update to 3.54.3 + * Fri Nov 22 2024 Milan Crha - 3.54.2-1 - Update to 3.54.2 diff --git a/sources b/sources index 76ccf8d..5efb9f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.54.2.tar.xz) = 7f9f0b48ea88c9c07c05bc7439f2c97ea5449c968823ef899d17451202849edfe69c4ca1bc8316980d5ea9e03fa395f727900c2bbe90c5639f09339f8ec79e00 +SHA512 (evolution-3.54.3.tar.xz) = 05427f389ddf8a7f72be906ce1b5de78c55b6bd7d66df76ab14e9950ec927da1b51b1d42d8d75acde6d6e5f42d3d319df1c04f318436390288fe8fb3529b1b81 From f68015d7fa40b298501fcb88ae2b833b12770ad0 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 29 Aug 2025 13:44:49 +0200 Subject: [PATCH 6/6] Add patch to fix JavaScript dictionary objects creation --- ...JavaScript-code-for-WebKitGTK-2.49.4.patch | 95 +++++++++++++++++++ evolution.spec | 8 +- 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-JavaScript-code-for-WebKitGTK-2.49.4.patch diff --git a/0001-Fix-JavaScript-code-for-WebKitGTK-2.49.4.patch b/0001-Fix-JavaScript-code-for-WebKitGTK-2.49.4.patch new file mode 100644 index 0000000..b530d62 --- /dev/null +++ b/0001-Fix-JavaScript-code-for-WebKitGTK-2.49.4.patch @@ -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" diff --git a/evolution.spec b/evolution.spec index 7995a63..17bb0bc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 3.54.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home @@ -54,6 +54,9 @@ Source2: flatpak-evolution-wrapper.sh.in # 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 # https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/144 Patch100: configurable-dbus-prefix.patch @@ -593,6 +596,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Aug 29 2025 Milan Crha - 3.54.3-2 +- Add patch to fix JavaScript dictionary objects creation + * Tue Jan 07 2025 Milan Crha - 3.54.3-1 - Update to 3.54.3