evolution-mapi: Fix compatibility with libical-3

[gentoo-draconx.git] / gnome-extra / evolution-mapi / files / evolution-mapi-3.24-libical-3.patch

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 (file)
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
+