Compare commits

..

1 Commits
a8 ... c8

Author SHA1 Message Date
85fd5a09b0 Import from CS git 2024-11-15 09:44:50 +00:00
2 changed files with 44 additions and 3 deletions

View File

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

View File

@ -31,7 +31,7 @@
Name: evolution Name: evolution
Version: 3.28.5 Version: 3.28.5
Release: 26%{?dist}.alma.1 Release: 27%{?dist}
Group: Applications/Productivity Group: Applications/Productivity
Summary: Mail and calendar client for GNOME Summary: Mail and calendar client for GNOME
License: GPLv2+ and GFDL License: GPLv2+ and GFDL
@ -108,10 +108,13 @@ Patch17: evolution-3.28.5-new-button.patch
# https://issues.redhat.com/browse/RHEL-17661 # https://issues.redhat.com/browse/RHEL-17661
Patch18: evolution-3.28.5-webkitgtk-2.40.patch Patch18: evolution-3.28.5-webkitgtk-2.40.patch
Patch19: webkitgtk-2.46.1-middle-click-paste.patch
## Dependencies ### ## Dependencies ###
Requires: %{_bindir}/killall Requires: %{_bindir}/killall
Requires: evolution-data-server >= %{eds_version} Requires: evolution-data-server >= %{eds_version}
Requires: evolution-data-server-ui >= %{eds_version}
Requires: gvfs Requires: gvfs
Requires: gtkspell3 Requires: gtkspell3
Requires: highlight Requires: highlight
@ -296,6 +299,7 @@ the functionality of the installed %{name} package.
%patch16 -p1 -b .contacts-prefer-orig-value %patch16 -p1 -b .contacts-prefer-orig-value
%patch17 -p1 -b .new-button %patch17 -p1 -b .new-button
%patch18 -p1 -b .webkitgtk-2.40 %patch18 -p1 -b .webkitgtk-2.40
%patch19 -p1 -b .webkitgtk-2.46.1
# Remove the welcome email from Novell # Remove the welcome email from Novell
for inbox in src/mail/default/*/Inbox; do for inbox in src/mail/default/*/Inbox; do
@ -594,8 +598,8 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
%endif %endif
%changelog %changelog
* Thu Apr 11 2024 Eduard Abdullin <eabdullin@almalinux.org> - 3.28.5-26.alma.1 * Tue Oct 15 2024 Milan Crha <mcrha@redhat.com> - 3.28.5-27
- Remove evolution-data-server-ui dependency - Resolves: RHEL-62681 (WebKitGTK 2.46.1: Middle mouse button inserts primary clipboard twice)
* Mon Mar 18 2024 Milan Crha <mcrha@redhat.com> - 3.28.5-26 * Mon Mar 18 2024 Milan Crha <mcrha@redhat.com> - 3.28.5-26
- Resolves: RHEL-29169 (Composer: Cursor jumps to the starting line when "return" key is pressed at the end of the line) - Resolves: RHEL-29169 (Composer: Cursor jumps to the starting line when "return" key is pressed at the end of the line)
@ -3419,3 +3423,4 @@ and run autoconf at the start of the build) (#156328)
* Mon Aug 06 2001 David Sainty <dsainty@redhat.com> * Mon Aug 06 2001 David Sainty <dsainty@redhat.com>
- First spec file for evolution. - First spec file for evolution.