kdepimlibs4: work with libical-3

6 files changed, 207 insertions, 3 deletions

diff --git a/misc/kdepimlibs4/Makefile b/misc/kdepimlibs4/Makefile
index 21e8cfd1eee..9ba6de7d841 100644
--- a/misc/kdepimlibs4/Makefile
+++ b/misc/kdepimlibs4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.81 2018/03/12 11:15:39 wiz Exp $
+# $NetBSD: Makefile,v 1.82 2018/04/26 07:55:21 markd Exp $
 
 DISTNAME=	kdepimlibs-4.14.10
 PKGNAME=	${DISTNAME:S/-4/4-4/}
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	misc
 COMMENT=	Support libraries for PIM for the KDE integrated X11 desktop
 MASTER_SITES=	${MASTER_SITE_KDE:=applications/15.04.3/src/}
diff --git a/misc/kdepimlibs4/distinfo b/misc/kdepimlibs4/distinfo
index fa9353941c4..2651dc041ea 100644
--- a/misc/kdepimlibs4/distinfo
+++ b/misc/kdepimlibs4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.35 2017/08/06 06:35:35 markd Exp $
+$NetBSD: distinfo,v 1.36 2018/04/26 07:55:21 markd Exp $
 
 SHA1 (kdepimlibs-4.14.10.tar.xz) = 8db2f59b8a33f4d1bbebfdff8b772d30669c9932
 RMD160 (kdepimlibs-4.14.10.tar.xz) = 4df52569c41b3af12aaf6f457e213f31feb78343
@@ -14,6 +14,10 @@ SHA1 (patch-gpgmexx_CMakeLists.txt) = 6ef41aedeb3445764aba3d684a9ad321c6ff290e
 SHA1 (patch-gpgmexx_config-gpgmexx.h.cmake) = bd8fd1e9a619d6bd52185f37adb5dc7f7b97423c
 SHA1 (patch-gpgmexx_interfaces_CMakeLists.txt) = d7d8a039deed83df8c742fec41a4093d5cc3b057
 SHA1 (patch-kblog_CMakeLists.txt) = b03068672c39492ef4883125c65f7951c7cc8f01
+SHA1 (patch-kcal_icalformat_p.cpp) = e1d88f909ec922b436c144e189b0515215067053
+SHA1 (patch-kcal_icaltimezones.cpp) = c643f45333d8b753f3acdb29bec9734a0946434a
+SHA1 (patch-kcalcore_icalformat_p.cpp) = 2627bcd33b126c975d630a174c6fe52e4a04b906
+SHA1 (patch-kcalcore_icaltimezones.cpp) = 216b2936b5d3504d5a2d1284b39c842cc9c5848f
 SHA1 (patch-kimap_loginjob.cpp) = 8a0fe3c1779b981d9c9ca6cb34121219f2f97c9f
 SHA1 (patch-kldap_ber.cpp) = 8f2cf67ee39f744b2114b6cba503f9bcdb2efacc
 SHA1 (patch-kldap_ber.h) = 19162970d42a50f30bc62c4d23b2fa3e8d57322a
