From f20ff02fc34c42b5ef9e694f17a1a992c267f064 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 1 Sep 2023 09:00:16 +0200 Subject: [PATCH 1/8] Update to 3.49.3 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index e27b57b..469e64d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.49.2 +Version: 3.49.3 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later @@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* 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..e1d6fe1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.49.2.tar.xz) = d4a20003e85617ef4364034b23d694e91115c5ba8a40a986c33c481f6bfeb09da877779f5ab45ff02a57e747e97c3caccf54f04c8d6385543ead9c03ca097896 +SHA512 (evolution-3.49.3.tar.xz) = 3331603511e3c10062f0f73c84bdf3bb8ffa66f801dc6160e39379721868c4d0560c13b9ed519ce45562bff9ba94c5a39cc302fd7c726a3590bc904e2b72cec8 From 21544ed99a33a1cbc24c30f277ac8fd8b5062250 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 15 Sep 2023 09:34:00 +0200 Subject: [PATCH 2/8] Update to 3.50.0 --- evolution.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 469e64d..26fdad5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,12 +43,12 @@ ### Abstract ### Name: evolution -Version: 3.49.3 +Version: 3.50.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.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 @@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* 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 diff --git a/sources b/sources index e1d6fe1..4253f3a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.49.3.tar.xz) = 3331603511e3c10062f0f73c84bdf3bb8ffa66f801dc6160e39379721868c4d0560c13b9ed519ce45562bff9ba94c5a39cc302fd7c726a3590bc904e2b72cec8 +SHA512 (evolution-3.50.0.tar.xz) = 3a00a47ce7bec4a0e53f2c446f8ad0117c4c60db6e9a01f98fb4f2af38d0d54182020930e8c855af322ec3b563dcc1adfcaf42fdcc39a872f6de3480ba078106 From e6b99764982b2df7487499bfbb973ff2516752f2 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 20 Oct 2023 08:17:10 +0200 Subject: [PATCH 3/8] Update to 3.50.1 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 26fdad5..f8af7b5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.50.0 +Version: 3.50.1 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later @@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* 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 diff --git a/sources b/sources index 4253f3a..062590b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.50.0.tar.xz) = 3a00a47ce7bec4a0e53f2c446f8ad0117c4c60db6e9a01f98fb4f2af38d0d54182020930e8c855af322ec3b563dcc1adfcaf42fdcc39a872f6de3480ba078106 +SHA512 (evolution-3.50.1.tar.xz) = 619346315fa9cedd2d3b0327f4d286d8515a9e2aa3e76c48692b4f6492b91b5d18965e8379201514213821a1e430a717c40e079907ceac340c8ab20bcc51d390 From 481d656adf0792da67afdd3509b356066f650634 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 1 Dec 2023 08:37:48 +0100 Subject: [PATCH 4/8] Update to 3.50.2 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index f8af7b5..6a34578 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.50.1 +Version: 3.50.2 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later @@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* 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 diff --git a/sources b/sources index 062590b..6dc6510 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.50.1.tar.xz) = 619346315fa9cedd2d3b0327f4d286d8515a9e2aa3e76c48692b4f6492b91b5d18965e8379201514213821a1e430a717c40e079907ceac340c8ab20bcc51d390 +SHA512 (evolution-3.50.2.tar.xz) = 965693094e6f24ac9edb4a361d382d497bd63a48c8be6056bfbd04c27f7c88806256979e949c89aa1da7dac3114797962476d3804be49c6ca8f065c24acf9c87 From c1b87ac6202143974332ff8289c1f714f542d9bb Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 5 Jan 2024 09:45:53 +0100 Subject: [PATCH 5/8] Update to 3.50.3 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 6a34578..ba1f30e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.50.2 +Version: 3.50.3 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later @@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* 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 diff --git a/sources b/sources index 6dc6510..b59752c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.50.2.tar.xz) = 965693094e6f24ac9edb4a361d382d497bd63a48c8be6056bfbd04c27f7c88806256979e949c89aa1da7dac3114797962476d3804be49c6ca8f065c24acf9c87 +SHA512 (evolution-3.50.3.tar.xz) = 48e967c1193707a29947d7f4bdd35a829ae64c3a13748183f8f61e1a72b7a460401828d1e2e8f6042076c8fc0052ea8433850cdc3b8cb1e2de2563337748ffb1 From b3e28e112349bebd3fe11a766d72c3fed9257219 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 9 Feb 2024 09:22:46 +0100 Subject: [PATCH 6/8] Update to 3.50.4 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index ba1f30e..1267eb8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.50.3 +Version: 3.50.4 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPL-2.0-or-later AND GFDL-1.3-or-later @@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* 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 diff --git a/sources b/sources index b59752c..dcef64b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.50.3.tar.xz) = 48e967c1193707a29947d7f4bdd35a829ae64c3a13748183f8f61e1a72b7a460401828d1e2e8f6042076c8fc0052ea8433850cdc3b8cb1e2de2563337748ffb1 +SHA512 (evolution-3.50.4.tar.xz) = 857e219df65dab3182b26f5751bfec68d532af11c3e3565bf288d63e5298c9bb9aec4e293769da46083213da79c41790ca624e843e0f2779a75f581d607d2109 From 186e23194bd27a9ff28426a60a62de26790bd405 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Mon, 27 Nov 2023 13:20:08 -0500 Subject: [PATCH 7/8] 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 1267eb8..db8d78b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 3.50.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://wiki.gnome.org/Apps/Evolution @@ -52,6 +52,12 @@ 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 + +# 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 @@ -578,6 +592,10 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Wed Feb 28 2024 Owen Taylor - 3.50.3-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 From b1d66824d092e564304ee71ebe62a735ccb765da Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 14 Oct 2024 17:14:30 +0200 Subject: [PATCH 8/8] Resolves: #2318389 (WebKitGTK 2.46.1: Middle mouse button inserts primary clipboard twice) --- evolution.spec | 8 ++++++-- webkitgtk-2.46.1.patch | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 webkitgtk-2.46.1.patch diff --git a/evolution.spec b/evolution.spec index db8d78b..44d77db 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 3.50.4 -Release: 2%{?dist} +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 @@ -53,6 +53,7 @@ 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 @@ -592,7 +593,10 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog -* Wed Feb 28 2024 Owen Taylor - 3.50.3-2 +* 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. 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 (