mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-25 12:15:32 +03:00
72 lines
2.4 KiB
Diff
72 lines
2.4 KiB
Diff
--- a/src/ical-code.c
|
|
+++ b/src/ical-code.c
|
|
@@ -129,7 +129,9 @@
|
|
&& (strcmp(g_par.local_timezone, "floating") != 0))
|
|
ctime = icaltime_current_time_with_zone(local_icaltimezone);
|
|
else { / * use floating time * /
|
|
+#if ICAL_MAJOR_VERSION < 3
|
|
ctime.is_utc = 0;
|
|
+#endif
|
|
ctime.is_date = 0;
|
|
ctime.is_daylight = 0;
|
|
ctime.zone = NULL;
|
|
@@ -2579,7 +2581,9 @@
|
|
* when counting alarm time. */
|
|
if (rel == ICAL_RELATED_START) {
|
|
per.stime.is_date = 0;
|
|
+#if ICAL_MAJOR_VERSION < 3
|
|
per.stime.is_utc = 1;
|
|
+#endif
|
|
per.stime.is_daylight = 0;
|
|
per.stime.zone = utc_icaltimezone;
|
|
per.stime.hour = 0;
|
|
@@ -2588,7 +2592,9 @@
|
|
}
|
|
else {
|
|
per.etime.is_date = 0;
|
|
+#if ICAL_MAJOR_VERSION < 3
|
|
per.etime.is_utc = 1;
|
|
+#endif
|
|
per.etime.is_daylight = 0;
|
|
per.etime.zone = utc_icaltimezone;
|
|
per.etime.hour = 0;
|
|
@@ -2613,7 +2619,9 @@
|
|
/* HACK: convert to UTC time so that we can use time arithmetic
|
|
* when counting alarm time. */
|
|
start_time.is_date = 0;
|
|
+#if ICAL_MAJOR_VERSION < 3
|
|
start_time.is_utc = 1;
|
|
+#endif
|
|
start_time.is_daylight = 0;
|
|
start_time.zone = utc_icaltimezone;
|
|
start_time.hour = 0;
|
|
@@ -2768,7 +2776,9 @@
|
|
*/
|
|
if (icaltime_is_date(per.stime)) {
|
|
if (local_icaltimezone != utc_icaltimezone) {
|
|
+#if ICAL_MAJOR_VERSION < 3
|
|
next_alarm_time.is_utc = 0;
|
|
+#endif
|
|
next_alarm_time.is_daylight = 0;
|
|
next_alarm_time.zone = local_icaltimezone;
|
|
}
|
|
@@ -2850,7 +2860,9 @@
|
|
*/
|
|
if (icaltime_is_date(per.stime)) {
|
|
if (local_icaltimezone != utc_icaltimezone) {
|
|
+#if ICAL_MAJOR_VERSION < 3
|
|
next_alarm_time.is_utc = 0;
|
|
+#endif
|
|
next_alarm_time.is_daylight = 0;
|
|
next_alarm_time.zone = local_icaltimezone;
|
|
}
|
|
@@ -2944,7 +2956,9 @@
|
|
*/
|
|
if (icaltime_is_date(per.stime)) {
|
|
if (local_icaltimezone != utc_icaltimezone) {
|
|
+#if ICAL_MAJOR_VERSION < 3
|
|
next_alarm_time.is_utc = 0;
|
|
+#endif
|
|
next_alarm_time.is_daylight = 0;
|
|
next_alarm_time.zone = local_icaltimezone;
|
|
}
|