xfce4-orage: build with libical-3.

fixes PR pkg/53212

3 files changed, 66 insertions, 2 deletions

diff --git a/time/xfce4-orage/Makefile b/time/xfce4-orage/Makefile
index 6494c66a0f7..1c5eeec0d04 100644
--- a/time/xfce4-orage/Makefile
+++ b/time/xfce4-orage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2018/04/16 14:35:16 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2018/04/25 21:44:44 markd Exp $
 
 PKGREVISION= 7
 .include "../../meta-pkgs/xfce4/Makefile.common"
@@ -6,6 +6,7 @@ PKGREVISION= 7
 VERSION=	4.12.1
 DISTNAME=	orage-${VERSION}
 PKGNAME=	xfce4-orage-${VERSION}
+PKGREVISION=	1
 CATEGORIES=	time
 MASTER_SITES=	http://archive.xfce.org/src/apps/orage/4.12/
 
diff --git a/time/xfce4-orage/distinfo b/time/xfce4-orage/distinfo
index 939551710d0..b91c19a0550 100644
--- a/time/xfce4-orage/distinfo
+++ b/time/xfce4-orage/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2015/11/02 23:31:47 agc Exp $
+$NetBSD: distinfo,v 1.10 2018/04/25 21:44:44 markd Exp $
 
 SHA1 (orage-4.12.1.tar.bz2) = c856ad30f7a17a732d5cc794ef90aedf98575699
 RMD160 (orage-4.12.1.tar.bz2) = a3d40692e851c96ee409eed03ac3a2f66bbc8f11
 SHA512 (orage-4.12.1.tar.bz2) = 3fec0201171140586cdc9bcf151450a7086515e18b5815afe4fe4c4726ba554c50582b0479e52985b330140c51b7233ef81f678f986f848afbeee74c66b2d196
 Size (orage-4.12.1.tar.bz2) = 2590788 bytes
+SHA1 (patch-src_ical-code.c) = c260f12ca80054894a571d9b47691fb8c9c3e56c
diff --git a/time/xfce4-orage/patches/patch-src_ical-code.c b/time/xfce4-orage/patches/patch-src_ical-code.c
new file mode 100644
index 00000000000..bdbfa8133e2
--- /dev/null
+++ b/time/xfce4-orage/patches/patch-src_ical-code.c
@@ -0,0 +1,62 @@
+$NetBSD: patch-src_ical-code.c,v 1.1 2018/04/25 21:44:44 markd Exp $
+
+Work with libical-3
+
+--- src/ical-code.c.orig	2015-04-10 10:26:26.000000000 +0000
++++ src/ical-code.c
+@@ -129,7 +129,6 @@ static struct icaltimetype ical_get_curr
+         &&   (strcmp(g_par.local_timezone, "floating") != 0))
+         ctime = icaltime_current_time_with_zone(local_icaltimezone);
+     else { / * use floating time * /
+-        ctime.is_utc      = 0;
+         ctime.is_date     = 0;
+         ctime.is_daylight = 0;
+         ctime.zone        = NULL;
+@@ -2579,7 +2578,6 @@ static struct icaltimetype count_first_a
+  * when counting alarm time. */
+         if (rel == ICAL_RELATED_START) {
+             per.stime.is_date       = 0;
+-            per.stime.is_utc        = 1;
+             per.stime.is_daylight   = 0;
+             per.stime.zone          = utc_icaltimezone;
+             per.stime.hour          = 0;
+@@ -2588,7 +2586,6 @@ static struct icaltimetype count_first_a
+         }
+         else {
+             per.etime.is_date       = 0;
+-            per.etime.is_utc        = 1;
+             per.etime.is_daylight   = 0;
+             per.etime.zone          = utc_icaltimezone;
+             per.etime.hour          = 0;
+@@ -2613,7 +2610,6 @@ static struct icaltimetype count_next_al
+ /* HACK: convert to UTC time so that we can use time arithmetic
+  * when counting alarm time. */
+         start_time.is_date       = 0;
+-        start_time.is_utc        = 1;
+         start_time.is_daylight   = 0;
+         start_time.zone          = utc_icaltimezone;
+         start_time.hour          = 0;
+@@ -2768,7 +2764,6 @@ static alarm_struct *process_alarm_trigg
+      */
+     if (icaltime_is_date(per.stime)) {
+         if (local_icaltimezone != utc_icaltimezone) {
+-            next_alarm_time.is_utc        = 0;
+             next_alarm_time.is_daylight   = 0;
+             next_alarm_time.zone          = local_icaltimezone;
+         }
+@@ -2850,7 +2845,6 @@ orage_message(120, P_N "Alarm rec loop n
+          */
+         if (icaltime_is_date(per.stime)) {
+             if (local_icaltimezone != utc_icaltimezone) {
+-                next_alarm_time.is_utc        = 0;
+                 next_alarm_time.is_daylight   = 0;
+                 next_alarm_time.zone          = local_icaltimezone;
+             }
+@@ -2944,7 +2938,6 @@ orage_message(120, P_N "*****After loop 
+          */
+         if (icaltime_is_date(per.stime)) {
+             if (local_icaltimezone != utc_icaltimezone) {
+-                next_alarm_time.is_utc        = 0;
+                 next_alarm_time.is_daylight   = 0;
+                 next_alarm_time.zone          = local_icaltimezone;
+             }