From 0a591ba339709ed1c96ee07d25130e846c2613f5 Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Tue, 21 Oct 2025 16:06:35 +0800 Subject: [PATCH 1/2] [BUG]update to evolution-3.40.4-11.1 to #ID2UX4 update to evolution-3.40.4-11.1 for bugfix Signed-off-by: Jacob Wang --- dist | 2 +- evolution.spec | 29 +++------ webkitgtk-2.49.4-fix-JavaScript-code.patch | 72 ++++++++++++++++++++++ 3 files changed, 81 insertions(+), 22 deletions(-) create mode 100644 webkitgtk-2.49.4-fix-JavaScript-code.patch diff --git a/dist b/dist index 6358205..1f9f8c9 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an9_5 +an9_6 diff --git a/evolution.spec b/evolution.spec index 87984f5..d7b2c00 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 %undefine __cmake_in_source_build %global _changelog_trimtime %(date +%s -d "1 year ago") @@ -44,7 +43,7 @@ Name: evolution Version: 3.40.4 -Release: 10%{anolis_release}%{?dist}.1 +Release: 11%{?dist}.1 Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution @@ -61,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 @@ -154,24 +154,12 @@ BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libpst) %endif -Requires: glibc -Provides: /usr/bin/evolution - %description Evolution is the GNOME mailer, calendar, contact manager and communications tool. The components which make up Evolution are tightly integrated with one another and act as a seamless personal information-management tool. -%package doc -Summary: Documents for %{name} -BuildArch: noarch -Requires: %{name} = %{version}-%{release} - - -%description doc -Doc pages for %{name}. - %package devel Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} @@ -365,6 +353,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %files %license COPYING +%doc AUTHORS NEWS README.md %{_mandir}/man1/* # GSettings schemas: @@ -415,7 +404,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang # The main data directory # (have not attempted to split this up into an explicit list) %dir %{_datadir}/evolution -%{_datadir}/evolution/* +%{_datadir}/evolution # Modules: %dir %{_libdir}/evolution @@ -541,8 +530,6 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %{evo_plugin_dir}/org-gnome-dbx-import.eplug %{evo_plugin_dir}/liborg-gnome-dbx-import.so -%files doc -%doc AUTHORS NEWS README.md %files devel %{_includedir}/evolution @@ -590,11 +577,11 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog -* Fri Nov 22 2024 mgb01105731 - 3.40.4-10.0.1.1 -- Add doc sub package +* 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-10.1 -- Resolves: RHEL-62680 (WebKitGTK 2.46.1: Middle mouse button inserts primary clipboard twice) +* 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 0000000..55a1638 --- /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" -- Gitee From e51c646735b10e01cbcb5a9f7d83ceb75af135c9 Mon Sep 17 00:00:00 2001 From: mgb01105731 Date: Sat, 16 Jul 2022 15:14:58 +0800 Subject: [PATCH 2/2] Add doc sub package --- evolution.spec | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index d7b2c00..1e45143 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %undefine __cmake_in_source_build %global _changelog_trimtime %(date +%s -d "1 year ago") @@ -43,7 +44,7 @@ Name: evolution Version: 3.40.4 -Release: 11%{?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 @@ -154,12 +155,24 @@ BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(libpst) %endif +Requires: glibc +Provides: /usr/bin/evolution + %description Evolution is the GNOME mailer, calendar, contact manager and communications tool. The components which make up Evolution are tightly integrated with one another and act as a seamless personal information-management tool. +%package doc +Summary: Documents for %{name} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + + +%description doc +Doc pages for %{name}. + %package devel Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} @@ -353,7 +366,6 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %files %license COPYING -%doc AUTHORS NEWS README.md %{_mandir}/man1/* # GSettings schemas: @@ -404,7 +416,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang # The main data directory # (have not attempted to split this up into an explicit list) %dir %{_datadir}/evolution -%{_datadir}/evolution +%{_datadir}/evolution/* # Modules: %dir %{_libdir}/evolution @@ -530,6 +542,8 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %{evo_plugin_dir}/org-gnome-dbx-import.eplug %{evo_plugin_dir}/liborg-gnome-dbx-import.so +%files doc +%doc AUTHORS NEWS README.md %files devel %{_includedir}/evolution @@ -577,6 +591,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Tue Oct 21 2025 mgb01105731 - 3.40.4-11.0.1.1 +- Add doc sub package + * Mon Sep 01 2025 Milan Crha - 3.40.4-11.1 - Resolves: RHEL-111959 (WebKitGTK 2.49.4: JavaScript evaluation result serialization changes) -- Gitee