[gentoo-commits] repo/gentoo:master commit in: mail-client/evolution/files/

[Aaron Bauman]

commit:     bf5b2b5712fdbb3a48492d64f0181ba5d28b140b
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon May 20 17:20:35 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Jul 20 19:38:29 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5b2b57

mail-client/evolution: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../evolution/files/3.24.6-DESTDIR-honoring.patch  |  53 -----
 .../evolution/files/3.24.6-libical3-compat.patch   | 265 ---------------------
 2 files changed, 318 deletions(-)

diff --git a/mail-client/evolution/files/3.24.6-DESTDIR-honoring.patch b/mail-client/evolution/files/3.24.6-DESTDIR-honoring.patch
deleted file mode 100644
index 7e024c937e7..00000000000
--- a/mail-client/evolution/files/3.24.6-DESTDIR-honoring.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From cb845f462072d1d1e4045eac5f16b4db1f552309 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@××××××.com>
-Date: Mon, 2 Oct 2017 19:22:41 +0200
-Subject: [PATCH] Bug 781645 - Skip GSettings schema compile and icon cache
- update when DESTDIR is set
-
-(cherry picked from commit b40001cac702a74f818afb3f38acf9521e9d7b62)
----
- cmake/modules/GLibTools.cmake | 8 +++++---
- cmake/modules/IconCache.cmake | 8 +++++---
- 2 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake
-index fc8eb827c8..f0be5586db 100644
---- a/cmake/modules/GLibTools.cmake
-+++ b/cmake/modules/GLibTools.cmake
-@@ -238,9 +238,11 @@ macro(add_gsettings_schemas _target _schema0)
- 	if(_install_code)
- 		# Compile gsettings schemas and ensure that all of them are in the place.
- 		install(CODE
--			"execute_process(${_install_code}
--				COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
--			)")
-+			"if(\"\$ENV{DESTDIR}\" STREQUAL \"\")
-+				execute_process(${_install_code}
-+					COMMAND ${CMAKE_COMMAND} -E chdir . \"${GLIB_COMPILE_SCHEMAS}\" \"${GSETTINGS_SCHEMAS_DIR}\"
-+				)
-+			endif(\"\$ENV{DESTDIR}\" STREQUAL \"\")")
- 	endif(_install_code)
- endmacro(add_gsettings_schemas)
- 
-diff --git a/cmake/modules/IconCache.cmake b/cmake/modules/IconCache.cmake
-index 6f7f5f0f24..145b843f1d 100644
---- a/cmake/modules/IconCache.cmake
-+++ b/cmake/modules/IconCache.cmake
-@@ -60,9 +60,11 @@ macro(add_icon_cache_files _destdir _fileslistvar)
- 
- 	if(GTK_UPDATE_ICON_CACHE)
- 		install(CODE
--			"execute_process(${_install_code}
--				COMMAND ${CMAKE_COMMAND} -E chdir . ${_update_icon_cache_cmd}
--			)")
-+			"if(\"\$ENV{DESTDIR}\" STREQUAL \"\")
-+				execute_process(${_install_code}
-+					COMMAND ${CMAKE_COMMAND} -E chdir . ${_update_icon_cache_cmd}
-+				)
-+			endif(\"\$ENV{DESTDIR}\" STREQUAL \"\")")
- 	endif(GTK_UPDATE_ICON_CACHE)
- endmacro(add_icon_cache_files)
- 
--- 
-2.15.1
-

