Add patch: "Addressbook: Switch from GData Contacts API to CardDAV API for Google books"

Resolves: #2069295

.gitignore

@@ -1 +1,2 @@
 /evolution-*.tar.xz
+/emoji.data

evolution-3.40.4-comp-editor-timezone-reset.patch

@@ -0,0 +1,68 @@
+From 9bbb9289477c8a61a641b0b67cec367629f1e73a Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Thu, 10 Feb 2022 11:59:36 +0100
+Subject: [PATCH] ECompEditor: Timezone can be reset on component save
+
+The libical 3.0.14 contains a change, which unsets non-UTC timezones
+in date/time values. That uncovered a bug in the Evolution code, which
+expects the timezone will be preserved on re-read from the component,
+but it's not always possible. This is corrected by re-setting the timezone
+on the used ICalTime value.
+---
+ src/calendar/gui/e-comp-editor-property-part.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/src/calendar/gui/e-comp-editor-property-part.c b/src/calendar/gui/e-comp-editor-property-part.c
+index 6bed833b12..6ce699a2e6 100644
+--- a/src/calendar/gui/e-comp-editor-property-part.c
++++ b/src/calendar/gui/e-comp-editor-property-part.c
+@@ -913,8 +913,15 @@ ecepp_datetime_fill_component (ECompEditorPropertyPart *property_part,
+ 			g_object_unref (prop);
+ 		}
+ 	} else {
++		ICalTimezone *zone;
++
+ 		value = e_comp_editor_property_part_datetime_get_value (part_datetime);
+ 
++		zone = value && !i_cal_time_is_null_time (value) ? i_cal_time_get_timezone (value) : NULL;
++
++		if (zone)
++			g_object_ref (zone);
++
+ 		if (prop) {
+ 			/* Remove the VALUE parameter, to correspond to the actual value being set */
+ 			i_cal_property_remove_parameter_by_kind (prop, I_CAL_VALUE_PARAMETER);
+@@ -925,6 +932,11 @@ ecepp_datetime_fill_component (ECompEditorPropertyPart *property_part,
+ 			g_clear_object (&value);
+ 			value = klass->i_cal_get_func (prop);
+ 
++			/* The timezone can be dropped since libical 3.0.14, thus restore it
++			   before updating the TZID parameter */
++			if (zone && value && !i_cal_time_is_null_time (value) && !i_cal_time_is_date (value))
++				i_cal_time_set_timezone (value, zone);
++
+ 			cal_comp_util_update_tzid_parameter (prop, value);
+ 		} else {
+ 			prop = klass->i_cal_new_func (value);
+@@ -933,12 +945,18 @@ ecepp_datetime_fill_component (ECompEditorPropertyPart *property_part,
+ 			g_clear_object (&value);
+ 			value = klass->i_cal_get_func (prop);
+ 
++			/* The timezone can be dropped since libical 3.0.14, thus restore it
++			   before updating the TZID parameter */
++			if (zone && value && !i_cal_time_is_null_time (value) && !i_cal_time_is_date (value))
++				i_cal_time_set_timezone (value, zone);
++
+ 			cal_comp_util_update_tzid_parameter (prop, value);
+ 			i_cal_component_add_property (component, prop);
+ 		}
+ 
+ 		g_clear_object (&value);
+ 		g_clear_object (&prop);
++		g_clear_object (&zone);
+ 	}
+ }
+ 
+-- 
+2.33.1
+

evolution-3.40.4-empty-emoji-picker.patch

@@ -0,0 +1,56 @@
+From e75c4faa36a9eb17b88128e45f9e5d91628149f9 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Mon, 4 Oct 2021 17:18:35 +0200
+Subject: I#1646 - Emoji picker empty
+
+Embed emoji.data as expected by the copy of the gtk+' emoji chooser dialog.
+
+Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/1646
+
+diff --git a/data/org.gnome.Evolution.gresource.xml b/data/org.gnome.Evolution.gresource.xml
+new file mode 100644
+index 0000000000..783ed153b8
+--- /dev/null
++++ b/data/org.gnome.Evolution.gresource.xml
+@@ -0,0 +1,6 @@
++<?xml version='1.0' encoding='UTF-8'?>
++<gresources>
++  <gresource prefix="org.gnome.Evolution">
++    <file>emoji.data</file>
++  </gresource>
++</gresources>
+diff --git a/src/e-util/CMakeLists.txt b/src/e-util/CMakeLists.txt
+index 03b60d8e4b..6f63f29858 100644
+--- a/src/e-util/CMakeLists.txt
++++ b/src/e-util/CMakeLists.txt
+@@ -30,6 +30,8 @@ if(WIN32)
+ 	)
+ endif(WIN32)
+ 
++glib_compile_resources(${CMAKE_SOURCE_DIR}/data/ ${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution.gresource org_gnome_evolution ../../data/org.gnome.Evolution.gresource.xml ${CMAKE_SOURCE_DIR}/data/emoji.data)
++
+ # Main libevolution-util
+ 
+ set(DEPENDENCIES
+@@ -309,6 +311,8 @@ set(SOURCES
+ 	${PLATFORM_SOURCES}
+ 	${CMAKE_CURRENT_BINARY_DIR}/e-marshal.c
+ 	${CMAKE_CURRENT_BINARY_DIR}/e-util-enumtypes.c
++	${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution.gresource.c
++	${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution.gresource.h
+ )
+ 
+ set(HEADERS
+diff --git a/src/e-util/e-gtkemojichooser.c b/src/e-util/e-gtkemojichooser.c
+index ba4d15ecee..7d8aae3039 100644
+--- a/src/e-util/e-gtkemojichooser.c
++++ b/src/e-util/e-gtkemojichooser.c
+@@ -444,7 +444,7 @@ populate_emoji_chooser (gpointer data)
+ 
+   if (!chooser->data)
+     {
+-      bytes = g_resources_lookup_data ("/org/gtk/libgtk/emoji/emoji.data", 0, NULL);
++      bytes = g_resources_lookup_data ("/org.gnome.Evolution/emoji.data", 0, NULL);
+       chooser->data = g_variant_ref_sink (g_variant_new_from_bytes (G_VARIANT_TYPE ("a(auss)"), bytes, TRUE));
+     }
+ 

evolution.spec

@@ -42,14 +42,20 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.39.1
-Release: 2%{?dist}
+Version: 3.40.4
+Release: 5%{?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.39/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.40/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
+Source3: emoji.data
+
+Patch01: evolution-3.40.4-empty-emoji-picker.patch
+Patch02: evolution-3.40.4-comp-editor-timezone-reset.patch
+Patch03: webkitgtk-2.36.0-dark-theme.patch
+Patch04: evolution-3.40.4-google-contacts-to-carddav.patch
 
 Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
@@ -238,6 +244,8 @@ the functionality of the installed %{name} package.
 %prep
 %autosetup -p1 -S gendiff
 
+cp %{S:3} data/
+
 # Remove the welcome email from Novell
 for inbox in src/mail/default/*/Inbox; do
   echo -n "" > $inbox
@@ -560,6 +568,40 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Tue Apr 05 2022 Milan Crha <mcrha@redhat.com> - 3.40.4-5
+- Add patch: "Addressbook: Switch from GData Contacts API to CardDAV API for Google books"
+
+* Tue Mar 29 2022 Milan Crha <mcrha@redhat.com> - 3.40.4-4
+- Add patch to use correct colors in mail preview with webkit2gtk3 2.36.x
+
+* Thu Feb 10 2022 Milan Crha <mcrha@redhat.com> - 3.40.4-3
+- Add patch 'ECompEditor: Timezone can be reset on component save'
+- Related: #2051054 (Update to libical 3.0.14)
+
+* Wed Oct 06 2021 Milan Crha <mcrha@redhat.com> - 3.40.4-2
+- Resolves: #2011074 (Empty emoji picker with gtk3 3.24.30)
+
+* Fri Aug 13 2021 Milan Crha <mcrha@redhat.com> - 3.40.4-1
+- Update to 3.40.4
+
+* Fri Jul 09 2021 Milan Crha <mcrha@redhat.com> - 3.40.3-1
+- Update to 3.40.3
+
+* Fri Jun 04 2021 Milan Crha <mcrha@redhat.com> - 3.40.2-1
+- Update to 3.40.2
+
+* Fri Apr 30 2021 Milan Crha <mcrha@redhat.com> - 3.40.1-1
+- Update to 3.40.1
+
+* Fri Mar 19 2021 Milan Crha <mcrha@redhat.com> - 3.40.0-1
+- Update to 3.40.0
+
+* Fri Mar 12 2021 Milan Crha <mcrha@redhat.com> - 3.39.3-1
+- Update to 3.39.3
+
+* Fri Feb 12 2021 Milan Crha <mcrha@redhat.com> - 3.39.2-1
+- Update to 3.39.2
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.39.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

sources

@@ -1 +1,2 @@
-SHA512 (evolution-3.39.1.tar.xz) = 74310c62816e0f140a4b9161c78eaacbd37858c9b666d949ec6a554cf8463c2a45a4b42e8e4d59cd15d032571d1e3a6cd01e93212f77f7667d35f8c8869bd776
+SHA512 (evolution-3.40.4.tar.xz) = f6f08ab3cbc21397a0727b1edc5e37711294fdba6e537000d5a9f11f0142f69702fffad3922645fab256ccdee348b914a87abd0e6ed843c01762ccd32333518a
+SHA512 (emoji.data) = c7d995ade74272ac2ff82555ea0fd99d4be3436c3cfc380c69f99cac8482322d1aa92779258907d0ab4a8fb85f27f16fecf11a1016747a7e98ae9b527be62dbe

webkitgtk-2.36.0-dark-theme.patch

@@ -0,0 +1,51 @@
+From ac15857f14eecd83a3a1950588a2f1edb9cb70de Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+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
+