From a2bb7a376dbc0328f263af8d27ef9ef6887c968a Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Fri, 5 Apr 2019 02:07:57 -0400
Subject: [PATCH] evolution-mapi: Fix compatibility with libical-3

Backported patch from upstream.
---
 gnome-extra/evolution-mapi/Manifest           |  3 +-
 ...ebuild => evolution-mapi-3.24.5-r1.ebuild} | 11 +++-
 .../files/evolution-mapi-3.24-libical-3.patch | 66 +++++++++++++++++++
 3 files changed, 78 insertions(+), 2 deletions(-)
 rename gnome-extra/evolution-mapi/{evolution-mapi-3.24.5.ebuild => evolution-mapi-3.24.5-r1.ebuild} (71%)
 create mode 100644 gnome-extra/evolution-mapi/files/evolution-mapi-3.24-libical-3.patch

diff --git a/gnome-extra/evolution-mapi/Manifest b/gnome-extra/evolution-mapi/Manifest
index e626e62..f8704ed 100644
--- a/gnome-extra/evolution-mapi/Manifest
+++ b/gnome-extra/evolution-mapi/Manifest
@@ -1,2 +1,3 @@
+AUX evolution-mapi-3.24-libical-3.patch 2430 BLAKE2B 2b2894d4751fd5de1bd8fdeda7330657c6050cd4546a143d21943e2b57646d8b0212ba274f73b05a68a4cbe3da37958959c59e5f8e061e0106c7c6f827e3bda5 SHA512 6d353545b5081e7d4c7ae5c58fed91344240b9b0b65a9b1e3fbabb120717eefd2c1089f04a4eafc319f4c3b373ec6ae1dd0bb676ad513a634f3f9dce21a798c7
 DIST evolution-mapi-3.24.5.tar.xz 416504 BLAKE2B 0bbe6100ef5990d813b7fb0a6d8f45293fc077e2c62ff928a7073df877404da43e21cb748e8d3dafeb0a09d8a70c903fb75846e080718b346e7c9d7d5a09ad82 SHA512 df541e36fdab0054961f820deaeb10277069f5e2d977c3e8799cab10dc300d8a61d2090bdf1bb6ce4e03a4550d666607a57422f01cfaafdafcc634746ae8ef92
-EBUILD evolution-mapi-3.24.5.ebuild 788 BLAKE2B 1c7f91a64a744b12cd08f1ee16cf4713e3fc4097127c0dd58b64e49fc53ceec32d3e1bbc4deb875ae39ef7b2cdd2af61561d2a0afd76188a396233c4a477c02c SHA512 3b4b3b964b78f86b50ad8b0ad291e83d42982d016313f6fbc5a4a77132b8143d6bf696784804d3932ca146ae7798aa8fc4711a6c1508ad30e4cbf504c1409830
+EBUILD evolution-mapi-3.24.5-r1.ebuild 1068 BLAKE2B e022347557612723724c8dff77ae2d8efb98669c40269407400a7ee992108282c63127da03b2a34a9ff2dd088bc5894ec480379be855fa7955982235ffc8009a SHA512 0f5f82bb6250b4f490a922380dfea2aa5ecbd6f80fcb0934a7c5373b0148f0fe7b4b55a35a611a572be11a3f40ad085fddcaeb6b73c6df2c8f3e89f0091c6b04
diff --git a/gnome-extra/evolution-mapi/evolution-mapi-3.24.5.ebuild b/gnome-extra/evolution-mapi/evolution-mapi-3.24.5-r1.ebuild
similarity index 71%
rename from gnome-extra/evolution-mapi/evolution-mapi-3.24.5.ebuild
rename to gnome-extra/evolution-mapi/evolution-mapi-3.24.5-r1.ebuild
index 9ba9416..676c7da 100644
--- a/gnome-extra/evolution-mapi/evolution-mapi-3.24.5.ebuild
+++ b/gnome-extra/evolution-mapi/evolution-mapi-3.24.5-r1.ebuild
@@ -16,13 +16,22 @@ SLOT="0"
 RDEPEND=">=gnome-extra/evolution-data-server-$PV:0=
 	>=mail-client/evolution-$PV:2.0
 	>=net-libs/libmapi-2
