Merge branch 'i8c' with version 3.28.5-27 into 'i8'

SOURCES/webkitgtk-2.46.1-middle-click-paste.patch

@@ -0,0 +1,36 @@
+diff -up evolution-3.28.5/src/modules/webkit-editor/e-webkit-editor.c.webkitgtk-2.46.1 evolution-3.28.5/src/modules/webkit-editor/e-webkit-editor.c
+--- evolution-3.28.5/src/modules/webkit-editor/e-webkit-editor.c.webkitgtk-2.46.1	2024-10-15 11:38:18.575614628 +0200
++++ evolution-3.28.5/src/modules/webkit-editor/e-webkit-editor.c	2024-10-15 11:46:23.334317025 +0200
+@@ -6327,6 +6327,24 @@ webkit_editor_button_press_event (GtkWid
+ }
+ 
+ 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)
+ {
+@@ -6402,6 +6420,7 @@ e_webkit_editor_class_init (EWebKitEdito
+ 
+ 	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_install_property (

SPECS/evolution.spec

@@ -31,7 +31,7 @@
 
 Name: evolution
 Version: 3.28.5
-Release: 26%{?dist}.inferit
+Release: 27%{?dist}.inferit
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -108,6 +108,8 @@ Patch17: evolution-3.28.5-new-button.patch
 # https://issues.redhat.com/browse/RHEL-17661
 Patch18: evolution-3.28.5-webkitgtk-2.40.patch
 
+Patch19: webkitgtk-2.46.1-middle-click-paste.patch
+
 ## Dependencies ###
 
 Requires: %{_bindir}/killall
@@ -297,6 +299,7 @@ the functionality of the installed %{name} package.
 %patch16 -p1 -b .contacts-prefer-orig-value
 %patch17 -p1 -b .new-button
 %patch18 -p1 -b .webkitgtk-2.40
+%patch19 -p1 -b .webkitgtk-2.46.1
 
 cp %{S:50} help/ru/ru.po
 
@@ -597,6 +600,12 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Nov 15 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 3.28.5-27.inferit
+- Update to 3.28.5-27
+
+* Tue Oct 15 2024 Milan Crha <mcrha@redhat.com> - 3.28.5-27
+- Resolves: RHEL-62681 (WebKitGTK 2.46.1: Middle mouse button inserts primary clipboard twice)
+
 * Fri May 24 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 3.28.5-26.inferit
 - Update to 3.28.5-26
 - Rebuilt for MSVSphere 8.10