From 59b77b7477888e0ab380f65ef6b93295e8e390f4 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Fri, 15 Nov 2024 03:20:51 +0300 Subject: [PATCH] import evolution-3.40.4-10.el9_5.1 --- .../webkitgtk-2.46.1-middle-click-paste.patch | 37 +++++++++++++++++++ SPECS/evolution.spec | 13 ++++++- 2 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 SOURCES/webkitgtk-2.46.1-middle-click-paste.patch diff --git a/SOURCES/webkitgtk-2.46.1-middle-click-paste.patch b/SOURCES/webkitgtk-2.46.1-middle-click-paste.patch new file mode 100644 index 0000000..7fe3e1a --- /dev/null +++ b/SOURCES/webkitgtk-2.46.1-middle-click-paste.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 ( diff --git a/SPECS/evolution.spec b/SPECS/evolution.spec index 53457bb..e8171f6 100644 --- a/SPECS/evolution.spec +++ b/SPECS/evolution.spec @@ -43,7 +43,7 @@ Name: evolution Version: 3.40.4 -Release: 9%{?dist} +Release: 10%{?dist}.1 Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution @@ -59,6 +59,7 @@ Patch04: webkitgtk-2.36.0-dark-theme.patch Patch05: webkitgtk-2.36.0-disable-hw-accel.patch Patch06: evolution-3.40.4-frame-flattenning.patch Patch07: evolution-3.40.4-new-button.patch +Patch08: webkitgtk-2.46.1-middle-click-paste.patch # Approximate version number Provides: bundled(libgnomecanvas) = 2.30.0 @@ -81,6 +82,7 @@ Requires: %{_bindir}/killall Requires: gvfs %endif Requires: evolution-data-server >= %{eds_version} +Requires: evolution-data-server-ui >= %{eds_version} Requires: gspell Requires: highlight Requires: %{name}-langpacks = %{version}-%{release} @@ -574,7 +576,14 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog -* Wed Mar 15 2023 MSVSphere Packaging Team - 3.40.4-6 +* Tue Oct 15 2024 Milan Crha - 3.40.4-10.1 +- Resolves: RHEL-62680 (WebKitGTK 2.46.1: Middle mouse button inserts primary clipboard twice) + +* Wed Oct 11 2023 Milan Crha - 3.40.4-10 +- Related: RHEL-12405 (Move WebKitGTK parts in Evolution Data Server into optional subpackage) +- Add dependency on newly introduced evolution-data-server-ui + +* Wed Mar 15 2023 MSVSphere Packaging Team - 3.40.4-9 - Rebuilt for MSVSphere 9.1. * Tue Jan 03 2023 Milan Crha - 3.40.4-9