-	<dev-libs/libical-3:="
+	dev-libs/libical:="
 
 DEPEND="$RDEPEND
 	virtual/pkgconfig"
 
+PATCHES=(
+	"$FILESDIR/$PN-3.24-libical-3.patch"
+)
+
 src_prepare () {
 	cmake-utils_src_prepare
+
+	# Both cmake-utils_src_prepare and gnome2_src_prepare call default, which
+	# means patches get applied twice and that doesn't end well.  So redefine
+	# default to do nothing here, since it's already been run...
+	default () { :; }
 	gnome2_src_prepare
 }
 
diff --git a/gnome-extra/evolution-mapi/files/evolution-mapi-3.24-libical-3.patch b/gnome-extra/evolution-mapi/files/evolution-mapi-3.24-libical-3.patch
new file mode 100644
index 0000000..6f08e59
--- /dev/null
+++ b/gnome-extra/evolution-mapi/files/evolution-mapi-3.24-libical-3.patch
@@ -0,0 +1,66 @@
+From 092a148dd27dafbe9493aada43c1141ff5f691e2 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Wed, 4 Oct 2017 12:01:39 +0200
+Subject: [PATCH] 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.
+---
+ src/libexchangemapi/e-mapi-cal-tz-utils.c |  2 +-
+ src/libexchangemapi/e-mapi-cal-utils.c    | 15 ++++++++++++---
+ 2 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/src/libexchangemapi/e-mapi-cal-tz-utils.c b/src/libexchangemapi/e-mapi-cal-tz-utils.c
+index 72abe0cae993..af0b1a4fa071 100644
+--- a/src/libexchangemapi/e-mapi-cal-tz-utils.c
++++ b/src/libexchangemapi/e-mapi-cal-tz-utils.c
+@@ -94,7 +94,7 @@ e_mapi_tm_to_icaltimetype (struct tm *tm,
+ 	itt.month = dst ? 6 : 1;
+ 	itt.year = tm->tm_year + 1900;
+ 
+-	itt.is_utc = 0;
++	itt.zone = NULL;
+ 	itt.is_date = 0;
+ 
+ 	return itt;
+diff --git a/src/libexchangemapi/e-mapi-cal-utils.c b/src/libexchangemapi/e-mapi-cal-utils.c
+index 2b1bb536e5b9..18afdcb38828 100644
+--- a/src/libexchangemapi/e-mapi-cal-utils.c
++++ b/src/libexchangemapi/e-mapi-cal-utils.c
+@@ -2177,20 +2177,29 @@ e_mapi_cal_utils_comp_to_object (EMapiConnection *conn,
+ 			prop = icalcomponent_get_first_property (ical_comp, ICAL_COMPLETED_PROPERTY);
+ 			completed = icalproperty_get_completed (prop);
+ 
+-			completed.hour = completed.minute = completed.second = 0; completed.is_date = completed.is_utc = 1;
++			completed.hour = completed.minute = completed.second = 0;
++			completed.is_date = 1;
++			completed.zone = utc_zone;
++
+ 			tt = icaltime_as_timet (completed);
+ 			set_timet_value (PidLidTaskDateCompleted, tt);
+ 		}
+ 
+ 		/* Start */
+-		dtstart.hour = dtstart.minute = dtstart.second = 0; dtstart.is_date = dtstart.is_utc = 1;
++		dtstart.hour = dtstart.minute = dtstart.second = 0;
++		dtstart.is_date = 1;
++		dtstart.zone = utc_zone;
++
+ 		tt = icaltime_as_timet (dtstart);
+ 		if (!icaltime_is_null_time (dtstart)) {
+ 			set_timet_value (PidLidTaskStartDate, tt);
+ 		}
+ 
+ 		/* Due */
+-		dtend.hour = dtend.minute = dtend.second = 0; dtend.is_date = dtend.is_utc = 1;
++		dtend.hour = dtend.minute = dtend.second = 0;
++		dtend.is_date = 1;
++		dtend.zone = utc_zone;
++
+ 		tt = icaltime_as_timet (dtend);
+ 		if (!icaltime_is_null_time (dtend)) {
+ 			set_timet_value (PidLidTaskDueDate, tt);
+-- 
+2.19.2
+
-- 
2.43.0