Fix font style changes in editor with webkitgtk4 >= 2.16

.gitignore

@@ -1 +1,122 @@
-/evolution-*.tar.xz
+evolution-2.31.5.tar.bz2
+/evolution-2.31.91.tar.bz2
+/evolution-2.31.92.tar.bz2
+/evolution-2.91.0.tar.bz2
+/evolution-2.91.1.tar.bz2
+/evolution-2.91.2.tar.bz2
+/evolution-2.91.3.tar.bz2
+/evolution-2.91.4.tar.bz2
+/evolution-2.91.5.tar.bz2
+/evolution-2.91.6.tar.bz2
+/evolution-2.91.6.1.tar.bz2
+/evolution-2.91.6.2.tar.bz2
+/evolution-2.91.90.tar.bz2
+/evolution-2.91.91.tar.bz2
+/evolution-2.91.92.tar.bz2
+/evolution-3.0.0.tar.bz2
+/evolution-3.1.1.tar.bz2
+/evolution-3.1.2.tar.bz2
+/evolution-3.1.3.tar.bz2
+/evolution-3.1.4.tar.bz2
+/evolution-3.1.5.tar.bz2
+/evolution-3.1.90.tar.xz
+/evolution-3.1.91.tar.xz
+/evolution-3.1.92.tar.xz
+/evolution-3.2.0.tar.xz
+/evolution-3.3.1.tar.xz
+/evolution-3.3.2.tar.xz
+/evolution-3.3.3.tar.xz
+/evolution-3.3.4.tar.xz
+/evolution-3.3.5.tar.xz
+/evolution-3.3.90.tar.xz
+/evolution-3.3.91.tar.xz
+/evolution-3.3.92.tar.xz
+/evolution-3.4.0.tar.xz
+/evolution-3.4.0.1.tar.xz
+/evolution-3.4.1.tar.xz
+/evolution-3.5.1.tar.xz
+/evolution-3.5.2.tar.xz
+/evolution-3.5.3.tar.xz
+/evolution-3.5.3.1.tar.xz
+/evolution-3.5.4.tar.xz
+/evolution-3.5.5.tar.xz
+/evolution-3.5.90.tar.xz
+/evolution-3.5.91.tar.xz
+/evolution-3.5.92.tar.xz
+/evolution-3.6.0.tar.xz
+/evolution-3.7.1.tar.xz
+/evolution-3.7.2.tar.xz
+/evolution-3.7.3.1.tar.xz
+/evolution-3.7.3.2.tar.xz
+/evolution-3.7.4.tar.xz
+/evolution-3.7.5.tar.xz
+/evolution-3.7.90.tar.xz
+/evolution-3.7.91.tar.xz
+/evolution-3.7.92.tar.xz
+/evolution-3.8.0.tar.xz
+/evolution-3.9.1.tar.xz
+/evolution-3.9.2.tar.xz
+/evolution-3.9.3.tar.xz
+/evolution-3.9.4.tar.xz
+/evolution-3.9.5.tar.xz
+/evolution-3.9.90.tar.xz
+/evolution-3.9.91.tar.xz
+/evolution-3.9.92.tar.xz
+/evolution-3.10.0.tar.xz
+/evolution-3.10.1.tar.xz
+/evolution-3.11.1.tar.xz
+/evolution-3.11.2.tar.xz
+/evolution-3.11.4.tar.xz
+/evolution-3.11.5.tar.xz
+/evolution-3.11.90.tar.xz
+/evolution-3.11.91.tar.xz
+/evolution-3.11.92.tar.xz
+/evolution-3.12.0.tar.xz
+/evolution-3.12.1.tar.xz
+/evolution-3.12.2.tar.xz
+/evolution-3.12.3.tar.xz
+/evolution-3.12.4.tar.xz
+/evolution-3.13.4.tar.xz
+/evolution-3.13.5.tar.xz
+/evolution-3.13.6.tar.xz
+/evolution-3.13.7.tar.xz
+/evolution-3.13.8.tar.xz
+/evolution-3.13.9.tar.xz
+/evolution-3.13.10.tar.xz
+/evolution-3.13.90.tar.xz
+/evolution-3.15.91.tar.xz
+/evolution-3.15.92.tar.xz
+/evolution-3.16.0.tar.xz
+/evolution-3.16.1.tar.xz
+/evolution-3.17.1.tar.xz
+/evolution-3.17.2.tar.xz
+/evolution-3.17.3.tar.xz
+/evolution-3.17.4.tar.xz
+/evolution-3.17.90.tar.xz
+/evolution-3.17.91.tar.xz
+/evolution-3.17.92.tar.xz
+/evolution-3.18.0.tar.xz
+/evolution-3.18.1.tar.xz
+/evolution-3.19.1.tar.xz
+/evolution-3.19.2.tar.xz
+/evolution-3.19.3.tar.xz
+/evolution-3.19.4.tar.xz
+/evolution-3.19.90.tar.xz
+/evolution-3.19.91.tar.xz
+/evolution-3.19.92.tar.xz
+/evolution-3.20.0.tar.xz
+/evolution-3.20.1.tar.xz
+/evolution-3.21.1.tar.xz
+/evolution-3.21.2.tar.xz
+/evolution-3.21.3.tar.xz
+/evolution-3.21.4.tar.xz
+/evolution-3.21.90.tar.xz
+/evolution-3.21.91.tar.xz
+/evolution-3.21.92.tar.xz
+/evolution-3.22.0.tar.xz
+/evolution-3.22.1.tar.xz
+/evolution-3.22.2.tar.xz
+/evolution-3.22.3.tar.xz
+/evolution-3.22.4.tar.xz
+/evolution-3.22.5.tar.xz
+/evolution-3.22.6.tar.xz