diff --git a/misc/kdepimlibs4/patches/patch-kcal_icalformat_p.cpp b/misc/kdepimlibs4/patches/patch-kcal_icalformat_p.cpp
new file mode 100644
index 00000000000..42c52adeebb
--- /dev/null
+++ b/misc/kdepimlibs4/patches/patch-kcal_icalformat_p.cpp
@@ -0,0 +1,43 @@
+$NetBSD: patch-kcal_icalformat_p.cpp,v 1.1 2018/04/26 07:55:21 markd Exp $
+
+work with libical-3
+
+--- kcal/icalformat_p.cpp.orig	2015-06-24 12:43:14.000000000 +0000
++++ kcal/icalformat_p.cpp
+@@ -2087,7 +2087,6 @@ icaltimetype ICalFormatImpl::writeICalDa
+   t.second = 0;
+ 
+   t.is_date = 1;
+-  t.is_utc = 0;
+   t.zone = 0;
+ 
+   return t;
+@@ -2107,7 +2106,9 @@ icaltimetype ICalFormatImpl::writeICalDa
+ 
+   t.is_date = 0;
+   t.zone = 0;   // zone is NOT set
+-  t.is_utc = datetime.isUtc() ? 1 : 0;
++  if (datetime.isUtc()) {
++    t = icaltime_convert_to_zone(t, icaltimezone_get_utc_timezone());
++  }
+ 
+   // _dumpIcaltime( t );
+ 
+@@ -2174,7 +2175,7 @@ icalproperty *ICalFormatImpl::writeICalD
+   }
+ 
+   KTimeZone ktz;
+-  if ( !t.is_utc ) {
++  if ( !icaltime_is_utc(t) ) {
+     ktz = dt.timeZone();
+   }
+ 
+@@ -2207,7 +2208,7 @@ KDateTime ICalFormatImpl::readICalDateTi
+ //  _dumpIcaltime( t );
+ 
+   KDateTime::Spec timeSpec;
+-  if ( t.is_utc  ||  t.zone == icaltimezone_get_utc_timezone() ) {
++  if ( icaltime_is_utc(t)  ||  t.zone == icaltimezone_get_utc_timezone() ) {
+     timeSpec = KDateTime::UTC;   // the time zone is UTC
+     utc = false;    // no need to convert to UTC
+   } else {
diff --git a/misc/kdepimlibs4/patches/patch-kcal_icaltimezones.cpp b/misc/kdepimlibs4/patches/patch-kcal_icaltimezones.cpp
new file mode 100644
index 00000000000..f9e680b6dc2
--- /dev/null
+++ b/misc/kdepimlibs4/patches/patch-kcal_icaltimezones.cpp
@@ -0,0 +1,57 @@
+$NetBSD: patch-kcal_icaltimezones.cpp,v 1.1 2018/04/26 07:55:21 markd Exp $
+
+work with libical-3
+
+--- kcal/icaltimezones.cpp.orig	2015-06-24 12:43:14.000000000 +0000
++++ kcal/icaltimezones.cpp
+@@ -50,7 +50,7 @@ static QDateTime toQDateTime( const ical
+ {
+   return QDateTime( QDate( t.year, t.month, t.day ),
+                     QTime( t.hour, t.minute, t.second ),
+-                    ( t.is_utc ? Qt::UTC : Qt::LocalTime ) );
++                    ( icaltime_is_utc(t) ? Qt::UTC : Qt::LocalTime ) );
+ }
+ 
+ // Maximum date for time zone data.
+@@ -77,7 +77,6 @@ static icaltimetype writeLocalICalDateTi
+   t.second = local.time().second();
+   t.is_date = 0;
+   t.zone = 0;
+-  t.is_utc = 0;
+   return t;
+ }
+ 
+@@ -787,7 +786,7 @@ ICalTimeZone ICalTimeZoneSource::parse( 
+     case ICAL_LASTMODIFIED_PROPERTY:
+     {
+       icaltimetype t = icalproperty_get_lastmodified(p);
+-      if ( t.is_utc ) {
++      if ( icaltime_is_utc(t) ) {
+         data->d->lastModified = toQDateTime( t );
+       } else {
+         kDebug() << "LAST-MODIFIED not UTC";
+@@ -972,7 +971,7 @@ QList<QDateTime> ICalTimeZoneSourcePriva
+   // Convert DTSTART to QDateTime, and from local time to UTC
+   QDateTime localStart = toQDateTime( dtstart );   // local time
+   dtstart.second -= prevOffset;
+-  dtstart.is_utc = 1;
++  dtstart = icaltime_convert_to_zone(dtstart, icaltimezone_get_utc_timezone());
+   QDateTime utcStart = toQDateTime( icaltime_normalize( dtstart ) );   // UTC
+ 
+   transitions += utcStart;
+@@ -999,13 +998,12 @@ QList<QDateTime> ICalTimeZoneSourcePriva
+           t.minute = dtstart.minute;
+           t.second = dtstart.second;
+           t.is_date = 0;
+-          t.is_utc = 0;    // dtstart is in local time
+         }
+         // RFC2445 states that RDATE must be in local time,
+         // but we support UTC as well to be safe.
+-        if ( !t.is_utc ) {
++        if ( !icaltime_is_utc(t) ) {
+           t.second -= prevOffset;    // convert to UTC
+-          t.is_utc = 1;
++          t = icaltime_convert_to_zone(t, icaltimezone_get_utc_timezone());
+           t = icaltime_normalize( t );
+         }
+         transitions += toQDateTime( t );
diff --git a/misc/kdepimlibs4/patches/patch-kcalcore_icalformat_p.cpp b/misc/kdepimlibs4/patches/patch-kcalcore_icalformat_p.cpp
new file mode 100644
index 00000000000..da9953f75dd
--- /dev/null
+++ b/misc/kdepimlibs4/patches/patch-kcalcore_icalformat_p.cpp
@@ -0,0 +1,43 @@
+$NetBSD: patch-kcalcore_icalformat_p.cpp,v 1.1 2018/04/26 07:55:21 markd Exp $
+
+work with libical-3
+
+--- kcalcore/icalformat_p.cpp.orig	2015-06-24 12:43:14.000000000 +0000
++++ kcalcore/icalformat_p.cpp
+@@ -2301,7 +2301,6 @@ icaltimetype ICalFormatImpl::writeICalDa
+     t.second = 0;
+ 
+     t.is_date = 1;
+-    t.is_utc = 0;
+     t.zone = 0;
+ 
+     return t;
+@@ -2323,7 +2322,9 @@ icaltimetype ICalFormatImpl::writeICalDa
+         t.second = datetime.time().second();
+     }
+     t.zone = 0;   // zone is NOT set
+-    t.is_utc = datetime.isUtc() ? 1 : 0;
++    if (datetime.isUtc()) {
++        t = icaltime_convert_to_zone(t, icaltimezone_get_utc_timezone());
++    }
+ 
+     // _dumpIcaltime( t );
+ 
+@@ -2398,7 +2399,7 @@ icalproperty *ICalFormatImpl::writeICalD
+     }
+ 
+     KTimeZone ktz;
+-    if (!t.is_utc) {
++    if (!icaltime_is_utc(t)) {
+         ktz = dt.timeZone();
+     }
+ 
+@@ -2431,7 +2432,7 @@ KDateTime ICalFormatImpl::readICalDateTi
+ //  _dumpIcaltime( t );
+ 
+     KDateTime::Spec timeSpec;
+-    if (t.is_utc  ||  t.zone == icaltimezone_get_utc_timezone()) {
++    if (icaltime_is_utc(t)  ||  t.zone == icaltimezone_get_utc_timezone()) {
+         timeSpec = KDateTime::UTC;   // the time zone is UTC
+         utc = false;    // no need to convert to UTC
+     } else {
diff --git a/misc/kdepimlibs4/patches/patch-kcalcore_icaltimezones.cpp b/misc/kdepimlibs4/patches/patch-kcalcore_icaltimezones.cpp
new file mode 100644
index 00000000000..b2eb8eefe75
--- /dev/null
+++ b/misc/kdepimlibs4/patches/patch-kcalcore_icaltimezones.cpp
@@ -0,0 +1,57 @@
+$NetBSD: patch-kcalcore_icaltimezones.cpp,v 1.1 2018/04/26 07:55:21 markd Exp $
+
+work with libical-3
+
+--- kcalcore/icaltimezones.cpp.orig	2015-06-24 12:43:14.000000000 +0000
++++ kcalcore/icaltimezones.cpp
+@@ -54,7 +54,7 @@ static QDateTime toQDateTime(const icalt
+ {
+     return QDateTime(QDate(t.year, t.month, t.day),
+                      QTime(t.hour, t.minute, t.second),
+-                     (t.is_utc ? Qt::UTC : Qt::LocalTime));
++                     (icaltime_is_utc(t) ? Qt::UTC : Qt::LocalTime));
+ }
+ 
+ // Maximum date for time zone data.
+@@ -81,7 +81,6 @@ static icaltimetype writeLocalICalDateTi
+     t.second = local.time().second();
+     t.is_date = 0;
+     t.zone = 0;
+-    t.is_utc = 0;
+     return t;
+ }
+ 
+@@ -886,7 +885,7 @@ ICalTimeZone ICalTimeZoneSource::parse(i
+         case ICAL_LASTMODIFIED_PROPERTY:
+         {
+             const icaltimetype t = icalproperty_get_lastmodified(p);
+-            if (t.is_utc) {
++            if (icaltime_is_utc(t)) {
+                 data->d->lastModified = toQDateTime(t);
+             } else {
+                 kDebug() << "LAST-MODIFIED not UTC";
+@@ -1259,7 +1258,7 @@ QList<QDateTime> ICalTimeZoneSourcePriva
+     // Convert DTSTART to QDateTime, and from local time to UTC
+     const QDateTime localStart = toQDateTime(dtstart);     // local time
+     dtstart.second -= prevOffset;
+-    dtstart.is_utc = 1;
++    dtstart = icaltime_convert_to_zone(dtstart, icaltimezone_get_utc_timezone());
+     const QDateTime utcStart = toQDateTime(icaltime_normalize(dtstart));       // UTC
+ 
+     transitions += utcStart;
+@@ -1286,13 +1285,12 @@ QList<QDateTime> ICalTimeZoneSourcePriva
+                     t.minute = dtstart.minute;
+                     t.second = dtstart.second;
+                     t.is_date = 0;
+-                    t.is_utc = 0;    // dtstart is in local time
+                 }
+                 // RFC2445 states that RDATE must be in local time,
+                 // but we support UTC as well to be safe.
+-                if (!t.is_utc) {
++                if (!icaltime_is_utc(t)) {
+                     t.second -= prevOffset;    // convert to UTC
+-                    t.is_utc = 1;
++                    t = icaltime_convert_to_zone(t, icaltimezone_get_utc_timezone());
+                     t = icaltime_normalize(t);
+                 }
+                 transitions += toQDateTime(t);