From d3536db1b03c1b7e089982e7bd5398f482a72eef Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 18 Aug 2022 07:41:50 +0200 Subject: [PATCH 01/10] Add rpminspect.yaml (settings for the RUNPATH test) --- rpminspect.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 rpminspect.yaml diff --git a/rpminspect.yaml b/rpminspect.yaml new file mode 100644 index 0000000..1ba6977 --- /dev/null +++ b/rpminspect.yaml @@ -0,0 +1,5 @@ +--- +runpath: + allowed_paths: + - /usr/lib/evolution + - /usr/lib64/evolution From 073a729a5e68fe74613c3c80b6e7bfea070b74e8 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 2 Sep 2022 09:08:18 +0200 Subject: [PATCH 02/10] Update to 3.45.3; Obsolete evolution-rss --- evolution.spec | 8 ++++++-- sources | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index eb75eb0..0daeeda 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.45.2 +Version: 3.45.3 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -59,6 +59,7 @@ Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} Obsoletes: evolution-perl < %{last_evo_perl_version} +Obsoletes: evolution-rss < 3.45.2 %if !%{enable_installed_tests} Obsoletes: evolution-tests <= 3.31.1 @@ -100,7 +101,6 @@ BuildRequires: pkgconfig(cairo-gobject) BuildRequires: pkgconfig(camel-1.2) >= %{eds_version} BuildRequires: pkgconfig(enchant-2) BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version} -BuildRequires: pkgconfig(gcr-4-gtk3) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version} @@ -571,6 +571,10 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Sep 02 2022 Milan Crha - 3.45.3-1 +- Update to 3.45.3 +- Obsolete evolution-rss + * Fri Aug 05 2022 Milan Crha - 3.45.2-1 - Update to 3.45.2 diff --git a/sources b/sources index 9b24fc5..ac11e1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.45.2.tar.xz) = ceed12be87dbe2f94a09da13ed71d9036e2d20ebc60df8854e27ba395184a4b9eeca97c9884e5dbd46da9b4f8ad21d9203b5ca2ad3292316ac8f999b11815392 +SHA512 (evolution-3.45.3.tar.xz) = 40d3119e5c07e420c497c9e86107bf11759188916d1dc04c9507e5486da6bc150d5bd584c8e2f16ba341ce83c1e25c21356f8b1ca0a1c00eb2e3a8219c6cf251 From 0122d58058aae60653195619e70e5b75f8b720aa Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 16 Sep 2022 07:57:03 +0200 Subject: [PATCH 03/10] Update to 3.46.0 --- evolution.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 0daeeda..ffc4a0a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,12 +43,12 @@ ### Abstract ### Name: evolution -Version: 3.45.3 +Version: 3.46.0 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution -Source: http://download.gnome.org/sources/%{name}/3.45/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.46/%{name}-%{version}.tar.xz Source1: flatpak-evolution-fix-service-names.sh Source2: flatpak-evolution-wrapper.sh.in @@ -571,6 +571,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Sep 16 2022 Milan Crha - 3.46.0-1 +- Update to 3.46.0 + * Fri Sep 02 2022 Milan Crha - 3.45.3-1 - Update to 3.45.3 - Obsolete evolution-rss diff --git a/sources b/sources index ac11e1a..7919952 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.45.3.tar.xz) = 40d3119e5c07e420c497c9e86107bf11759188916d1dc04c9507e5486da6bc150d5bd584c8e2f16ba341ce83c1e25c21356f8b1ca0a1c00eb2e3a8219c6cf251 +SHA512 (evolution-3.46.0.tar.xz) = 58b532711196e7c79cffa2357245743562a94fd9629718066ba16a26889fb45f94992e4cc3cf0d3911356b700abecb05099c5c854749db282a241321c0d0c605 From b286ac494bf92441904f458df4cb9df8debf9ec9 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 23 Sep 2022 09:30:06 +0200 Subject: [PATCH 04/10] Resolves: #2129068 (Busy loop when opening composer window) --- ...rButton-Avoid-busy-loop-on-toggle-ac.patch | 174 ++++++++++++++++++ evolution.spec | 7 +- 2 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch diff --git a/0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch b/0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch new file mode 100644 index 0000000..c9f600c --- /dev/null +++ b/0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch @@ -0,0 +1,174 @@ +diff --git a/src/e-util/e-headerbar-button.c b/src/e-util/e-headerbar-button.c +index 70dad04173..248a278ea4 100644 +--- a/src/e-util/e-headerbar-button.c ++++ b/src/e-util/e-headerbar-button.c +@@ -136,8 +136,10 @@ header_bar_button_update_button (EHeaderBarButton *header_bar_button) + } + + static void +-header_bar_button_clicked (EHeaderBarButton *header_bar_button) ++header_bar_button_clicked (GtkWidget *button, ++ gpointer user_data) + { ++ EHeaderBarButton *header_bar_button = user_data; + GtkAction *action; + + if (header_bar_button->priv->action == NULL) +@@ -149,6 +151,15 @@ header_bar_button_clicked (EHeaderBarButton *header_bar_button) + gtk_action_activate (action); + } + ++static void ++header_bar_button_action_activate_cb (GObject *button, ++ gpointer user_data) ++{ ++ GtkAction *action = user_data; ++ ++ gtk_action_activate (action); ++} ++ + static void + header_bar_button_set_prefer_item (EHeaderBarButton *self, + const gchar *prefer_item) +@@ -178,12 +189,63 @@ header_bar_button_transform_sensitive_cb (GBinding *binding, + return TRUE; + } + ++typedef struct _ToggleActionData { ++ GWeakRef *button_weakref; ++ gulong handler_id; ++} ToggleActionData; ++ ++static void ++toggle_action_data_free (gpointer ptr, ++ GClosure *closure) ++{ ++ ToggleActionData *tad = ptr; ++ ++ if (tad) { ++ e_weak_ref_free (tad->button_weakref); ++ g_free (tad); ++ } ++} ++ ++static void ++header_button_action_notify_active_cb (GObject *action, ++ GParamSpec *param, ++ gpointer user_data) ++{ ++ ToggleActionData *tad = user_data; ++ GtkToggleButton *button; ++ gboolean active = FALSE; ++ ++ button = g_weak_ref_get (tad->button_weakref); ++ if (!button) ++ return; ++ ++ g_object_get (action, "active", &active, NULL); ++ ++ /* The "clicked" callback calls gtk_action_activate(), which, in case ++ of the toggle action, means to flip the option, thus it calls a notification ++ about action's 'active' property change, which leads back here, causing ++ a busy loop though the signal handlers. Blocking the handler breaks the loop. */ ++ if (tad->handler_id) ++ g_signal_handler_block (button, tad->handler_id); ++ ++ if ((gtk_toggle_button_get_active (button) ? 1 : 0) != (active ? 1 : 0)) ++ gtk_toggle_button_set_active (button, active); ++ ++ if (tad->handler_id) ++ g_signal_handler_unblock (button, tad->handler_id); ++ ++ g_clear_object (&button); ++} ++ + static GtkWidget * + header_bar_button_add_action (EHeaderBarButton *header_bar_button, + const gchar *label, +- GtkAction *action) ++ GtkAction *action, ++ GCallback clicked_cb, ++ gpointer clicked_cb_user_data) + { + GtkWidget *button; ++ gulong clicked_handler = 0; + + if (GTK_IS_TOGGLE_ACTION (action)) + button = gtk_toggle_button_new_with_label (label); +@@ -194,6 +256,11 @@ header_bar_button_add_action (EHeaderBarButton *header_bar_button, + + gtk_box_pack_start (GTK_BOX (header_bar_button), button, FALSE, FALSE, 0); + ++ if (clicked_cb) { ++ clicked_handler = g_signal_connect_object ( ++ button, "clicked", clicked_cb, clicked_cb_user_data, 0); ++ } ++ + if (action) { + e_binding_bind_property_full ( + action, "sensitive", +@@ -203,10 +270,17 @@ header_bar_button_add_action (EHeaderBarButton *header_bar_button, + NULL, NULL, NULL); + + if (GTK_IS_TOGGLE_ACTION (action)) { +- e_binding_bind_property ( +- action, "active", +- button, "active", +- G_BINDING_SYNC_CREATE); ++ ToggleActionData *tad; ++ ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), ++ gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); ++ ++ tad = g_new0 (ToggleActionData, 1); ++ tad->button_weakref = e_weak_ref_new (button); ++ tad->handler_id = clicked_handler; ++ ++ g_signal_connect_data (action, "notify::active", ++ G_CALLBACK (header_button_action_notify_active_cb), tad, toggle_action_data_free, 0); + } + + header_bar_button_update_button_for_action (GTK_BUTTON (button), action); +@@ -278,16 +352,14 @@ header_bar_button_constructed (GObject *object) + + header_bar_button->priv->button = header_bar_button_add_action (header_bar_button, + header_bar_button->priv->label, +- header_bar_button->priv->action); ++ header_bar_button->priv->action, ++ G_CALLBACK (header_bar_button_clicked), ++ header_bar_button); + + /* TODO: GTK4 port: do not use linked buttons + * https://developer.gnome.org/hig/patterns/containers/header-bars.html#button-grouping */ + style_context = gtk_widget_get_style_context (GTK_WIDGET (header_bar_button)); + gtk_style_context_add_class (style_context, "linked"); +- +- g_signal_connect_swapped ( +- header_bar_button->priv->button, "clicked", +- G_CALLBACK (header_bar_button_clicked), header_bar_button); + } + + static void +@@ -393,17 +465,11 @@ e_header_bar_button_add_action (EHeaderBarButton *header_bar_button, + const gchar *label, + GtkAction *action) + { +- GtkWidget *button; +- + g_return_if_fail (E_IS_HEADER_BAR_BUTTON (header_bar_button)); + g_return_if_fail (GTK_IS_ACTION (action)); + +- button = header_bar_button_add_action (header_bar_button, label, action); +- +- g_signal_connect_object ( +- button, "clicked", +- G_CALLBACK (gtk_action_activate), action, +- G_CONNECT_SWAPPED); ++ header_bar_button_add_action (header_bar_button, label, action, ++ G_CALLBACK (header_bar_button_action_activate_cb), action); + } + + /** +-- +2.37.3 + diff --git a/evolution.spec b/evolution.spec index ffc4a0a..cd131bd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 3.46.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution @@ -52,6 +52,8 @@ Source: http://download.gnome.org/sources/%{name}/3.46/%{name}-%{version}.tar.xz Source1: flatpak-evolution-fix-service-names.sh Source2: flatpak-evolution-wrapper.sh.in +Patch01: 0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch + # Approximate version number Provides: bundled(libgnomecanvas) = 2.30.0 @@ -571,6 +573,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Sep 23 2022 Milan Crha - 3.46.0-2 +- Resolves: #2129068 (Busy loop when opening composer window) + * Fri Sep 16 2022 Milan Crha - 3.46.0-1 - Update to 3.46.0 From 5a6ba462f7f64a63c353bec53afeb3804519cd2b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 21 Oct 2022 08:38:47 +0200 Subject: [PATCH 05/10] Update to 3.46.1 --- ...rButton-Avoid-busy-loop-on-toggle-ac.patch | 174 ------------------ evolution.spec | 9 +- sources | 2 +- 3 files changed, 6 insertions(+), 179 deletions(-) delete mode 100644 0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch diff --git a/0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch b/0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch deleted file mode 100644 index c9f600c..0000000 --- a/0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch +++ /dev/null @@ -1,174 +0,0 @@ -diff --git a/src/e-util/e-headerbar-button.c b/src/e-util/e-headerbar-button.c -index 70dad04173..248a278ea4 100644 ---- a/src/e-util/e-headerbar-button.c -+++ b/src/e-util/e-headerbar-button.c -@@ -136,8 +136,10 @@ header_bar_button_update_button (EHeaderBarButton *header_bar_button) - } - - static void --header_bar_button_clicked (EHeaderBarButton *header_bar_button) -+header_bar_button_clicked (GtkWidget *button, -+ gpointer user_data) - { -+ EHeaderBarButton *header_bar_button = user_data; - GtkAction *action; - - if (header_bar_button->priv->action == NULL) -@@ -149,6 +151,15 @@ header_bar_button_clicked (EHeaderBarButton *header_bar_button) - gtk_action_activate (action); - } - -+static void -+header_bar_button_action_activate_cb (GObject *button, -+ gpointer user_data) -+{ -+ GtkAction *action = user_data; -+ -+ gtk_action_activate (action); -+} -+ - static void - header_bar_button_set_prefer_item (EHeaderBarButton *self, - const gchar *prefer_item) -@@ -178,12 +189,63 @@ header_bar_button_transform_sensitive_cb (GBinding *binding, - return TRUE; - } - -+typedef struct _ToggleActionData { -+ GWeakRef *button_weakref; -+ gulong handler_id; -+} ToggleActionData; -+ -+static void -+toggle_action_data_free (gpointer ptr, -+ GClosure *closure) -+{ -+ ToggleActionData *tad = ptr; -+ -+ if (tad) { -+ e_weak_ref_free (tad->button_weakref); -+ g_free (tad); -+ } -+} -+ -+static void -+header_button_action_notify_active_cb (GObject *action, -+ GParamSpec *param, -+ gpointer user_data) -+{ -+ ToggleActionData *tad = user_data; -+ GtkToggleButton *button; -+ gboolean active = FALSE; -+ -+ button = g_weak_ref_get (tad->button_weakref); -+ if (!button) -+ return; -+ -+ g_object_get (action, "active", &active, NULL); -+ -+ /* The "clicked" callback calls gtk_action_activate(), which, in case -+ of the toggle action, means to flip the option, thus it calls a notification -+ about action's 'active' property change, which leads back here, causing -+ a busy loop though the signal handlers. Blocking the handler breaks the loop. */ -+ if (tad->handler_id) -+ g_signal_handler_block (button, tad->handler_id); -+ -+ if ((gtk_toggle_button_get_active (button) ? 1 : 0) != (active ? 1 : 0)) -+ gtk_toggle_button_set_active (button, active); -+ -+ if (tad->handler_id) -+ g_signal_handler_unblock (button, tad->handler_id); -+ -+ g_clear_object (&button); -+} -+ - static GtkWidget * - header_bar_button_add_action (EHeaderBarButton *header_bar_button, - const gchar *label, -- GtkAction *action) -+ GtkAction *action, -+ GCallback clicked_cb, -+ gpointer clicked_cb_user_data) - { - GtkWidget *button; -+ gulong clicked_handler = 0; - - if (GTK_IS_TOGGLE_ACTION (action)) - button = gtk_toggle_button_new_with_label (label); -@@ -194,6 +256,11 @@ header_bar_button_add_action (EHeaderBarButton *header_bar_button, - - gtk_box_pack_start (GTK_BOX (header_bar_button), button, FALSE, FALSE, 0); - -+ if (clicked_cb) { -+ clicked_handler = g_signal_connect_object ( -+ button, "clicked", clicked_cb, clicked_cb_user_data, 0); -+ } -+ - if (action) { - e_binding_bind_property_full ( - action, "sensitive", -@@ -203,10 +270,17 @@ header_bar_button_add_action (EHeaderBarButton *header_bar_button, - NULL, NULL, NULL); - - if (GTK_IS_TOGGLE_ACTION (action)) { -- e_binding_bind_property ( -- action, "active", -- button, "active", -- G_BINDING_SYNC_CREATE); -+ ToggleActionData *tad; -+ -+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), -+ gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))); -+ -+ tad = g_new0 (ToggleActionData, 1); -+ tad->button_weakref = e_weak_ref_new (button); -+ tad->handler_id = clicked_handler; -+ -+ g_signal_connect_data (action, "notify::active", -+ G_CALLBACK (header_button_action_notify_active_cb), tad, toggle_action_data_free, 0); - } - - header_bar_button_update_button_for_action (GTK_BUTTON (button), action); -@@ -278,16 +352,14 @@ header_bar_button_constructed (GObject *object) - - header_bar_button->priv->button = header_bar_button_add_action (header_bar_button, - header_bar_button->priv->label, -- header_bar_button->priv->action); -+ header_bar_button->priv->action, -+ G_CALLBACK (header_bar_button_clicked), -+ header_bar_button); - - /* TODO: GTK4 port: do not use linked buttons - * https://developer.gnome.org/hig/patterns/containers/header-bars.html#button-grouping */ - style_context = gtk_widget_get_style_context (GTK_WIDGET (header_bar_button)); - gtk_style_context_add_class (style_context, "linked"); -- -- g_signal_connect_swapped ( -- header_bar_button->priv->button, "clicked", -- G_CALLBACK (header_bar_button_clicked), header_bar_button); - } - - static void -@@ -393,17 +465,11 @@ e_header_bar_button_add_action (EHeaderBarButton *header_bar_button, - const gchar *label, - GtkAction *action) - { -- GtkWidget *button; -- - g_return_if_fail (E_IS_HEADER_BAR_BUTTON (header_bar_button)); - g_return_if_fail (GTK_IS_ACTION (action)); - -- button = header_bar_button_add_action (header_bar_button, label, action); -- -- g_signal_connect_object ( -- button, "clicked", -- G_CALLBACK (gtk_action_activate), action, -- G_CONNECT_SWAPPED); -+ header_bar_button_add_action (header_bar_button, label, action, -+ G_CALLBACK (header_bar_button_action_activate_cb), action); - } - - /** --- -2.37.3 - diff --git a/evolution.spec b/evolution.spec index cd131bd..b178dba 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,8 +43,8 @@ ### Abstract ### Name: evolution -Version: 3.46.0 -Release: 2%{?dist} +Version: 3.46.1 +Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution @@ -52,8 +52,6 @@ Source: http://download.gnome.org/sources/%{name}/3.46/%{name}-%{version}.tar.xz Source1: flatpak-evolution-fix-service-names.sh Source2: flatpak-evolution-wrapper.sh.in -Patch01: 0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch - # Approximate version number Provides: bundled(libgnomecanvas) = 2.30.0 @@ -573,6 +571,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Oct 21 2022 Milan Crha - 3.46.1-1 +- Update to 3.46.1 + * Fri Sep 23 2022 Milan Crha - 3.46.0-2 - Resolves: #2129068 (Busy loop when opening composer window) diff --git a/sources b/sources index 7919952..963bda9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.46.0.tar.xz) = 58b532711196e7c79cffa2357245743562a94fd9629718066ba16a26889fb45f94992e4cc3cf0d3911356b700abecb05099c5c854749db282a241321c0d0c605 +SHA512 (evolution-3.46.1.tar.xz) = 20b6a5663ec6ab43af6ec7c15a64b1d1070f8488aaebd3fbaca4b4cc8b70bf4b8087b047e5b75e37273818b8d1d6bde5139c708284626e9d3c15b83dc09f5d3b From e4217e2aeadf00c92682155be201bf4fafe7e696 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 2 Dec 2022 13:29:40 +0100 Subject: [PATCH 06/10] Update to 3.46.2 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index b178dba..97b5355 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.46.1 +Version: 3.46.2 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -571,6 +571,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Dec 02 2022 Milan Crha - 3.46.2-1 +- Update to 3.46.2 + * Fri Oct 21 2022 Milan Crha - 3.46.1-1 - Update to 3.46.1 diff --git a/sources b/sources index 963bda9..4d53445 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.46.1.tar.xz) = 20b6a5663ec6ab43af6ec7c15a64b1d1070f8488aaebd3fbaca4b4cc8b70bf4b8087b047e5b75e37273818b8d1d6bde5139c708284626e9d3c15b83dc09f5d3b +SHA512 (evolution-3.46.2.tar.xz) = f5621640503a36ee00cce4f7075d58e743c7438e019d6a26883315ea24b90c4d92c37d9c8b6d97315f5388d14aa21911883e2d06ad5a66ca20568d13cab45734 From 65c13cf9d8db1e5e0212bc82a29a173058323219 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 6 Jan 2023 11:13:40 +0100 Subject: [PATCH 07/10] Update to 3.46.3 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 97b5355..da7f4b1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.46.2 +Version: 3.46.3 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -571,6 +571,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Jan 06 2023 Milan Crha - 3.46.3-1 +- Update to 3.46.3 + * Fri Dec 02 2022 Milan Crha - 3.46.2-1 - Update to 3.46.2 diff --git a/sources b/sources index 4d53445..e6724ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.46.2.tar.xz) = f5621640503a36ee00cce4f7075d58e743c7438e019d6a26883315ea24b90c4d92c37d9c8b6d97315f5388d14aa21911883e2d06ad5a66ca20568d13cab45734 +SHA512 (evolution-3.46.3.tar.xz) = 3c832509dba78a07dd7521c049214377108a1866c754afb1c756f9a487b648612480b4a17d853d9ec59f1c209667b29b5711f1e5e1b336e344cbed7bf8dd4069 From 0327d59695545e2962a2387a5e4447e3d95c3a66 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 10 Feb 2023 09:21:39 +0100 Subject: [PATCH 08/10] Update to 3.46.4 --- evolution.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index da7f4b1..56f748d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ ### Abstract ### Name: evolution -Version: 3.46.3 +Version: 3.46.4 Release: 1%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -571,6 +571,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Fri Feb 10 2023 Milan Crha - 3.46.4-1 +- Update to 3.46.4 + * Fri Jan 06 2023 Milan Crha - 3.46.3-1 - Update to 3.46.3 diff --git a/sources b/sources index e6724ab..946a73f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.46.3.tar.xz) = 3c832509dba78a07dd7521c049214377108a1866c754afb1c756f9a487b648612480b4a17d853d9ec59f1c209667b29b5711f1e5e1b336e344cbed7bf8dd4069 +SHA512 (evolution-3.46.4.tar.xz) = 349270f84ee435452601e49a942478d9ef8060638b74135478b0f531bebc7be99019be749d7acb14237e9ff042e0443db30f053465ebc9f821263d86d8d8ae95 From 3c66b448c2edea6fddbfb2fc979db139262ab5bd Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 28 Feb 2023 15:03:07 +0100 Subject: [PATCH 09/10] Resolves: #2142385 (Properly apply TEMP_HOME compile time option for Flatpak) --- evolution.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 56f748d..c17e451 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 3.46.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution @@ -287,7 +287,14 @@ fi %global tnef_flags -DENABLE_YTNEF=OFF %endif -CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations"; export CFLAGS +%if 0%{?flatpak} +%global temp_home "-DTEMP_HOME=1" +%else +%global temp_home "" +%endif + +CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations %temp_home" +export CFLAGS %cmake -G "Unix Makefiles" \ -DENABLE_MAINTAINER_MODE=OFF \ @@ -296,7 +303,6 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated -DENABLE_PLUGINS=all \ %if 0%{?flatpak} "-DWITH_WMCLASS_OVERRIDE=evolution.bin" \ - "-DTEMP_HOME=1" \ %endif %{nil} @@ -571,6 +577,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang %endif %changelog +* Tue Feb 28 2023 Milan Crha - 3.46.4-2 +- Resolves: #2142385 (Properly apply TEMP_HOME compile time option for Flatpak) + * Fri Feb 10 2023 Milan Crha - 3.46.4-1 - Update to 3.46.4 From 7fbd0934859ff963bbe436f85c583f58c16dc102 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 31 Mar 2023 12:36:26 +0200 Subject: [PATCH 10/10] flatpak: Stop disabling WebKitGTK's sandbox The WebKitGTK 2.40.0 ignores the environment variable and only claims a warning on the console, thus remove it. --- flatpak-evolution-wrapper.sh.in | 1 - 1 file changed, 1 deletion(-) diff --git a/flatpak-evolution-wrapper.sh.in b/flatpak-evolution-wrapper.sh.in index 1b42f20..6a311fc 100644 --- a/flatpak-evolution-wrapper.sh.in +++ b/flatpak-evolution-wrapper.sh.in @@ -5,7 +5,6 @@ if [ "$1" = "--quit" -o "$1" = "--force-shutdown" ]; then else export BOGOFILTER_DIR="${XDG_DATA_HOME}/bogofilter/" export GIO_USE_NETWORK_MONITOR=base - export WEBKIT_FORCE_SANDBOX=0 gsettings reset org.gnome.evolution-data-server network-monitor-gio-name LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc -l)