Resolves: #2318389 (WebKitGTK 2.46.1: Middle mouse button inserts primary clipboard twice)

With the F39 Flatpak, the EDS D-Bus service name prefix is set at container
creation time, instead of at build time, so instead of looking for
service file that exactly matches the service name we got from
pkg-config, look for one that includes that service name as a substring.

configurable-dbus-prefix.patch

@@ -0,0 +1,42 @@
+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);

evolution.spec

@@ -43,15 +43,22 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.51.2
-Release: 1%{?dist}
+Version: 3.52.4
+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
-Source: http://download.gnome.org/sources/%{name}/3.51/%{name}-%{version}.tar.xz
+URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
+Source: http://download.gnome.org/sources/%{name}/3.52/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
+# 0-99: General patches
+Patch01: webkitgtk-2.46.1.patch
+
+# 100-199: Flatpak-specific patches
+# https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/144
+Patch100: configurable-dbus-prefix.patch
+
 # Approximate version number
 Provides: bundled(libgnomecanvas) = 2.30.0
 
@@ -241,7 +248,15 @@ the functionality of the installed %{name} package.
 %endif
 
 %prep
-%autosetup -p1 -S gendiff
+%autosetup -p1 -S gendiff -N
+
+# General patches
+%autopatch -p1 -m 0 -M 99
+
+# Flatpak-specific patches
+%if 0%{?flatpak}
+%autopatch -p1 -m 100 -M 199
+%endif
 
 # Remove the welcome email from Novell
 for inbox in src/mail/default/*/Inbox; do
@@ -579,6 +594,31 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Oct 14 2024 Milan Crha <mcrha@redhat.com> - 3.52.4-2
+- Resolves: #2318389 (WebKitGTK 2.46.1: Middle mouse button inserts primary clipboard twice)
+
+* Fri Aug 02 2024 Milan Crha <mcrha@redhat.com> - 3.52.4-1
+- Update to 3.52.4
+
+* Fri Jun 28 2024 Milan Crha <mcrha@redhat.com> - 3.52.3-1
+- Update to 3.52.3
+
+* Fri May 24 2024 Milan Crha <mcrha@redhat.com> - 3.52.2-1
+- Update to 3.52.2
+
+* Fri Apr 19 2024 Milan Crha <mcrha@redhat.com> - 3.52.1-1
+- Update to 3.52.1
+
+* Fri Mar 15 2024 Milan Crha <mcrha@redhat.com> - 3.52.0-1
+- Update to 3.52.0
+
+* Fri Mar 01 2024 Milan Crha <mcrha@redhat.com> - 3.51.3-1
+- Update to 3.51.3
+
+* Fri Mar 01 2024 Owen Taylor <otaylor@redhat.com> - 3.51.2-2
+- Add patch to fix backup tool for F39-style Flatpaks where the
+  EDS D-Bus service name prefix is set at container creation time.
+
 * Fri Feb 09 2024 Milan Crha <mcrha@redhat.com> - 3.51.2-1
 - Update to 3.51.2
 

sources

@@ -1 +1 @@
-SHA512 (evolution-3.51.2.tar.xz) = 304f484fa83bac4d74bfc38122317c1b1d1147d2932671fddf09bd77b75980368b413703614b89b6fc4e11190fbf5f83ae6e1b14384c2aad3c2cc9b01cbefda0
+SHA512 (evolution-3.52.4.tar.xz) = 6b6112032b8f531043a1ac95916b0a2190853d037fb92a93aeda4aa3023fdb267382f9e81ce28dc8dadc76e0907f3d0e540ff8499aae12560bec6a75d5247ec5

webkitgtk-2.46.1.patch

@@ -0,0 +1,37 @@
+diff --git a/src/modules/webkit-editor/e-webkit-editor.c b/src/modules/webkit-editor/e-webkit-editor.c
+index bc423841a8..d3217cd48b 100644
+--- a/src/modules/webkit-editor/e-webkit-editor.c
++++ b/src/modules/webkit-editor/e-webkit-editor.c
+@@ -5724,6 +5724,24 @@ webkit_editor_button_press_event (GtkWidget *widget,
+ 	       GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->button_press_event (widget, event);
+ }
+ 
++static gboolean
++webkit_editor_button_release_event (GtkWidget *widget,
++				    GdkEventButton *event)
++{
++	if (event->button == 2) {
++		/* WebKitGTK 2.46.1 changed the middle-click paste behavior and moved
++		   the paste handler from the button-press event into the button-release
++		   event, which causes double paste of the clipboard content. As the paste
++		   is handled in the webkit_editor_button_press_event() above, make sure
++		   the release handler is not called here regardless whether the user
++		   uses the changed WebkitGTK or not. */
++		return TRUE;
++	}
++
++	/* Chain up to parent's method. */
++	return GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->button_release_event (widget, event);
++}
++
+ static gboolean
+ webkit_editor_key_press_event (GtkWidget *widget,
+                                GdkEventKey *event)
+@@ -5814,6 +5832,7 @@ e_webkit_editor_class_init (EWebKitEditorClass *class)
+ 
+ 	widget_class = GTK_WIDGET_CLASS (class);
+ 	widget_class->button_press_event = webkit_editor_button_press_event;
++	widget_class->button_release_event = webkit_editor_button_release_event;
+ 	widget_class->key_press_event = webkit_editor_key_press_event;
+ 
+ 	g_object_class_override_property (