diff -Nru evolution-3.36.1/debian/changelog evolution-3.36.1/debian/changelog --- evolution-3.36.1/debian/changelog 2020-03-29 18:26:19.000000000 +0000 +++ evolution-3.36.1/debian/changelog 2020-04-15 14:27:07.000000000 +0000 @@ -1,3 +1,14 @@ +evolution (3.36.1-2) unstable; urgency=medium + + * debian/patches/git_auth_retry.patch: + - Should retry source authenticate after successful trust prompt + * debian/patches/git_ecal_management.patch: + - Calendar: Correct management of ECalComponentDateTime structures + * debian/patches/git_events_gap.patch: + - e-day-view: Add a gap between adjacent events + + -- Sebastien Bacher Wed, 15 Apr 2020 16:27:07 +0200 + evolution (3.36.1-1) unstable; urgency=medium * New upstream release diff -Nru evolution-3.36.1/debian/patches/git_auth_retry.patch evolution-3.36.1/debian/patches/git_auth_retry.patch --- evolution-3.36.1/debian/patches/git_auth_retry.patch 1970-01-01 00:00:00.000000000 +0000 +++ evolution-3.36.1/debian/patches/git_auth_retry.patch 2020-04-15 14:27:07.000000000 +0000 @@ -0,0 +1,27 @@ +From 3c74e3b0f5dab2b649a868518f51078d8cb7c4cc Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Tue, 31 Mar 2020 15:42:09 +0200 +Subject: [PATCH] e-shell: Should retry source authenticate after successful + trust prompt + +This was a bug in the code for https://gitlab.gnome.org/GNOME/evolution-data-server/issues/86, +noticed when working on https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/204. +--- + src/shell/e-shell.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/shell/e-shell.c b/src/shell/e-shell.c +index d1c4f93560..55b0421d77 100644 +--- a/src/shell/e-shell.c ++++ b/src/shell/e-shell.c +@@ -914,7 +914,7 @@ shell_trust_prompt_done_cb (GObject *source_object, + /* If a credentials prompt is required, then it'll be shown immediately. */ + e_credentials_prompter_set_auto_prompt_disabled_for (tpd->shell->priv->credentials_prompter, source, FALSE); + +- if (!shell_maybe_propagate_ssl_trust (tpd->shell, source, tpd->original_ssl_trust)) { ++ if (shell_maybe_propagate_ssl_trust (tpd->shell, source, tpd->original_ssl_trust)) { + /* NULL credentials to retry with those used the last time */ + e_source_invoke_authenticate (source, NULL, tpd->shell->priv->cancellable, + shell_source_invoke_authenticate_cb, tpd->shell); +-- + diff -Nru evolution-3.36.1/debian/patches/git_ecal_management.patch evolution-3.36.1/debian/patches/git_ecal_management.patch --- evolution-3.36.1/debian/patches/git_ecal_management.patch 1970-01-01 00:00:00.000000000 +0000 +++ evolution-3.36.1/debian/patches/git_ecal_management.patch 2020-04-15 14:27:07.000000000 +0000 @@ -0,0 +1,47 @@ +From 09dcf3325679d175c72bf10d79e05ae4215040ce Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Tue, 14 Apr 2020 14:25:44 +0200 +Subject: [PATCH] Calendar: Correct management of ECalComponentDateTime + structures + +Covers two memory leaks and one use of an incorrect free function. +--- + src/calendar/gui/comp-util.c | 2 ++ + src/calendar/gui/e-day-view.c | 3 ++- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/calendar/gui/comp-util.c b/src/calendar/gui/comp-util.c +index 1816c13d51..4fb3dc3092 100644 +--- a/src/calendar/gui/comp-util.c ++++ b/src/calendar/gui/comp-util.c +@@ -424,6 +424,8 @@ cal_comp_event_new_with_current_time_sync (ECalClient *client, + e_cal_component_set_dtend (comp, dt); + } + ++ e_cal_component_datetime_free (dt); ++ + return comp; + } + +diff --git a/src/calendar/gui/e-day-view.c b/src/calendar/gui/e-day-view.c +index 1fd1dd9890..543a163262 100644 +--- a/src/calendar/gui/e-day-view.c ++++ b/src/calendar/gui/e-day-view.c +@@ -5657,8 +5657,8 @@ e_day_view_finish_resize (EDayView *day_view) + (only_new_attendees ? E_CAL_OPS_SEND_FLAG_ONLY_NEW_ATTENDEES : 0)); + + out: ++ e_cal_component_datetime_free (date); + g_object_unref (comp); +- g_clear_object (&date); + } + + static void +@@ -9322,6 +9322,7 @@ e_day_view_on_top_canvas_drag_data_received (GtkWidget *widget, + zone ? g_strdup (i_cal_timezone_get_tzid (zone)) : NULL); + } + cal_comp_set_dtend_with_oldzone (client, comp, date); ++ e_cal_component_datetime_free (date); + + gtk_drag_finish (context, TRUE, TRUE, time); + diff -Nru evolution-3.36.1/debian/patches/git_events_gap.patch evolution-3.36.1/debian/patches/git_events_gap.patch --- evolution-3.36.1/debian/patches/git_events_gap.patch 1970-01-01 00:00:00.000000000 +0000 +++ evolution-3.36.1/debian/patches/git_events_gap.patch 2020-04-15 14:27:07.000000000 +0000 @@ -0,0 +1,27 @@ +From 91f8a62be0564e17413e1e38f717c7607ea69149 Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Tue, 14 Apr 2020 13:37:17 +0200 +Subject: [PATCH] I#870 - e-day-view: Add a gap between adjacent events + +Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/870 +--- + src/calendar/gui/e-day-view-main-item.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/calendar/gui/e-day-view-main-item.c b/src/calendar/gui/e-day-view-main-item.c +index 962c94fa1e..35840f261b 100644 +--- a/src/calendar/gui/e-day-view-main-item.c ++++ b/src/calendar/gui/e-day-view-main-item.c +@@ -461,7 +461,7 @@ day_view_main_item_draw_day_event (EDayViewMainItem *main_item, + x0 = item_x + E_DAY_VIEW_BAR_WIDTH; + y0 = item_y; + rect_width = item_w - E_DAY_VIEW_BAR_WIDTH; +- rect_height = item_h - 1; ++ rect_height = item_h - 2; + + cairo_rectangle (cr, x0, y0, rect_width, rect_height); + gdk_cairo_set_source_rgba (cr, &bg_rgba); +-- +2.24.1 + + diff -Nru evolution-3.36.1/debian/patches/series evolution-3.36.1/debian/patches/series --- evolution-3.36.1/debian/patches/series 2020-03-29 18:26:19.000000000 +0000 +++ evolution-3.36.1/debian/patches/series 2020-04-15 14:27:07.000000000 +0000 @@ -1,3 +1,6 @@ 02_nss_paths.patch 10_revert_libevolution_avoid-version.patch ubuntu_gettext_domain.patch +git_auth_retry.patch +git_ecal_management.patch +git_events_gap.patch