From cedf6843d418e8e4e7468e4c8768755e426a5eda Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 10 Feb 2023 09:18:28 +0100 Subject: [PATCH 01/10] Update to 3.47.2 --- evolution.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index f3a122f..b730169 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,8 +43,8 @@ ### Abstract ### Name: evolution -Version: 3.47.1 -Release: 4%{?dist} +Version: 3.47.2 +Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later URL: https://wiki.gnome.org/Apps/Evolution @@ -572,6 +572,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Feb 10 2023 Milan Crha - 3.47.2-1 +- Update to 3.47.2 + * Mon Jan 30 2023 Jens Petersen - 3.47.1-4 - rebuild diff --git a/sources b/sources index ce99999..5861a14 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.47.1.tar.xz) = b5f5eee98fb93cd4c3eba15dfe35bce99847a62cfb291b7c53a23526c93327e4bbea8b68f60acdf773d8985809fbada23edb5d599a12e16eaee62c74c12e379a +SHA512 (evolution-3.47.2.tar.xz) = 1e8d97d4788fcbb88204411f8c0732cd07070ef1128a8d6a6fa137a5ebbde2bf763222bb7f58724d5cc405b2b91729eace298ce69f75dd0ebc6d7a4db5bc58fb From 8e27ef83617ebd11d340506f647e1aa660ece062 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 3 Mar 2023 08:28:39 +0100 Subject: [PATCH 02/10] Update to 3.47.3; Resolves: #2142385 (Properly apply TEMP_HOME compile time option for Flatpak) --- evolution.spec | 16 +++++++++++++--- sources | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index b730169..422e58e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.47.2 +Version: 3.47.3 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later @@ -287,7 +287,14 @@ fi %global tnef_flags -DENABLE_YTNEF=OFF %endif -CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations"; export CFLAGS +%if 0%{?flatpak} +%global temp_home "-DTEMP_HOME=1" +%else +%global temp_home "" +%endif + +CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations %temp_home" +export CFLAGS %cmake -G "Unix Makefiles" \ -DENABLE_MAINTAINER_MODE=OFF \ @@ -296,7 +303,6 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated -DENABLE_PLUGINS=all \ %if 0%{?flatpak} "-DWITH_WMCLASS_OVERRIDE=evolution.bin" \ - "-DTEMP_HOME=1" \ %endif %{nil} @@ -572,6 +578,10 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Mar 03 2023 Milan Crha - 3.47.3-1 +- Update to 3.47.3 +- Resolves: #2142385 (Properly apply TEMP_HOME compile time option for Flatpak) + * Fri Feb 10 2023 Milan Crha - 3.47.2-1 - Update to 3.47.2 diff --git a/sources b/sources index 5861a14..6f88242 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.47.2.tar.xz) = 1e8d97d4788fcbb88204411f8c0732cd07070ef1128a8d6a6fa137a5ebbde2bf763222bb7f58724d5cc405b2b91729eace298ce69f75dd0ebc6d7a4db5bc58fb +SHA512 (evolution-3.47.3.tar.xz) = 82432ef614ff0dd302c16670f80121979f6e9756360b5213cd6b7753bc48a6fd7d6d8c981a52fe9eaf63dbc17034accc59d2595ab803c6329da1c3240870a565 From 154507de352eee31938c574d379c053e76a2ba98 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 17 Mar 2023 08:03:42 +0100 Subject: [PATCH 03/10] Update to 3.48.0 --- evolution.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 422e58e..dd04b83 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,12 +43,12 @@ ### Abstract ### Name: evolution -Version: 3.47.3 +Version: 3.48.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://wiki.gnome.org/Apps/Evolution -Source: http://download.gnome.org/sources/%{name}/3.47/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.48/%{name}-%{version}.tar.xz Source1: flatpak-evolution-fix-service-names.sh Source2: flatpak-evolution-wrapper.sh.in @@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Mar 17 2023 Milan Crha - 3.48.0-1 +- Update to 3.48.0 + * Fri Mar 03 2023 Milan Crha - 3.47.3-1 - Update to 3.47.3 - Resolves: #2142385 (Properly apply TEMP_HOME compile time option for Flatpak) diff --git a/sources b/sources index 6f88242..55e0558 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.47.3.tar.xz) = 82432ef614ff0dd302c16670f80121979f6e9756360b5213cd6b7753bc48a6fd7d6d8c981a52fe9eaf63dbc17034accc59d2595ab803c6329da1c3240870a565 +SHA512 (evolution-3.48.0.tar.xz) = a57b2df1eb0aac7f10244b1c8b520a2ac6442699763c992820653bc758a9fd775ab290b0a2c39cb51805b4db9dfbbf0510f29085844406eae66c676c7c5671f4 From 545682825bfe52e8a3a8a6c808dcc6ef43e91f5a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 31 Mar 2023 12:36:26 +0200 Subject: [PATCH 04/10] flatpak: Stop disabling WebKitGTK's sandbox The WebKitGTK 2.40.0 ignores the environment variable and only claims a warning on the console, thus remove it. --- flatpak-evolution-wrapper.sh.in | 1 - 1 file changed, 1 deletion(-) diff --git a/flatpak-evolution-wrapper.sh.in b/flatpak-evolution-wrapper.sh.in index 1b42f20..6a311fc 100644 --- a/flatpak-evolution-wrapper.sh.in +++ b/flatpak-evolution-wrapper.sh.in @@ -5,7 +5,6 @@ if [ "$1" = "--quit" -o "$1" = "--force-shutdown" ]; then else export BOGOFILTER_DIR="${XDG_DATA_HOME}/bogofilter/" export GIO_USE_NETWORK_MONITOR=base - export WEBKIT_FORCE_SANDBOX=0 gsettings reset org.gnome.evolution-data-server network-monitor-gio-name LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc -l) From 350b8e85d24893ac89c454f3779dd0a8f262b830 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 21 Apr 2023 08:47:40 +0200 Subject: [PATCH 05/10] Update to 3.48.1 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index dd04b83..9bf32ea 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.48.0 +Version: 3.48.1 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later @@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Apr 21 2023 Milan Crha - 3.48.1-1 +- Update to 3.48.1 + * Fri Mar 17 2023 Milan Crha - 3.48.0-1 - Update to 3.48.0 diff --git a/sources b/sources index 55e0558..d8a4c52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.48.0.tar.xz) = a57b2df1eb0aac7f10244b1c8b520a2ac6442699763c992820653bc758a9fd775ab290b0a2c39cb51805b4db9dfbbf0510f29085844406eae66c676c7c5671f4 +SHA512 (evolution-3.48.1.tar.xz) = b7f1932eff3197e3ed167be56f374fface058fcf373831d17f3211b4aa5c4561139c7a0d737af3b0b6ca2bf6bf8941c259b8eb17f678bbaacc60956059910857 From c12987789c9c9a7c4cc5379c5a4059e8daed279d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 26 May 2023 08:07:33 +0200 Subject: [PATCH 06/10] Update to 3.48.2 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 9bf32ea..4b9cd9d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.48.1 +Version: 3.48.2 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later @@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri May 26 2023 Milan Crha - 3.48.2-1 +- Update to 3.48.2 + * Fri Apr 21 2023 Milan Crha - 3.48.1-1 - Update to 3.48.1 diff --git a/sources b/sources index d8a4c52..dbb3d2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.48.1.tar.xz) = b7f1932eff3197e3ed167be56f374fface058fcf373831d17f3211b4aa5c4561139c7a0d737af3b0b6ca2bf6bf8941c259b8eb17f678bbaacc60956059910857 +SHA512 (evolution-3.48.2.tar.xz) = d6d0af82fa31550a5657854c310ee2a00892bb9d0b7e3ace419880426315e66bc6c02dc6b7d3c4559e23d02b340e84054fc1e54fedeb08cddd035e9140f24a85 From 975dbcc302a2d300bb9a27e48788ea73d6343c1e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 29 May 2023 17:06:25 +0200 Subject: [PATCH 07/10] Add upstream fix for a regression on mail preview panel sometimes growing indefinitely --- ...content-sometimes-grows-indefinitely.patch | 44 +++++++++++++++++++ evolution.spec | 8 +++- 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 0001-Mail-Preview-content-sometimes-grows-indefinitely.patch diff --git a/0001-Mail-Preview-content-sometimes-grows-indefinitely.patch b/0001-Mail-Preview-content-sometimes-grows-indefinitely.patch new file mode 100644 index 0000000..1707281 --- /dev/null +++ b/0001-Mail-Preview-content-sometimes-grows-indefinitely.patch @@ -0,0 +1,44 @@ +diff --git a/data/webkit/e-web-view.js b/data/webkit/e-web-view.js +index b0eab4ac09..c811c479db 100644 +--- a/data/webkit/e-web-view.js ++++ b/data/webkit/e-web-view.js +@@ -760,6 +760,20 @@ Evo.EnsureMainDocumentInitialized = function() + Evo.initializeAndPostContentLoaded(null); + } + ++Evo.mailDisplayGetScrollbarHeight = function() ++{ ++ if (Evo.mailDisplayCachedScrollbarHeight != undefined) ++ return Evo.mailDisplayCachedScrollbarHeight; ++ ++ var el = document.createElement("div"); ++ el.style.cssText = "overflow:scroll; visibility:hidden; position:absolute;"; ++ document.body.appendChild(el); ++ Evo.mailDisplayCachedScrollbarHeight = el.offsetHeight - el.clientHeight ++ el.remove(); ++ ++ return Evo.mailDisplayCachedScrollbarHeight; ++} ++ + Evo.mailDisplayUpdateIFramesHeightRecursive = function(doc) + { + if (!doc) +@@ -779,7 +793,8 @@ Evo.mailDisplayUpdateIFramesHeightRecursive = function(doc) + + if (doc.defaultView.frameElement.height == doc.scrollingElement.scrollHeight) + doc.defaultView.frameElement.height = 10; +- doc.defaultView.frameElement.height = doc.scrollingElement.scrollHeight + 2 + (doc.scrollingElement.scrollWidth > doc.scrollingElement.clientWidth ? 20 : 0); ++ doc.defaultView.frameElement.height = doc.scrollingElement.scrollHeight + 2 + ++ (doc.scrollingElement.scrollWidth > doc.scrollingElement.clientWidth ? Evo.mailDisplayGetScrollbarHeight() : 0); + } + + Evo.MailDisplayUpdateIFramesHeight = function() +@@ -1186,7 +1201,7 @@ Evo.mailDisplaySizeChanged = function(entries, observer) + if (value < entry.target.ownerDocument.scrollingElement.scrollHeight) + value = entry.target.ownerDocument.scrollingElement.scrollHeight; + if (entry.target.ownerDocument.scrollingElement.scrollWidth > entry.target.ownerDocument.scrollingElement.clientWidth) +- value += 20; ++ value += Evo.mailDisplayGetScrollbarHeight(); + entry.target.ownerDocument.defaultView.frameElement.height = value; + } + } diff --git a/evolution.spec b/evolution.spec index 4b9cd9d..c77b8ff 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 3.48.2 -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://wiki.gnome.org/Apps/Evolution @@ -52,6 +52,9 @@ Source: http://download.gnome.org/sources/%{name}/3.48/%{name}-%{version}.tar.xz Source1: flatpak-evolution-fix-service-names.sh Source2: flatpak-evolution-wrapper.sh.in +# https://gitlab.gnome.org/GNOME/evolution/-/issues/2380 +Patch01: 0001-Mail-Preview-content-sometimes-grows-indefinitely.patch + # Approximate version number Provides: bundled(libgnomecanvas) = 2.30.0 @@ -578,6 +581,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Mon May 29 2023 Milan Crha - 3.48.2-2 +- Add upstream fix for a regression on mail preview panel sometimes growing indefinitely + * Fri May 26 2023 Milan Crha - 3.48.2-1 - Update to 3.48.2 From 70719578e7d1165493875e71c24875c38f587cd8 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 30 May 2023 08:26:40 +0200 Subject: [PATCH 08/10] Add patch to workaround recursion in iframe height computation in mail preview --- ...around-recursion-in-iframe-height-co.patch | 99 +++++++++++++++++++ evolution.spec | 8 +- 2 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch diff --git a/0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch b/0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch new file mode 100644 index 0000000..5b9fe96 --- /dev/null +++ b/0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch @@ -0,0 +1,99 @@ +diff --git a/data/webkit/e-web-view.js b/data/webkit/e-web-view.js +index c811c479db..032287fd73 100644 +--- a/data/webkit/e-web-view.js ++++ b/data/webkit/e-web-view.js +@@ -760,6 +760,24 @@ Evo.EnsureMainDocumentInitialized = function() + Evo.initializeAndPostContentLoaded(null); + } + ++Evo.mailDisplaySetIFrameHeight = function(iframe, height, forWidth, force) ++{ ++ if (!force && iframe.hasAttribute("x-evo-height-for-width") && iframe.hasAttribute("x-evo-cached-height")) { ++ var heightForWidth = parseInt(iframe.getAttribute("x-evo-height-for-width")); ++ if (heightForWidth == forWidth) { ++ var cachedHeight = parseInt(iframe.getAttribute("x-evo-cached-height")); ++ if (cachedHeight > 0) { ++ iframe.height = cachedHeight; ++ return; ++ } ++ } ++ } ++ ++ iframe.setAttribute("x-evo-height-for-width", forWidth); ++ iframe.setAttribute("x-evo-cached-height", height); ++ iframe.height = height; ++} ++ + Evo.mailDisplayGetScrollbarHeight = function() + { + if (Evo.mailDisplayCachedScrollbarHeight != undefined) +@@ -779,7 +797,7 @@ Evo.mailDisplayUpdateIFramesHeightRecursive = function(doc) + if (!doc) + return; + +- var ii, iframes; ++ var ii, iframes, force = false; + + iframes = doc.getElementsByTagName("iframe"); + +@@ -791,20 +809,27 @@ Evo.mailDisplayUpdateIFramesHeightRecursive = function(doc) + if (!doc.scrollingElement || !doc.defaultView || !doc.defaultView.frameElement) + return; + +- if (doc.defaultView.frameElement.height == doc.scrollingElement.scrollHeight) ++ if (doc.defaultView.frameElement.height == doc.scrollingElement.scrollHeight) { + doc.defaultView.frameElement.height = 10; +- doc.defaultView.frameElement.height = doc.scrollingElement.scrollHeight + 2 + +- (doc.scrollingElement.scrollWidth > doc.scrollingElement.clientWidth ? Evo.mailDisplayGetScrollbarHeight() : 0); ++ force = true; ++ } ++ ++ Evo.mailDisplaySetIFrameHeight(doc.defaultView.frameElement, doc.scrollingElement.scrollHeight + 2 + ++ (doc.scrollingElement.scrollWidth > doc.scrollingElement.clientWidth ? Evo.mailDisplayGetScrollbarHeight() : 0), ++ doc.scrollingElement.clientWidth, force); + } + + Evo.MailDisplayUpdateIFramesHeight = function() + { ++ var scrollx = document.defaultView ? document.defaultView.scrollX : -1; + var scrolly = document.defaultView ? document.defaultView.scrollY : -1; + + Evo.mailDisplayUpdateIFramesHeightRecursive(document); + +- if (scrolly != -1 && document.defaultView.scrollY != scrolly) +- document.defaultView.scrollTo(0, scrolly); ++ if (scrollx != -1 && scrolly != -1 && ( ++ document.defaultView.scrollX != scrollx || ++ document.defaultView.scrollY != scrolly)) ++ document.defaultView.scrollTo(scrollx, scrolly); + + Evo.mailDisplayResizeContentToPreviewWidth(); + Evo.mailDisplayUpdateMagicSpacebarState(); +@@ -1194,6 +1219,9 @@ Evo.unsetHTMLColors = function(doc) + + Evo.mailDisplaySizeChanged = function(entries, observer) + { ++ var scrollx = document.defaultView ? document.defaultView.scrollX : -1; ++ var scrolly = document.defaultView ? document.defaultView.scrollY : -1; ++ + for (const entry of entries) { + if (entry.target.ownerDocument.defaultView.frameElement && entry.borderBoxSize?.length > 0) { + var value = entry.borderBoxSize[0].blockSize; +@@ -1202,9 +1230,15 @@ Evo.mailDisplaySizeChanged = function(entries, observer) + value = entry.target.ownerDocument.scrollingElement.scrollHeight; + if (entry.target.ownerDocument.scrollingElement.scrollWidth > entry.target.ownerDocument.scrollingElement.clientWidth) + value += Evo.mailDisplayGetScrollbarHeight(); +- entry.target.ownerDocument.defaultView.frameElement.height = value; ++ Evo.mailDisplaySetIFrameHeight(entry.target.ownerDocument.defaultView.frameElement, value, ++ entry.target.ownerDocument.scrollingElement.clientWidth, false); + } + } ++ ++ if (scrollx != -1 && scrolly != -1 && ( ++ document.defaultView.scrollX != scrollx || ++ document.defaultView.scrollY != scrolly)) ++ document.defaultView.scrollTo(scrollx, scrolly); + } + + Evo.MailDisplayBindDOM = function(iframe_id, markCitationColor) + diff --git a/evolution.spec b/evolution.spec index c77b8ff..72556cc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 3.48.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later URL: https://wiki.gnome.org/Apps/Evolution @@ -55,6 +55,9 @@ Source2: flatpak-evolution-wrapper.sh.in # https://gitlab.gnome.org/GNOME/evolution/-/issues/2380 Patch01: 0001-Mail-Preview-content-sometimes-grows-indefinitely.patch +# https://gitlab.gnome.org/GNOME/evolution/-/issues/2382 +Patch02: 0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch + # Approximate version number Provides: bundled(libgnomecanvas) = 2.30.0 @@ -581,6 +584,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Tue May 30 2023 Milan Crha - 3.48.2-3 +- Add patch to workaround recursion in iframe height computation in mail preview + * Mon May 29 2023 Milan Crha - 3.48.2-2 - Add upstream fix for a regression on mail preview panel sometimes growing indefinitely From f8098b12192962194aff3462da08b45c09d0263f Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 2 Jun 2023 08:59:30 +0200 Subject: [PATCH 09/10] Update to 3.48.3 --- ...content-sometimes-grows-indefinitely.patch | 44 --------- ...around-recursion-in-iframe-height-co.patch | 99 ------------------- evolution.spec | 13 +-- sources | 2 +- 4 files changed, 6 insertions(+), 152 deletions(-) delete mode 100644 0001-Mail-Preview-content-sometimes-grows-indefinitely.patch delete mode 100644 0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch diff --git a/0001-Mail-Preview-content-sometimes-grows-indefinitely.patch b/0001-Mail-Preview-content-sometimes-grows-indefinitely.patch deleted file mode 100644 index 1707281..0000000 --- a/0001-Mail-Preview-content-sometimes-grows-indefinitely.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/data/webkit/e-web-view.js b/data/webkit/e-web-view.js -index b0eab4ac09..c811c479db 100644 ---- a/data/webkit/e-web-view.js -+++ b/data/webkit/e-web-view.js -@@ -760,6 +760,20 @@ Evo.EnsureMainDocumentInitialized = function() - Evo.initializeAndPostContentLoaded(null); - } - -+Evo.mailDisplayGetScrollbarHeight = function() -+{ -+ if (Evo.mailDisplayCachedScrollbarHeight != undefined) -+ return Evo.mailDisplayCachedScrollbarHeight; -+ -+ var el = document.createElement("div"); -+ el.style.cssText = "overflow:scroll; visibility:hidden; position:absolute;"; -+ document.body.appendChild(el); -+ Evo.mailDisplayCachedScrollbarHeight = el.offsetHeight - el.clientHeight -+ el.remove(); -+ -+ return Evo.mailDisplayCachedScrollbarHeight; -+} -+ - Evo.mailDisplayUpdateIFramesHeightRecursive = function(doc) - { - if (!doc) -@@ -779,7 +793,8 @@ Evo.mailDisplayUpdateIFramesHeightRecursive = function(doc) - - if (doc.defaultView.frameElement.height == doc.scrollingElement.scrollHeight) - doc.defaultView.frameElement.height = 10; -- doc.defaultView.frameElement.height = doc.scrollingElement.scrollHeight + 2 + (doc.scrollingElement.scrollWidth > doc.scrollingElement.clientWidth ? 20 : 0); -+ doc.defaultView.frameElement.height = doc.scrollingElement.scrollHeight + 2 + -+ (doc.scrollingElement.scrollWidth > doc.scrollingElement.clientWidth ? Evo.mailDisplayGetScrollbarHeight() : 0); - } - - Evo.MailDisplayUpdateIFramesHeight = function() -@@ -1186,7 +1201,7 @@ Evo.mailDisplaySizeChanged = function(entries, observer) - if (value < entry.target.ownerDocument.scrollingElement.scrollHeight) - value = entry.target.ownerDocument.scrollingElement.scrollHeight; - if (entry.target.ownerDocument.scrollingElement.scrollWidth > entry.target.ownerDocument.scrollingElement.clientWidth) -- value += 20; -+ value += Evo.mailDisplayGetScrollbarHeight(); - entry.target.ownerDocument.defaultView.frameElement.height = value; - } - } diff --git a/0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch b/0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch deleted file mode 100644 index 5b9fe96..0000000 --- a/0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff --git a/data/webkit/e-web-view.js b/data/webkit/e-web-view.js -index c811c479db..032287fd73 100644 ---- a/data/webkit/e-web-view.js -+++ b/data/webkit/e-web-view.js -@@ -760,6 +760,24 @@ Evo.EnsureMainDocumentInitialized = function() - Evo.initializeAndPostContentLoaded(null); - } - -+Evo.mailDisplaySetIFrameHeight = function(iframe, height, forWidth, force) -+{ -+ if (!force && iframe.hasAttribute("x-evo-height-for-width") && iframe.hasAttribute("x-evo-cached-height")) { -+ var heightForWidth = parseInt(iframe.getAttribute("x-evo-height-for-width")); -+ if (heightForWidth == forWidth) { -+ var cachedHeight = parseInt(iframe.getAttribute("x-evo-cached-height")); -+ if (cachedHeight > 0) { -+ iframe.height = cachedHeight; -+ return; -+ } -+ } -+ } -+ -+ iframe.setAttribute("x-evo-height-for-width", forWidth); -+ iframe.setAttribute("x-evo-cached-height", height); -+ iframe.height = height; -+} -+ - Evo.mailDisplayGetScrollbarHeight = function() - { - if (Evo.mailDisplayCachedScrollbarHeight != undefined) -@@ -779,7 +797,7 @@ Evo.mailDisplayUpdateIFramesHeightRecursive = function(doc) - if (!doc) - return; - -- var ii, iframes; -+ var ii, iframes, force = false; - - iframes = doc.getElementsByTagName("iframe"); - -@@ -791,20 +809,27 @@ Evo.mailDisplayUpdateIFramesHeightRecursive = function(doc) - if (!doc.scrollingElement || !doc.defaultView || !doc.defaultView.frameElement) - return; - -- if (doc.defaultView.frameElement.height == doc.scrollingElement.scrollHeight) -+ if (doc.defaultView.frameElement.height == doc.scrollingElement.scrollHeight) { - doc.defaultView.frameElement.height = 10; -- doc.defaultView.frameElement.height = doc.scrollingElement.scrollHeight + 2 + -- (doc.scrollingElement.scrollWidth > doc.scrollingElement.clientWidth ? Evo.mailDisplayGetScrollbarHeight() : 0); -+ force = true; -+ } -+ -+ Evo.mailDisplaySetIFrameHeight(doc.defaultView.frameElement, doc.scrollingElement.scrollHeight + 2 + -+ (doc.scrollingElement.scrollWidth > doc.scrollingElement.clientWidth ? Evo.mailDisplayGetScrollbarHeight() : 0), -+ doc.scrollingElement.clientWidth, force); - } - - Evo.MailDisplayUpdateIFramesHeight = function() - { -+ var scrollx = document.defaultView ? document.defaultView.scrollX : -1; - var scrolly = document.defaultView ? document.defaultView.scrollY : -1; - - Evo.mailDisplayUpdateIFramesHeightRecursive(document); - -- if (scrolly != -1 && document.defaultView.scrollY != scrolly) -- document.defaultView.scrollTo(0, scrolly); -+ if (scrollx != -1 && scrolly != -1 && ( -+ document.defaultView.scrollX != scrollx || -+ document.defaultView.scrollY != scrolly)) -+ document.defaultView.scrollTo(scrollx, scrolly); - - Evo.mailDisplayResizeContentToPreviewWidth(); - Evo.mailDisplayUpdateMagicSpacebarState(); -@@ -1194,6 +1219,9 @@ Evo.unsetHTMLColors = function(doc) - - Evo.mailDisplaySizeChanged = function(entries, observer) - { -+ var scrollx = document.defaultView ? document.defaultView.scrollX : -1; -+ var scrolly = document.defaultView ? document.defaultView.scrollY : -1; -+ - for (const entry of entries) { - if (entry.target.ownerDocument.defaultView.frameElement && entry.borderBoxSize?.length > 0) { - var value = entry.borderBoxSize[0].blockSize; -@@ -1202,9 +1230,15 @@ Evo.mailDisplaySizeChanged = function(entries, observer) - value = entry.target.ownerDocument.scrollingElement.scrollHeight; - if (entry.target.ownerDocument.scrollingElement.scrollWidth > entry.target.ownerDocument.scrollingElement.clientWidth) - value += Evo.mailDisplayGetScrollbarHeight(); -- entry.target.ownerDocument.defaultView.frameElement.height = value; -+ Evo.mailDisplaySetIFrameHeight(entry.target.ownerDocument.defaultView.frameElement, value, -+ entry.target.ownerDocument.scrollingElement.clientWidth, false); - } - } -+ -+ if (scrollx != -1 && scrolly != -1 && ( -+ document.defaultView.scrollX != scrollx || -+ document.defaultView.scrollY != scrolly)) -+ document.defaultView.scrollTo(scrollx, scrolly); - } - - Evo.MailDisplayBindDOM = function(iframe_id, markCitationColor) - diff --git a/evolution.spec b/evolution.spec index 72556cc..7bf43e3 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,8 +43,8 @@ ### Abstract ### Name: evolution -Version: 3.48.2 -Release: 3%{?dist} +Version: 3.48.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://wiki.gnome.org/Apps/Evolution @@ -52,12 +52,6 @@ Source: http://download.gnome.org/sources/%{name}/3.48/%{name}-%{version}.tar.xz Source1: flatpak-evolution-fix-service-names.sh Source2: flatpak-evolution-wrapper.sh.in -# https://gitlab.gnome.org/GNOME/evolution/-/issues/2380 -Patch01: 0001-Mail-Preview-content-sometimes-grows-indefinitely.patch - -# https://gitlab.gnome.org/GNOME/evolution/-/issues/2382 -Patch02: 0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch - # Approximate version number Provides: bundled(libgnomecanvas) = 2.30.0 @@ -584,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Jun 02 2023 Milan Crha - 3.48.3-1 +- Update to 3.48.3 + * Tue May 30 2023 Milan Crha - 3.48.2-3 - Add patch to workaround recursion in iframe height computation in mail preview diff --git a/sources b/sources index dbb3d2f..6b6274d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.48.2.tar.xz) = d6d0af82fa31550a5657854c310ee2a00892bb9d0b7e3ace419880426315e66bc6c02dc6b7d3c4559e23d02b340e84054fc1e54fedeb08cddd035e9140f24a85 +SHA512 (evolution-3.48.3.tar.xz) = 80af99d5351cc8303db1ed55f84473c1b8dd08eefa04370510a4fb249b3bb514e6c9ca2b650ef04b240c413b1e4f23388c5aa4493df74dc0ebabfdb115ceef58 From 5a0b032265afc10fc520a34e84e8bed6c462a6f9 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 30 Jun 2023 10:27:19 +0200 Subject: [PATCH 10/10] Update to 3.48.4 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 7bf43e3..25715cc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.48.3 +Version: 3.48.4 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later @@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Jun 30 2023 Milan Crha - 3.48.4-1 +- Update to 3.48.4 + * Fri Jun 02 2023 Milan Crha - 3.48.3-1 - Update to 3.48.3 diff --git a/sources b/sources index 6b6274d..7e8cd54 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.48.3.tar.xz) = 80af99d5351cc8303db1ed55f84473c1b8dd08eefa04370510a4fb249b3bb514e6c9ca2b650ef04b240c413b1e4f23388c5aa4493df74dc0ebabfdb115ceef58 +SHA512 (evolution-3.48.4.tar.xz) = 6476a995fe2ef4c9aa849296a7b9c6174d0b0d373efe72139a94911cd370efb4b517dbace173295fd3d2114dcb50e8fe3227eeee917a2ca9cbdecc9a1fdadd47