diff --git a/configurable-dbus-prefix.patch b/configurable-dbus-prefix.patch new file mode 100644 index 0000000..be23739 --- /dev/null +++ b/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); diff --git a/evolution.spec b/evolution.spec index e27b57b..44d77db 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,15 +43,22 @@ ### Abstract ### Name: evolution -Version: 3.49.2 -Release: 1%{?dist} +Version: 3.50.4 +Release: 3%{?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.49/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.50/%{name}-%{version}.tar.xz Source1: flatpak-evolution-fix-service-names.sh Source2: flatpak-evolution-wrapper.sh.in +# 0-99: General patches +Patch001: 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 @@ -578,6 +593,31 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Mon Oct 14 2024 Milan Crha - 3.50.4-3 +- Resolves: #2318389 (WebKitGTK 2.46.1: Middle mouse button inserts primary clipboard twice) + +* Wed Feb 28 2024 Owen Taylor - 3.50.4-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 - 3.50.4-1 +- Update to 3.50.4 + +* Fri Jan 05 2024 Milan Crha - 3.50.3-1 +- Update to 3.50.3 + +* Fri Dec 01 2023 Milan Crha - 3.50.2-1 +- Update to 3.50.2 + +* Fri Oct 20 2023 Milan Crha - 3.50.1-1 +- Update to 3.50.1 + +* Fri Sep 15 2023 Milan Crha - 3.50.0-1 +- Update to 3.50.0 + +* Fri Sep 01 2023 Milan Crha - 3.49.3-1 +- Update to 3.49.3 + * Fri Aug 04 2023 Milan Crha - 3.49.2-1 - Update to 3.49.2 diff --git a/sources b/sources index 3dd2eda..dcef64b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.49.2.tar.xz) = d4a20003e85617ef4364034b23d694e91115c5ba8a40a986c33c481f6bfeb09da877779f5ab45ff02a57e747e97c3caccf54f04c8d6385543ead9c03ca097896 +SHA512 (evolution-3.50.4.tar.xz) = 857e219df65dab3182b26f5751bfec68d532af11c3e3565bf288d63e5298c9bb9aec4e293769da46083213da79c41790ca624e843e0f2779a75f581d607d2109 diff --git a/webkitgtk-2.46.1.patch b/webkitgtk-2.46.1.patch new file mode 100644 index 0000000..7fe3e1a --- /dev/null +++ b/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 (