pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/evolution-exchange evolution-exchange: Fix build ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c3a4191e1e19
branches: trunk
changeset: 380556:c3a4191e1e19
user: jperkin <jperkin%pkgsrc.org@localhost>
date: Thu May 17 09:03:09 2018 +0000
description:
evolution-exchange: Fix build against current libical API.
diffstat:
mail/evolution-exchange/distinfo | 5 +-
mail/evolution-exchange/patches/patch-calendar_e-cal-backend-exchange-calendar.c | 48 ++++++++
mail/evolution-exchange/patches/patch-calendar_e-cal-backend-exchange-tasks.c | 54 ++++++++++
mail/evolution-exchange/patches/patch-calendar_e-cal-backend-exchange.c | 15 ++
4 files changed, 121 insertions(+), 1 deletions(-)
diffs (144 lines):
diff -r 857c0ce5080f -r c3a4191e1e19 mail/evolution-exchange/distinfo
--- a/mail/evolution-exchange/distinfo Thu May 17 08:36:34 2018 +0000
+++ b/mail/evolution-exchange/distinfo Thu May 17 09:03:09 2018 +0000
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.22 2015/11/03 23:27:04 agc Exp $
+$NetBSD: distinfo,v 1.23 2018/05/17 09:03:09 jperkin Exp $
SHA1 (evolution-exchange-2.32.2.tar.bz2) = b87e160b45c66e6fb951fc9589ca4056fec15267
RMD160 (evolution-exchange-2.32.2.tar.bz2) = f692c066a1a881b2a3ed0753b7e0f4673b09f12e
SHA512 (evolution-exchange-2.32.2.tar.bz2) = 5b2366ad01e75623eec9a6619c4ac8636671f4df4214a8c2992ed6bb78c67a2adc27a12e5b0947bfa00dbd35f3c2b159d2a515d2dd101eca58b9550736bef997
Size (evolution-exchange-2.32.2.tar.bz2) = 1306445 bytes
SHA1 (patch-aa) = f6b506e72e456e7cb34ca7d0086c30f34892654e
+SHA1 (patch-calendar_e-cal-backend-exchange-calendar.c) = 0367fc57c906769aa44daaabbd2e3ade3d8c8087
+SHA1 (patch-calendar_e-cal-backend-exchange-tasks.c) = 11db41e7010ad699ed5a29d7cfea3f351048c43f
+SHA1 (patch-calendar_e-cal-backend-exchange.c) = 02fc42be883c102b591021f89d27885875a01736
diff -r 857c0ce5080f -r c3a4191e1e19 mail/evolution-exchange/patches/patch-calendar_e-cal-backend-exchange-calendar.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/evolution-exchange/patches/patch-calendar_e-cal-backend-exchange-calendar.c Thu May 17 09:03:09 2018 +0000
@@ -0,0 +1,48 @@
+$NetBSD: patch-calendar_e-cal-backend-exchange-calendar.c,v 1.1 2018/05/17 09:03:09 jperkin Exp $
+
+Catch up with latest libical API.
+
+--- calendar/e-cal-backend-exchange-calendar.c.orig 2011-02-06 04:54:00.000000000 +0000
++++ calendar/e-cal-backend-exchange-calendar.c
+@@ -873,7 +873,7 @@ create_object (ECalBackendSync *backend,
+ icalprop != NULL;
+ icalprop = icalcomponent_get_next_property (icalcomp, ICAL_ANY_PROPERTY))
+ {
+- icalproperty_remove_parameter (icalprop, ICAL_X_PARAMETER);
++ icalproperty_remove_parameter_by_kind (icalprop, ICAL_X_PARAMETER);
+ }
+
+ /* add the timezones information and the component itself
+@@ -1274,7 +1274,7 @@ modify_object_with_href (ECalBackendSync
+ icalprop != NULL;
+ icalprop = icalcomponent_get_next_property (updated_icalcomp, ICAL_ANY_PROPERTY))
+ {
+- icalproperty_remove_parameter (icalprop, ICAL_X_PARAMETER);
++ icalproperty_remove_parameter_by_kind (icalprop, ICAL_X_PARAMETER);
+ }
+
+ real_ecomp = e_cal_component_new ();
+@@ -1300,7 +1300,6 @@ modify_object_with_href (ECalBackendSync
+ zone = icaltimezone_get_utc_timezone ();
+
+ dt.value->is_date = FALSE;
+- dt.value->is_utc = FALSE;
+ dt.value->hour = dt.value->minute = dt.value->second = 0;
+ dt.value->zone = zone;
+
+@@ -1311,7 +1310,6 @@ modify_object_with_href (ECalBackendSync
+
+ e_cal_component_get_dtend (real_ecomp, &dt);
+ dt.value->is_date = FALSE;
+- dt.value->is_utc = FALSE;
+ dt.value->hour = dt.value->minute = dt.value->second = 0;
+ dt.value->zone = zone;
+
+@@ -1349,7 +1347,6 @@ modify_object_with_href (ECalBackendSync
+ r->until.is_date = FALSE;
+
+ icaltimezone_convert_time (&r->until, from_zone, to_zone);
+- r->until.is_utc = TRUE;
+
+ e_cal_component_set_rrule_list (real_ecomp, rrule_list);
+ e_cal_component_free_datetime (&dt);
diff -r 857c0ce5080f -r c3a4191e1e19 mail/evolution-exchange/patches/patch-calendar_e-cal-backend-exchange-tasks.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/evolution-exchange/patches/patch-calendar_e-cal-backend-exchange-tasks.c Thu May 17 09:03:09 2018 +0000
@@ -0,0 +1,54 @@
+$NetBSD: patch-calendar_e-cal-backend-exchange-tasks.c,v 1.1 2018/05/17 09:03:09 jperkin Exp $
+
+Catch up with latest libical API.
+
+--- calendar/e-cal-backend-exchange-tasks.c.orig 2011-02-06 04:54:00.000000000 +0000
++++ calendar/e-cal-backend-exchange-tasks.c
+@@ -192,10 +192,7 @@ calcomponentdatetime_to_string (ECalComp
+ g_return_val_if_fail (dt != NULL, NULL);
+ g_return_val_if_fail (dt->value != NULL, NULL);
+
+- if (izone != NULL)
+- tt = icaltime_as_timet_with_zone (*dt->value, izone);
+- else
+- tt = icaltime_as_timet (*dt->value);
++ tt = icaltime_as_timet_with_zone (*dt->value, izone);
+
+ return e2k_make_timestamp (tt);
+ }
+@@ -648,7 +645,7 @@ get_changed_tasks (ECalBackendExchange *
+
+ e_cal_backend_exchange_add_timezone (cbex, icalcomp, NULL);
+
+- itt = icaltime_from_timet (e2k_parse_timestamp (modtime), 0);
++ itt = icaltime_from_timet_with_zone (e2k_parse_timestamp (modtime), 0, NULL);
+ if (!icaltime_is_null_time (itt)) {
+ e_cal_backend_exchange_ensure_utc_zone (E_CAL_BACKEND (cbex), &itt);
+ e_cal_component_set_last_modified (ecal, &itt);
+@@ -681,7 +678,7 @@ get_changed_tasks (ECalBackendExchange *
+ /* Set DTSTAMP */
+ if ((str = e2k_properties_get_prop (result->props,
+ E2K_PR_HTTPMAIL_DATE))) {
+- itt = icaltime_from_timet (e2k_parse_timestamp (str), 0);
++ itt = icaltime_from_timet_with_zone (e2k_parse_timestamp (str), 0, NULL);
+ if (!icaltime_is_null_time (itt)) {
+ e_cal_backend_exchange_ensure_utc_zone (E_CAL_BACKEND (cbex), &itt);
+
+@@ -783,7 +780,7 @@ get_changed_tasks (ECalBackendExchange *
+ /* Set DATE COMPLETED */
+ if ((str = e2k_properties_get_prop (result->props,
+ E2K_PR_OUTLOOK_TASK_DONE_DT))) {
+- itt = icaltime_from_timet (e2k_parse_timestamp (str), 0);
++ itt = icaltime_from_timet_with_zone (e2k_parse_timestamp (str), 0, NULL);
+ if (!icaltime_is_null_time (itt))
+ e_cal_component_set_completed (ecal, &itt);
+ }
+@@ -791,7 +788,7 @@ get_changed_tasks (ECalBackendExchange *
+ /* Set LAST MODIFIED */
+ if ((str = e2k_properties_get_prop (result->props,
+ E2K_PR_CALENDAR_LAST_MODIFIED))) {
+- itt = icaltime_from_timet (e2k_parse_timestamp(str), 0);
++ itt = icaltime_from_timet_with_zone (e2k_parse_timestamp(str), 0, NULL);
+ if (!icaltime_is_null_time (itt)) {
+ e_cal_backend_exchange_ensure_utc_zone (E_CAL_BACKEND (cbex), &itt);
+ e_cal_component_set_last_modified (ecal, &itt);
diff -r 857c0ce5080f -r c3a4191e1e19 mail/evolution-exchange/patches/patch-calendar_e-cal-backend-exchange.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/evolution-exchange/patches/patch-calendar_e-cal-backend-exchange.c Thu May 17 09:03:09 2018 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-calendar_e-cal-backend-exchange.c,v 1.1 2018/05/17 09:03:09 jperkin Exp $
+
+Catch up with latest libical API.
+
+--- calendar/e-cal-backend-exchange.c.orig 2011-02-06 04:54:00.000000000 +0000
++++ calendar/e-cal-backend-exchange.c
+@@ -614,7 +614,7 @@ find_instance (ECalBackendExchange *cbex
+ e_cal_component_get_recurid (comp, &recur_id);
+
+ rtime = e2k_parse_timestamp (rid);
+- new_rid = icaltime_from_timet (rtime, FALSE);
++ new_rid = icaltime_from_timet_with_zone (rtime, FALSE, NULL);
+
+ f_zone = (recur_id.datetime.tzid && *recur_id.datetime.tzid) ? internal_get_timezone ((ECalBackend *) cbex, recur_id.datetime.tzid) : icaltimezone_get_utc_timezone ();
+ recur_id.datetime.value->zone = f_zone;
Home |
Main Index |
Thread Index |
Old Index