0001-Can-t-change-the-font-color-on-caret-in-WebKitGTK-2..patch

@@ -0,0 +1,105 @@
+From 5210de41a7759780f290fae3bfb580a268f5401a Mon Sep 17 00:00:00 2001
+From: Tomas Popela <tpopela@redhat.com>
+Date: Fri, 24 Mar 2017 10:50:25 +0100
+Subject: [PATCH] Can't change the font color on caret in WebKitGTK+ 2.16
+
+Only process the input event if it was triggered by the key press and not
+i.e. by exexCommand. This behavior changed when the support for beforeinput
+event was introduced in WebKit.
+---
+ .../web-extension/e-editor-dom-functions.c            | 10 +++++++++-
+ .../webkit-editor/web-extension/e-editor-page.c       | 19 +++++++++++++++++++
+ .../webkit-editor/web-extension/e-editor-page.h       |  5 +++++
+ 3 files changed, 33 insertions(+), 1 deletion(-)
+
+diff --git a/modules/webkit-editor/web-extension/e-editor-dom-functions.c b/modules/webkit-editor/web-extension/e-editor-dom-functions.c
+index f545c01..c1e01e0 100644
+--- a/modules/webkit-editor/web-extension/e-editor-dom-functions.c
++++ b/modules/webkit-editor/web-extension/e-editor-dom-functions.c
+@@ -2832,6 +2832,8 @@ body_keypress_event_cb (WebKitDOMElement *element,
+ 
+ 	g_return_if_fail (E_IS_EDITOR_PAGE (editor_page));
+ 
++	e_editor_page_set_is_processing_keypress_event (editor_page, TRUE);
++
+ 	document = webkit_dom_node_get_owner_document (WEBKIT_DOM_NODE (element));
+ 	dom_window = webkit_dom_document_get_default_view (document);
+ 	dom_selection = webkit_dom_dom_window_get_selection (dom_window);
+@@ -3581,7 +3583,13 @@ body_input_event_cb (WebKitDOMElement *element,
+ {
+ 	g_return_if_fail (E_IS_EDITOR_PAGE (editor_page));
+ 
+-	e_editor_dom_body_input_event_process (editor_page, event);
++	/* Only process the input event if it was triggered by the key press
++	 * and not i.e. by exexCommand. This behavior changed when the support
++	 * for beforeinput event was introduced in WebKit. */
++	if (e_editor_page_is_processing_keypress_event (editor_page))
++		e_editor_dom_body_input_event_process (editor_page, event);
++
++	e_editor_page_set_is_processing_keypress_event (editor_page, FALSE);
+ }
+ 
+ void
+diff --git a/modules/webkit-editor/web-extension/e-editor-page.c b/modules/webkit-editor/web-extension/e-editor-page.c
+index 9da8b8c..ddacdf1 100644
+--- a/modules/webkit-editor/web-extension/e-editor-page.c
++++ b/modules/webkit-editor/web-extension/e-editor-page.c
+@@ -62,6 +62,7 @@ struct _EEditorPagePrivate {
+ 	gboolean pasting_content_from_itself;
+ 	gboolean renew_history_after_coordinates;
+ 	gboolean allow_top_signature;
++	gboolean processing_keypress_event;
+ 
+ 	GHashTable *inline_images;
+ 
+@@ -244,6 +245,7 @@ e_editor_page_init (EEditorPage *editor_page)
+ 	editor_page->priv->block_format = E_CONTENT_EDITOR_BLOCK_FORMAT_PARAGRAPH;
+ 	editor_page->priv->force_image_load = FALSE;
+ 	editor_page->priv->html_mode = TRUE;
++	editor_page->priv->processing_keypress_event = FALSE;
+ 	editor_page->priv->return_key_pressed = FALSE;
+ 	editor_page->priv->space_key_pressed = FALSE;
+ 	editor_page->priv->smiley_written = FALSE;
+@@ -557,6 +559,23 @@ e_editor_page_set_alignment (EEditorPage *editor_page,
+ }
+ 
+ gboolean
++e_editor_page_is_processing_keypress_event (EEditorPage *editor_page)
++{
++	g_return_val_if_fail (E_IS_EDITOR_PAGE (editor_page), FALSE);
++
++	return editor_page->priv->processing_keypress_event;
++}
++
++void
++e_editor_page_set_is_processing_keypress_event (EEditorPage *editor_page,
++                                                gboolean processing_keypress_event)
++{
++	g_return_if_fail (E_IS_EDITOR_PAGE (editor_page));
++
++	editor_page->priv->processing_keypress_event = processing_keypress_event;
++}
++
++gboolean
+ e_editor_page_get_return_key_pressed (EEditorPage *editor_page)
+ {
+ 	g_return_val_if_fail (E_IS_EDITOR_PAGE (editor_page), FALSE);
+diff --git a/modules/webkit-editor/web-extension/e-editor-page.h b/modules/webkit-editor/web-extension/e-editor-page.h
+index 201fb53..909e130 100644
+--- a/modules/webkit-editor/web-extension/e-editor-page.h
++++ b/modules/webkit-editor/web-extension/e-editor-page.h
+@@ -112,6 +112,11 @@ void		e_editor_page_set_alignment	(EEditorPage *editor_page,
+ 						 EContentEditorAlignment value);
+ gint		e_editor_page_get_word_wrap_length
+ 						(EEditorPage *editor_page);
++gboolean	e_editor_page_is_processing_keypress_event
++						(EEditorPage *editor_page);
++void		e_editor_page_set_is_processing_keypress_event
++						(EEditorPage *editor_page,
++						 gboolean processing_keypress_event);
+ gboolean	e_editor_page_get_return_key_pressed
+ 						(EEditorPage *editor_page);
+ void		e_editor_page_set_return_key_pressed
+-- 
+2.9.3
+

configurable-dbus-prefix.patch

@@ -1,42 +0,0 @@
-diff -up evolution-3.48.1 evolution-3.48
-diff -up evolution-3.48.1/docs/evolution.1 evolution-3.48.1/docs/evolution
-diff -up evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c.1 evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c
---- evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c.1	2023-11-27 13:12:25.099463743 -0500
-+++ evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c	2023-11-27 13:14:38.640243434 -0500
-@@ -674,7 +674,7 @@ get_source_manager_reload_command (void)
- 			g_string_free (tmp, TRUE);
- 			tmp = NULL;
- 
--			base_filename = g_strdup (EDS_SOURCES_DBUS_SERVICE_NAME);
-+			base_filename = g_ascii_strdown (EDS_SOURCES_DBUS_SERVICE_NAME, -1);
- 
- 			if (!base_filename || !*base_filename) {
- 				g_free (base_filename);
-@@ -690,14 +690,16 @@ get_source_manager_reload_command (void)
- 
- 			while (!tmp) {
- 				const gchar *name;
-+				gchar *name_down;
- 
- 				name = g_dir_read_name (dir);
-+				name_down = g_ascii_strdown (name, -1);
- 
- 				if (!name)
- 					break;
- 
--				if (g_ascii_strncasecmp (name, base_filename, base_filename_len) == 0 &&
--				    g_ascii_strncasecmp (name + strlen (name) - 8, ".service", 8) == 0) {
-+				if (strstr (name_down, base_filename) != NULL &&
-+				    strncmp (name_down + strlen (name) - 8, ".service", 8) == 0) {
- 					gchar *filename;
- 
- 					filename = g_strconcat ("$DBUSDATADIR", G_DIR_SEPARATOR_S, name, NULL);
-@@ -724,6 +726,8 @@ get_source_manager_reload_command (void)
- 						g_free (str);
- 					}
- 				}
-+
-+				g_free (name_down);
- 			}
- 
- 			g_free (base_filename);

flatpak-evolution-fix-service-names.sh

@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# see https://gitlab.gnome.org/GNOME/glib/issues/1737
-# previous versions used milliseconds instead of seconds as the timeout argument",
-(`pkg-config --atleast-version 2.60.1 gio-2.0` || `pkg-config --atleast-version 2.61.0 gio-2.0`) && TIMEOUTMULT= || TIMEOUTMULT=000
-
-sed -e "s|\@SOURCES_SERVICE\@|$(pkg-config --variable=sourcesdbusservicename evolution-data-server-1.2)|" \
-    -e "s|\@ADDRESSBOOK_SERVICE\@|$(pkg-config --variable=addressbookdbusservicename evolution-data-server-1.2)|" \
-    -e "s|\@CALENDAR_SERVICE\@|$(pkg-config --variable=calendardbusservicename evolution-data-server-1.2)|" \
-    -e "s|\@TIMEOUTMULT\@|${TIMEOUTMULT}|"

flatpak-evolution-wrapper.sh.in

@@ -1,29 +0,0 @@
-#!/bin/bash
-
-if [ "$1" = "--quit" -o "$1" = "--force-shutdown" ]; then
-   /app/bin/evolution.bin "$@"
-else
-   export BOGOFILTER_DIR="${XDG_DATA_HOME}/bogofilter/"
-   export GIO_USE_NETWORK_MONITOR=base
-   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)
-   if [ "${LINES}" = "0" ]; then
-      /app/libexec/evolution-source-registry &
-      gdbus wait --session --timeout=1@TIMEOUTMULT@ @SOURCES_SERVICE@
-   fi
-
-   LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @ADDRESSBOOK_SERVICE@ | wc -l)
-   if [ "${LINES}" = "0" ]; then
-      /app/libexec/evolution-addressbook-factory -r &
-      gdbus wait --session --timeout=1@TIMEOUTMULT@ @ADDRESSBOOK_SERVICE@
-   fi
-
-   LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @CALENDAR_SERVICE@ | wc -l)
-   if [ "${LINES}" = "0" ]; then
-      /app/libexec/evolution-calendar-factory -r &
-      gdbus wait --session --timeout=1@TIMEOUTMULT@ @CALENDAR_SERVICE@
-   fi
-
-   /app/bin/evolution.bin "$@"
-fi

rpminspect.yaml

@@ -1,5 +0,0 @@
----
-runpath:
-    allowed_paths:
-        - /usr/lib/evolution
-        - /usr/lib64/evolution

sources

@@ -1 +1 @@
-SHA512 (evolution-3.59.1.tar.xz) = 26d6d4dfcdbc3d89f88d9e24096c7ff910d221119def75d7f80a397f682be96860726832c7c62b46769ce9cfcc15e5844cbcc016facc9b21b4eb9bbb2c17360d
+SHA512 (evolution-3.22.6.tar.xz) = c699adae640d05558b583b05eda5c5ad3de99aa1d1bbfa24af6110be41251f715ff4b16ff0efb96c8de7faa8c895d82460b504c2704974d4c9731f1bc3e7739f