diff --git a/mail-client/evolution/files/3.24.6-libical3-compat.patch b/mail-client/evolution/files/3.24.6-libical3-compat.patch
deleted file mode 100644
index a7e5da268ee..00000000000
--- a/mail-client/evolution/files/3.24.6-libical3-compat.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-From a1bfd863de7732d138a6cdd4c08c763f81560c34 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@××××××.com>
-Date: Wed, 23 Aug 2017 14:11:12 +0200
-Subject: [PATCH 1/2] Bug 786163 - [ECalModel] Do not convert UTC times to
- local time zone
-
-(cherry picked from commit 7a3abddc2f0b12916a607da27cbd6817f28de737)
----
- src/calendar/gui/e-cal-model.c | 27 ---------------------------
- 1 file changed, 27 deletions(-)
-
-diff --git a/src/calendar/gui/e-cal-model.c b/src/calendar/gui/e-cal-model.c
-index 582fd7f3ea..75bf60fb2f 100644
---- a/src/calendar/gui/e-cal-model.c
-+++ b/src/calendar/gui/e-cal-model.c
-@@ -1943,32 +1943,6 @@ e_cal_model_get_component_index (ECalModel *model,
- 	return -1;
- }
- 
--/* We do this check since the calendar items are downloaded from the server
-- * in the open_method, since the default timezone might not be set there. */
--static void
--ensure_dates_are_in_default_zone (ECalModel *model,
--                                  icalcomponent *icalcomp)
--{
--	icaltimetype dt;
--	icaltimezone *zone;
--
--	zone = e_cal_model_get_timezone (model);
--	if (!zone)
--		return;
--
--	dt = icalcomponent_get_dtstart (icalcomp);
--	if (dt.is_utc) {
--		dt = icaltime_convert_to_zone (dt, zone);
--		icalcomponent_set_dtstart (icalcomp, dt);
--	}
--
--	dt = icalcomponent_get_dtend (icalcomp);
--	if (dt.is_utc) {
--		dt = icaltime_convert_to_zone (dt, zone);
--		icalcomponent_set_dtend (icalcomp, dt);
--	}
--}
--
- static void
- cal_model_data_subscriber_component_added_or_modified (ECalDataModelSubscriber *subscriber,
- 						       ECalClient *client,
-@@ -1995,7 +1969,6 @@ cal_model_data_subscriber_component_added_or_modified (ECalDataModelSubscriber *
- 
- 	table_model = E_TABLE_MODEL (model);
- 	icalcomp = icalcomponent_new_clone (e_cal_component_get_icalcomponent (comp));
--	ensure_dates_are_in_default_zone (model, icalcomp);
- 
- 	if (index < 0) {
- 		e_table_model_pre_change (table_model);
--- 
-2.15.1
-
-
-From f9d1eb89115b62bf6fd9d986856a4f4d26fc8e49 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@××××××.com>
-Date: Wed, 4 Oct 2017 11:57:56 +0200
-Subject: [PATCH 2/2] Use icaltime_is_utc() instead of icaltimetype::is_utc
-
-The structure member is going to be removed from libical in the next release
-and the function is available for a long time, thus it's safe to replace
-the usage in the code.
-
-(cherry picked from commit ec8468efd71e8c81ebd6933646486237c32dd2b0)
----
- src/calendar/gui/comp-util.c                     | 6 +++---
- src/calendar/gui/e-cal-component-preview.c       | 2 +-
- src/calendar/gui/e-comp-editor-event.c           | 8 +++-----
- src/calendar/gui/e-comp-editor-page-recurrence.c | 1 -
- src/calendar/gui/e-comp-editor-property-part.c   | 2 --
- src/calendar/gui/e-comp-editor-task.c            | 2 +-
- src/calendar/gui/e-meeting-store.c               | 4 ++--
- src/calendar/gui/itip-utils.c                    | 2 +-
- src/modules/itip-formatter/itip-view.c           | 8 ++++----
- 9 files changed, 15 insertions(+), 20 deletions(-)
-
-diff --git a/src/calendar/gui/comp-util.c b/src/calendar/gui/comp-util.c
-index 6de47e8057..81d7b91b96 100644
---- a/src/calendar/gui/comp-util.c
-+++ b/src/calendar/gui/comp-util.c
-@@ -123,8 +123,8 @@ cal_comp_util_compare_event_timezones (ECalComponent *comp,
- 	/* If the event uses UTC for DTSTART & DTEND, return TRUE. Outlook
- 	 * will send single events as UTC, so we don't want to mark all of
- 	 * these. */
--	if ((!start_datetime.value || start_datetime.value->is_utc)
--	    && (!end_datetime.value || end_datetime.value->is_utc)) {
-+	if ((!start_datetime.value || icaltime_is_utc (*start_datetime.value))
-+	    && (!end_datetime.value || icaltime_is_utc (*end_datetime.value))) {
- 		retval = TRUE;
- 		goto out;
- 	}
-@@ -1328,7 +1328,7 @@ cal_comp_util_update_tzid_parameter (icalproperty *prop,
- 	if (tt.zone)
- 		tzid = icaltimezone_get_tzid ((icaltimezone *) tt.zone);
- 
--	if (tt.zone && tzid && *tzid && !tt.is_utc && !tt.is_date) {
-+	if (tt.zone && tzid && *tzid && !icaltime_is_utc (tt) && !tt.is_date) {
- 		if (param) {
- 			icalparameter_set_tzid (param, (gchar *) tzid);
- 		} else {
-diff --git a/src/calendar/gui/e-cal-component-preview.c b/src/calendar/gui/e-cal-component-preview.c
-index 67e56906e2..5801f71fc2 100644
---- a/src/calendar/gui/e-cal-component-preview.c
-+++ b/src/calendar/gui/e-cal-component-preview.c
-@@ -168,7 +168,7 @@ timet_to_str_with_zone (ECalComponentDateTime *dt,
- 	if (dt->tzid != NULL) {
- 		e_cal_client_get_timezone_sync (
- 			client, dt->tzid, &zone, NULL, NULL);
--	} else if (dt->value->is_utc) {
-+	} else if (icaltime_is_utc (*dt->value)) {
- 		zone = icaltimezone_get_utc_timezone ();
- 	}
- 
-diff --git a/src/calendar/gui/e-comp-editor-event.c b/src/calendar/gui/e-comp-editor-event.c
-index d56c1c9e90..40546a90aa 100644
---- a/src/calendar/gui/e-comp-editor-event.c
-+++ b/src/calendar/gui/e-comp-editor-event.c
-@@ -286,7 +286,7 @@ ece_event_update_timezone (ECompEditorEvent *event_editor,
- 	if (icalcomponent_get_first_property (component, ICAL_DTSTART_PROPERTY)) {
- 		dtstart = icalcomponent_get_dtstart (component);
- 		if (icaltime_is_valid_time (dtstart)) {
--			if (dtstart.is_utc)
-+			if (icaltime_is_utc (dtstart))
- 				zone = icaltimezone_get_utc_timezone ();
- 			else
- 				zone = ece_event_get_timezone_from_property (comp_editor,
-@@ -297,7 +297,7 @@ ece_event_update_timezone (ECompEditorEvent *event_editor,
- 	if (icalcomponent_get_first_property (component, ICAL_DTEND_PROPERTY)) {
- 		dtend = icalcomponent_get_dtend (component);
- 		if (!zone && icaltime_is_valid_time (dtend)) {
--			if (dtend.is_utc)
-+			if (icaltime_is_utc (dtend))
- 				zone = icaltimezone_get_utc_timezone ();
- 			else
- 				zone = ece_event_get_timezone_from_property (comp_editor,
-@@ -310,7 +310,7 @@ ece_event_update_timezone (ECompEditorEvent *event_editor,
- 
- 		itt = icalcomponent_get_due (component);
- 		if (icaltime_is_valid_time (itt)) {
--			if (itt.is_utc)
-+			if (icaltime_is_utc (itt))
- 				zone = icaltimezone_get_utc_timezone ();
- 			else
- 				zone = ece_event_get_timezone_from_property (comp_editor,
-@@ -497,10 +497,8 @@ ece_event_fill_component (ECompEditor *comp_editor,
- 				dtstart.zone = e_timezone_entry_get_timezone (E_TIMEZONE_ENTRY (timezone_entry));
- 				if (!dtstart.zone)
- 					dtstart.zone = icaltimezone_get_utc_timezone ();
--				dtstart.is_utc = dtstart.zone == icaltimezone_get_utc_timezone ();
- 
- 				dtend.zone = dtstart.zone;
--				dtend.is_utc = dtstart.is_utc;
- 
- 				set_dtstart = TRUE;
- 				set_dtend = TRUE;
-diff --git a/src/calendar/gui/e-comp-editor-page-recurrence.c b/src/calendar/gui/e-comp-editor-page-recurrence.c
-index 7f302dfc7f..139f07d1d3 100644
---- a/src/calendar/gui/e-comp-editor-page-recurrence.c
-+++ b/src/calendar/gui/e-comp-editor-page-recurrence.c
-@@ -1088,7 +1088,6 @@ ecep_recurrence_fill_ending_date (ECompEditorPageRecurrence *page_recurrence,
- 				rrule->until.minute = 0;
- 				rrule->until.second = 0;
- 				rrule->until.is_date = TRUE;
--				rrule->until.is_utc = FALSE;
- 			}
- 
- 			page_recurrence->priv->ending_date_tt = rrule->until;
-diff --git a/src/calendar/gui/e-comp-editor-property-part.c b/src/calendar/gui/e-comp-editor-property-part.c
-index bc42ef15c1..bb3582a6b8 100644
---- a/src/calendar/gui/e-comp-editor-property-part.c
-+++ b/src/calendar/gui/e-comp-editor-property-part.c
-@@ -872,8 +872,6 @@ e_comp_editor_property_part_datetime_get_value (ECompEditorPropertyPartDatetime
- 			value.zone = e_timezone_entry_get_timezone (timezone_entry);
- 		if (!value.zone)
- 			value.zone = icaltimezone_get_utc_timezone ();
--
--		value.is_utc = value.zone == icaltimezone_get_utc_timezone ();
- 	}
- 
- 	g_clear_object (&timezone_entry);
-diff --git a/src/calendar/gui/e-comp-editor-task.c b/src/calendar/gui/e-comp-editor-task.c
-index 16f31d8d32..86c1dca9ae 100644
---- a/src/calendar/gui/e-comp-editor-task.c
-+++ b/src/calendar/gui/e-comp-editor-task.c
-@@ -120,7 +120,7 @@ ece_task_update_timezone (ECompEditorTask *task_editor,
- 				if (force_allday && dt.is_date)
- 					*force_allday = TRUE;
- 
--				if (dt.is_utc)
-+				if (icaltime_is_utc (dt))
- 					zone = icaltimezone_get_utc_timezone ();
- 				else
- 					zone = ece_task_get_timezone_from_property (comp_editor,
-diff --git a/src/calendar/gui/e-meeting-store.c b/src/calendar/gui/e-meeting-store.c
-index 13c2e8643b..ae5b1f5c0f 100644
---- a/src/calendar/gui/e-meeting-store.c
-+++ b/src/calendar/gui/e-meeting-store.c
-@@ -1347,7 +1347,7 @@ process_free_busy_comp (EMeetingAttendee *attendee,
- 		icaltimezone *ds_zone;
- 
- 		dtstart = icalproperty_get_dtstart (ip);
--		if (!dtstart.is_utc)
-+		if (!icaltime_is_utc (dtstart))
- 			ds_zone = find_zone (ip, tz_top_level);
- 		else
- 			ds_zone = icaltimezone_get_utc_timezone ();
-@@ -1367,7 +1367,7 @@ process_free_busy_comp (EMeetingAttendee *attendee,
- 		icaltimezone *de_zone;
- 
- 		dtend = icalproperty_get_dtend (ip);
--		if (!dtend.is_utc)
-+		if (!icaltime_is_utc (dtend))
- 			de_zone = find_zone (ip, tz_top_level);
- 		else
- 			de_zone = icaltimezone_get_utc_timezone ();
-diff --git a/src/calendar/gui/itip-utils.c b/src/calendar/gui/itip-utils.c
-index d808a3c7fc..2b85786f37 100644
---- a/src/calendar/gui/itip-utils.c
-+++ b/src/calendar/gui/itip-utils.c
-@@ -1607,7 +1607,7 @@ comp_compliant (ESourceRegistry *registry,
- 			r->until.is_date = FALSE;
- 
- 			icaltimezone_convert_time (&r->until, from_zone, to_zone);
--			r->until.is_utc = TRUE;
-+			r->until.zone = to_zone;
- 
- 			e_cal_component_free_datetime (&dt);
- 			e_cal_component_set_rrule_list (clone, rrule_list);
-diff --git a/src/modules/itip-formatter/itip-view.c b/src/modules/itip-formatter/itip-view.c
-index 62303b9b35..5be43ad091 100644
---- a/src/modules/itip-formatter/itip-view.c
-+++ b/src/modules/itip-formatter/itip-view.c
-@@ -6167,9 +6167,9 @@ itip_view_init_view (ItipView *view)
- 
-                 /* If the timezone is not in the component, guess the local time */
-                 /* Should we guess if the timezone is an olsen name somehow? */
--		if (datetime.value->is_utc)
-+		if (icaltime_is_utc (*datetime.value))
- 			from_zone = icaltimezone_get_utc_timezone ();
--		else if (!datetime.value->is_utc && datetime.tzid) {
-+		else if (!icaltime_is_utc (*datetime.value) && datetime.tzid) {
- 			from_zone = icalcomponent_get_timezone (view->priv->top_level, datetime.tzid);
- 
- 			if (!from_zone)
-@@ -6206,9 +6206,9 @@ itip_view_init_view (ItipView *view)
- 
-                 /* If the timezone is not in the component, guess the local time */
-                 /* Should we guess if the timezone is an olsen name somehow? */
--		if (datetime.value->is_utc)
-+		if (icaltime_is_utc (*datetime.value))
- 			from_zone = icaltimezone_get_utc_timezone ();
--		else if (!datetime.value->is_utc && datetime.tzid) {
-+		else if (!icaltime_is_utc (*datetime.value) && datetime.tzid) {
- 			from_zone = icalcomponent_get_timezone (view->priv->top_level, datetime.tzid);
- 
- 			if (!from_zone)
--- 
-2.15.1
-