From f199fdc480e49da7b3d2471d3cd2a68fee1c6260 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 13 Aug 2021 11:15:01 +0200 Subject: [PATCH 1/8] Update to 3.41.2 --- evolution.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index b552639..6ea4be0 100644 --- a/evolution.spec +++ b/evolution.spec @@ -42,8 +42,8 @@ ### Abstract ### Name: evolution -Version: 3.41.1 -Release: 2%{?dist} +Version: 3.41.2 +Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution @@ -563,6 +563,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Aug 13 2021 Milan Crha - 3.41.2-1 +- Update to 3.41.2 + * Wed Jul 21 2021 Fedora Release Engineering - 3.41.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index b540905..4360aa2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.41.1.tar.xz) = e19d64c616b8e4604b9e7bd35b74158750c60260807e93fddddbe08ac9a01944454c865f20f16545ffc95af00136dedd4ed446335df5e9cd9edbd2a6e7fccb23 +SHA512 (evolution-3.41.2.tar.xz) = e61618bac075f364e5ef2523f6f849eeffc833f2a2993d616aceb5cd9a8471cda35b0a7012e3ecb9b5551df18692aedb4935ec0dc074a45f857f7ae0196f8946 From eb8ea212b17a079fca5ac2cfe997d364c5812971 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 3 Sep 2021 10:35:08 +0200 Subject: [PATCH 2/8] Update to 3.41.3 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 6ea4be0..23c9c35 100644 --- a/evolution.spec +++ b/evolution.spec @@ -42,7 +42,7 @@ ### Abstract ### Name: evolution -Version: 3.41.2 +Version: 3.41.3 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -563,6 +563,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Sep 03 2021 Milan Crha - 3.41.3-1 +- Update to 3.41.3 + * Fri Aug 13 2021 Milan Crha - 3.41.2-1 - Update to 3.41.2 diff --git a/sources b/sources index 4360aa2..35d43a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.41.2.tar.xz) = e61618bac075f364e5ef2523f6f849eeffc833f2a2993d616aceb5cd9a8471cda35b0a7012e3ecb9b5551df18692aedb4935ec0dc074a45f857f7ae0196f8946 +SHA512 (evolution-3.41.3.tar.xz) = 0d3eb998768fbdad628e39ecaa61cd8cd4bb1aca8fd43f8129922b8420bb41d777db3c31a62b077b2b0cfa919ab6db298857fb07653160852f3c290d81fa9f6a From e99495ce062b0717742b06f2458a460bb0605692 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 17 Sep 2021 09:08:55 +0200 Subject: [PATCH 3/8] Update to 3.42.0 --- evolution.spec | 10 ++++++++-- sources | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 23c9c35..b195533 100644 --- a/evolution.spec +++ b/evolution.spec @@ -42,12 +42,12 @@ ### Abstract ### Name: evolution -Version: 3.41.3 +Version: 3.42.0 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution -Source: http://download.gnome.org/sources/%{name}/3.41/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.42/%{name}-%{version}.tar.xz Source1: flatpak-evolution-fix-service-names.sh Source2: flatpak-evolution-wrapper.sh.in @@ -292,6 +292,9 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated -DVERSION_SUBSTRING=" (%{version}-%{release})" \ %ldap_flags %ssl_flags %gtkdoc_flags %tests_flags %tnef_flags \ -DENABLE_PLUGINS=all \ + %if 0%{?flatpak} + "-DWITH_WMCLASS_OVERRIDE=evolution.bin" \ + %endif %{nil} %cmake_build @@ -563,6 +566,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Sep 17 2021 Milan Crha - 3.42.0-1 +- Update to 3.42.0 + * Fri Sep 03 2021 Milan Crha - 3.41.3-1 - Update to 3.41.3 diff --git a/sources b/sources index 35d43a1..2b146d1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.41.3.tar.xz) = 0d3eb998768fbdad628e39ecaa61cd8cd4bb1aca8fd43f8129922b8420bb41d777db3c31a62b077b2b0cfa919ab6db298857fb07653160852f3c290d81fa9f6a +SHA512 (evolution-3.42.0.tar.xz) = 435155a69ef324ff3b0f85c9f0ed3206a7dfe12bd8ad5e9a87dff5de839e837417147e81faa93c57f207dff4d92cdc36ac3856402493ff693055f267aed5cbeb From 76680125aa0ab3a6e730c68244e74e97d76cb270 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 29 Oct 2021 10:18:40 +0200 Subject: [PATCH 4/8] Update to 3.42.1 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index b195533..978498a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -42,7 +42,7 @@ ### Abstract ### Name: evolution -Version: 3.42.0 +Version: 3.42.1 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -566,6 +566,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Oct 29 2021 Milan Crha - 3.42.1-1 +- Update to 3.42.1 + * Fri Sep 17 2021 Milan Crha - 3.42.0-1 - Update to 3.42.0 diff --git a/sources b/sources index 2b146d1..07e6443 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.42.0.tar.xz) = 435155a69ef324ff3b0f85c9f0ed3206a7dfe12bd8ad5e9a87dff5de839e837417147e81faa93c57f207dff4d92cdc36ac3856402493ff693055f267aed5cbeb +SHA512 (evolution-3.42.1.tar.xz) = 9db26d27c78997c3924b6627389b1a5c95a2f161219346fe45016b346a68c10679039fbde540220fc31769b0d3402c228ef7283b55ea3388cf66398a11cb0508 From 3cc1720a798e4f0b75fa6b74f0a64f80f927342d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 3 Dec 2021 09:24:32 +0100 Subject: [PATCH 5/8] Update to 3.42.2 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 978498a..0859440 100644 --- a/evolution.spec +++ b/evolution.spec @@ -42,7 +42,7 @@ ### Abstract ### Name: evolution -Version: 3.42.1 +Version: 3.42.2 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -566,6 +566,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Dec 03 2021 Milan Crha - 3.42.2-1 +- Update to 3.42.2 + * Fri Oct 29 2021 Milan Crha - 3.42.1-1 - Update to 3.42.1 diff --git a/sources b/sources index 07e6443..2645a57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.42.1.tar.xz) = 9db26d27c78997c3924b6627389b1a5c95a2f161219346fe45016b346a68c10679039fbde540220fc31769b0d3402c228ef7283b55ea3388cf66398a11cb0508 +SHA512 (evolution-3.42.2.tar.xz) = 3ecdda77a34ec477e073319f4e0de00c1c4a0c2539529ed5ff6c98fdeed4cdf160ecce2791dc9d8902768a659ee22f3455b17028c1d0477ffbbbe1a40e7f5d97 From 934d8a336e0724f4acb3068dcb7ad4164a2a386e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 7 Jan 2022 12:06:50 +0100 Subject: [PATCH 6/8] Update to 3.42.3 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 0859440..9e15e0c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -42,7 +42,7 @@ ### Abstract ### Name: evolution -Version: 3.42.2 +Version: 3.42.3 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -566,6 +566,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Jan 07 2022 Milan Crha - 3.42.3-1 +- Update to 3.42.3 + * Fri Dec 03 2021 Milan Crha - 3.42.2-1 - Update to 3.42.2 diff --git a/sources b/sources index 2645a57..e14b9d2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.42.2.tar.xz) = 3ecdda77a34ec477e073319f4e0de00c1c4a0c2539529ed5ff6c98fdeed4cdf160ecce2791dc9d8902768a659ee22f3455b17028c1d0477ffbbbe1a40e7f5d97 +SHA512 (evolution-3.42.3.tar.xz) = 4824b46fcd1537e38faeb91095b8a9330fa116cbec73641bbb8fe2e302a0f87f06d7c744970f3705d88e7aa07d63a2195039a917c5c3047678bb2be0e9526580 From fc51a43ccb88768a4c961f1fb0b3d028dc4b5b9b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 11 Feb 2022 11:32:40 +0100 Subject: [PATCH 7/8] Update to 3.42.4 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 9e15e0c..f640058 100644 --- a/evolution.spec +++ b/evolution.spec @@ -42,7 +42,7 @@ ### Abstract ### Name: evolution -Version: 3.42.3 +Version: 3.42.4 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -566,6 +566,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Feb 11 2022 Milan Crha - 3.42.4-1 +- Update to 3.42.4 + * Fri Jan 07 2022 Milan Crha - 3.42.3-1 - Update to 3.42.3 diff --git a/sources b/sources index e14b9d2..3e5c432 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.42.3.tar.xz) = 4824b46fcd1537e38faeb91095b8a9330fa116cbec73641bbb8fe2e302a0f87f06d7c744970f3705d88e7aa07d63a2195039a917c5c3047678bb2be0e9526580 +SHA512 (evolution-3.42.4.tar.xz) = 4319d19089269e53bb751408d5cec1609a245dd366a30ad6e2e117f074ff0b2f55228a5dbcc9af661846a253c0860a61a8648bd582b395851e21e152ffe0b1aa From f933eb6f8ce87635cf4d4c76295ca342579e0366 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 29 Mar 2022 07:48:50 +0200 Subject: [PATCH 8/8] Add patch to use correct colors in mail preview with webkit2gtk3 2.36.x --- evolution.spec | 7 ++++- webkitgtk-2.36.0-dark-theme.patch | 51 +++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 webkitgtk-2.36.0-dark-theme.patch diff --git a/evolution.spec b/evolution.spec index f640058..fb9b90d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ Name: evolution Version: 3.42.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution @@ -51,6 +51,8 @@ Source: http://download.gnome.org/sources/%{name}/3.42/%{name}-%{version}.tar.xz Source1: flatpak-evolution-fix-service-names.sh Source2: flatpak-evolution-wrapper.sh.in +Patch01: webkitgtk-2.36.0-dark-theme.patch + # Approximate version number Provides: bundled(libgnomecanvas) = 2.30.0 @@ -566,6 +568,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Tue Mar 29 2022 Milan Crha - 3.42.4-2 +- Add patch to use correct colors in mail preview with webkit2gtk3 2.36.x + * Fri Feb 11 2022 Milan Crha - 3.42.4-1 - Update to 3.42.4 diff --git a/webkitgtk-2.36.0-dark-theme.patch b/webkitgtk-2.36.0-dark-theme.patch new file mode 100644 index 0000000..025ea9e --- /dev/null +++ b/webkitgtk-2.36.0-dark-theme.patch @@ -0,0 +1,51 @@ +From ac15857f14eecd83a3a1950588a2f1edb9cb70de Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Fri, 18 Mar 2022 09:45:20 +0100 +Subject: [PATCH] I#1835 - Mail: Preview uses wrong colors for HTML mail with + dark theme + +Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/1835 +--- + data/webkit/e-web-view.js | 12 ++++++++++-- + src/em-format/e-mail-formatter-text-html.c | 2 +- + 2 files changed, 11 insertions(+), 3 deletions(-) + +diff --git a/data/webkit/e-web-view.js b/data/webkit/e-web-view.js +index 7f47fe4b26..a8f99c4668 100644 +--- a/data/webkit/e-web-view.js ++++ b/data/webkit/e-web-view.js +@@ -695,8 +695,16 @@ Evo.initialize = function(elem) + + if (doc.documentElement.style.getPropertyValue("color") == "" || + doc.documentElement.style.getPropertyValue("color") == "text") { +- doc.documentElement.style.setProperty("color", "inherit"); +- doc.documentElement.style.setProperty("background-color", "inherit"); ++ if (doc.defaultView && doc.defaultView.frameElement && !doc.defaultView.frameElement.hasAttribute("x-e-unset-colors") && ++ doc.defaultView.frameElement.ownerDocument && ++ doc.defaultView.frameElement.ownerDocument.defaultView && ++ doc.defaultView.frameElement.ownerDocument.defaultView.window) { ++ var style = doc.defaultView.frameElement.ownerDocument.defaultView.window.getComputedStyle(doc.defaultView.frameElement); ++ if (style) { ++ doc.documentElement.style.setProperty("color", style.color); ++ doc.documentElement.style.setProperty("background-color", style.backgroundColor); ++ } ++ } + } + + elems = doc.querySelectorAll("input, textarea, select, button, label"); +diff --git a/src/em-format/e-mail-formatter-text-html.c b/src/em-format/e-mail-formatter-text-html.c +index 708c29a5e4..8a938212ff 100644 +--- a/src/em-format/e-mail-formatter-text-html.c ++++ b/src/em-format/e-mail-formatter-text-html.c +@@ -369,7 +369,7 @@ emfe_text_html_format (EMailFormatterExtension *extension, + e_mail_part_get_id (part), + e_mail_part_get_id (part), + e_mail_part_get_frame_security_style (part), +- g_settings_get_boolean (settings, "preview-unset-html-colors") ? "x-e-unset-colors=\"1\"" : "style=\"background-color: #ffffff;\""); ++ g_settings_get_boolean (settings, "preview-unset-html-colors") ? "x-e-unset-colors=\"1\"" : "style=\"background-color:white; color:black;\""); + + g_output_stream_write_all ( + stream, str, strlen (str), +-- +GitLab +