From 06a60f7a3bbf54f61d9fa13f46034e08fb63e017 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Fri, 1 Mar 2024 09:39:10 +0100 Subject: [PATCH 1/9] Add patch to fix backup tool for F39-style Flatpaks With the F39 Flatpak, the EDS D-Bus service name prefix is set at container creation time, instead of at build time, so instead of looking for service file that exactly matches the service name we got from pkg-config, look for one that includes that service name as a substring. --- configurable-dbus-prefix.patch | 42 ++++++++++++++++++++++++++++++++++ evolution.spec | 22 ++++++++++++++++-- 2 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 configurable-dbus-prefix.patch 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 643bf86..4815eec 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 3.51.2 -Release: 1%{?dist} +Release: 2%{?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 @@ -52,6 +52,12 @@ Source: http://download.gnome.org/sources/%{name}/3.51/%{name}-%{version}.tar.xz Source1: flatpak-evolution-fix-service-names.sh Source2: flatpak-evolution-wrapper.sh.in +# 0-99: General patches + +# 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 +247,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 @@ -579,6 +593,10 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Mar 01 2024 Owen Taylor - 3.51.2-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.51.2-1 - Update to 3.51.2 From d7931272c6da4ea09fb284b8bd7be3cad5910eb6 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 1 Mar 2024 09:43:05 +0100 Subject: [PATCH 2/9] Update to 3.51.3 --- evolution.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 4815eec..b5fc7e6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,8 +43,8 @@ ### Abstract ### Name: evolution -Version: 3.51.2 -Release: 2%{?dist} +Version: 3.51.3 +Release: 1%{?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 @@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Mar 01 2024 Milan Crha - 3.51.3-1 +- Update to 3.51.3 + * Fri Mar 01 2024 Owen Taylor - 3.51.2-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. diff --git a/sources b/sources index c90ba0a..e9e2f05 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.51.2.tar.xz) = 304f484fa83bac4d74bfc38122317c1b1d1147d2932671fddf09bd77b75980368b413703614b89b6fc4e11190fbf5f83ae6e1b14384c2aad3c2cc9b01cbefda0 +SHA512 (evolution-3.51.3.tar.xz) = 5ed519daa05b8ace934a0fa4e1074e97dd2945911f002357c8429cd1bd26fc889d2936eb0f01144369a603410f988012d45209e53abbbaada93c5b0e3b806917 From d7153dd73d85d45423e6a8322aa34ef26617fdfe Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 15 Mar 2024 08:10:01 +0100 Subject: [PATCH 3/9] Update to 3.52.0 --- evolution.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index b5fc7e6..21bfc62 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,12 +43,12 @@ ### Abstract ### Name: evolution -Version: 3.51.3 +Version: 3.52.0 Release: 1%{?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.51/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.52/%{name}-%{version}.tar.xz Source1: flatpak-evolution-fix-service-names.sh Source2: flatpak-evolution-wrapper.sh.in @@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Mar 15 2024 Milan Crha - 3.52.0-1 +- Update to 3.52.0 + * Fri Mar 01 2024 Milan Crha - 3.51.3-1 - Update to 3.51.3 diff --git a/sources b/sources index e9e2f05..e75bce0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.51.3.tar.xz) = 5ed519daa05b8ace934a0fa4e1074e97dd2945911f002357c8429cd1bd26fc889d2936eb0f01144369a603410f988012d45209e53abbbaada93c5b0e3b806917 +SHA512 (evolution-3.52.0.tar.xz) = bc18350a720997271bf6f7f10c900c564709d26b61f0a65113aab8e699554e20785c5843eed5c495c9d8e049fef2c9282220c9b88ec6571dabe8d9ec3fccf2ed From fee0023b83ae079f3bd967e06843e1c047de1db3 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 26 Mar 2024 16:50:24 +0100 Subject: [PATCH 4/9] Update URL to point to the new Wiki space --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 21bfc62..d09aceb 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Version: 3.52.0 Release: 1%{?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 +URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home Source: http://download.gnome.org/sources/%{name}/3.52/%{name}-%{version}.tar.xz Source1: flatpak-evolution-fix-service-names.sh Source2: flatpak-evolution-wrapper.sh.in From eff3b27e308b08437616948e21ead9105fa63c51 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 19 Apr 2024 08:45:15 +0200 Subject: [PATCH 5/9] Update to 3.52.1 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index d09aceb..cfb978a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.52.0 +Version: 3.52.1 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later @@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Apr 19 2024 Milan Crha - 3.52.1-1 +- Update to 3.52.1 + * Fri Mar 15 2024 Milan Crha - 3.52.0-1 - Update to 3.52.0 diff --git a/sources b/sources index e75bce0..1601922 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.52.0.tar.xz) = bc18350a720997271bf6f7f10c900c564709d26b61f0a65113aab8e699554e20785c5843eed5c495c9d8e049fef2c9282220c9b88ec6571dabe8d9ec3fccf2ed +SHA512 (evolution-3.52.1.tar.xz) = 3fefb1b11ab164d85cd95ef1973dea8fe60ecd26f8617097a0d6843ee40db9bfe44df92e7b6ecf3afd1da4ac8e2c1e2c3144faf439d0dcf9bf677a6f842cb043 From 548b0b41b1f0c22acfc889a37ee879d0cd920d14 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 24 May 2024 08:19:36 +0200 Subject: [PATCH 6/9] Update to 3.52.2 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index cfb978a..75a02d8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.52.1 +Version: 3.52.2 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later @@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri May 24 2024 Milan Crha - 3.52.2-1 +- Update to 3.52.2 + * Fri Apr 19 2024 Milan Crha - 3.52.1-1 - Update to 3.52.1 diff --git a/sources b/sources index 1601922..0b83061 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.52.1.tar.xz) = 3fefb1b11ab164d85cd95ef1973dea8fe60ecd26f8617097a0d6843ee40db9bfe44df92e7b6ecf3afd1da4ac8e2c1e2c3144faf439d0dcf9bf677a6f842cb043 +SHA512 (evolution-3.52.2.tar.xz) = 03db78da682216ccf96e873968c284ff1c52211d74c0d121c853747075d591d39d8b8be46dfbe9aab289ad10adff71a4cef382e23d6c577ac6b7dfd2c0c350be From 250068022a82b65bfc40ccdbe235ce1760774464 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 28 Jun 2024 10:08:18 +0200 Subject: [PATCH 7/9] Update to 3.52.3 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 75a02d8..d72011c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.52.2 +Version: 3.52.3 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later @@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Jun 28 2024 Milan Crha - 3.52.3-1 +- Update to 3.52.3 + * Fri May 24 2024 Milan Crha - 3.52.2-1 - Update to 3.52.2 diff --git a/sources b/sources index 0b83061..ca14f63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.52.2.tar.xz) = 03db78da682216ccf96e873968c284ff1c52211d74c0d121c853747075d591d39d8b8be46dfbe9aab289ad10adff71a4cef382e23d6c577ac6b7dfd2c0c350be +SHA512 (evolution-3.52.3.tar.xz) = 8adfb13a4ffd16d844652d6302dbde13405a5009bd962dc507eb0a0f37039084fff53d8ed8bc800f01f0365c053592754ad0f9b4e1a4c389574a94d870038ed4 From 5db3276bd9706b0a4e7f59cc56b0a1aef13931f8 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 2 Aug 2024 08:55:38 +0200 Subject: [PATCH 8/9] Update to 3.52.4 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index d72011c..28330bd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.52.3 +Version: 3.52.4 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later @@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Aug 02 2024 Milan Crha - 3.52.4-1 +- Update to 3.52.4 + * Fri Jun 28 2024 Milan Crha - 3.52.3-1 - Update to 3.52.3 diff --git a/sources b/sources index ca14f63..2c19762 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.52.3.tar.xz) = 8adfb13a4ffd16d844652d6302dbde13405a5009bd962dc507eb0a0f37039084fff53d8ed8bc800f01f0365c053592754ad0f9b4e1a4c389574a94d870038ed4 +SHA512 (evolution-3.52.4.tar.xz) = 6b6112032b8f531043a1ac95916b0a2190853d037fb92a93aeda4aa3023fdb267382f9e81ce28dc8dadc76e0907f3d0e540ff8499aae12560bec6a75d5247ec5 From de29f0aae82251a250bb720779719668a2a4a94f Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 14 Oct 2024 17:17:01 +0200 Subject: [PATCH 9/9] Resolves: #2318389 (WebKitGTK 2.46.1: Middle mouse button inserts primary clipboard twice) --- evolution.spec | 6 +++++- webkitgtk-2.46.1.patch | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 webkitgtk-2.46.1.patch diff --git a/evolution.spec b/evolution.spec index 28330bd..4c803b7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 3.52.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home @@ -53,6 +53,7 @@ Source1: flatpak-evolution-fix-service-names.sh Source2: flatpak-evolution-wrapper.sh.in # 0-99: General patches +Patch01: webkitgtk-2.46.1.patch # 100-199: Flatpak-specific patches # https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/144 @@ -593,6 +594,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Mon Oct 14 2024 Milan Crha - 3.52.4-2 +- Resolves: #2318389 (WebKitGTK 2.46.1: Middle mouse button inserts primary clipboard twice) + * Fri Aug 02 2024 Milan Crha - 3.52.4-1 - Update to 3.52.4 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 (