rpms/evolution
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import CS evolution-3.40.4-11.el9_5

Browse Source
This commit is contained in:
eabdullin 2024-11-15 13:15:34 +00:00
parent 389035ce61
commit d89ecb8731
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
SOURCES/webkitgtk-2.46.1-middle-click-paste.patch Normal file
View File

@ -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 (

6
SPECS/evolution.spec
View File

@ -43,7 +43,7 @@
Name: evolution Name: evolution
Version: 3.40.4 Version: 3.40.4
Release: 10%{?dist} Release: 11%{?dist}
Summary: Mail and calendar client for GNOME Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL License: GPLv2+ and GFDL
URL: https://wiki.gnome.org/Apps/Evolution 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 Patch05: webkitgtk-2.36.0-disable-hw-accel.patch
Patch06: evolution-3.40.4-frame-flattenning.patch Patch06: evolution-3.40.4-frame-flattenning.patch
Patch07: evolution-3.40.4-new-button.patch Patch07: evolution-3.40.4-new-button.patch
Patch08: webkitgtk-2.46.1-middle-click-paste.patch
# Approximate version number # Approximate version number
Provides: bundled(libgnomecanvas) = 2.30.0 Provides: bundled(libgnomecanvas) = 2.30.0
@ -575,6 +576,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
%endif %endif
%changelog %changelog
* Tue Oct 15 2024 Milan Crha <mcrha@redhat.com> - 3.40.4-11
- Resolves: RHEL-62668 (WebKitGTK 2.46.1: Middle mouse button inserts primary clipboard twice)
* Wed Oct 11 2023 Milan Crha <mcrha@redhat.com> - 3.40.4-10 * Wed Oct 11 2023 Milan Crha <mcrha@redhat.com> - 3.40.4-10
- Related: RHEL-12405 (Move WebKitGTK parts in Evolution Data Server into optional subpackage) - Related: RHEL-12405 (Move WebKitGTK parts in Evolution Data Server into optional subpackage)
- Add dependency on newly introduced evolution-data-server-ui - Add dependency on newly introduced evolution-data-server-ui