head	1.2;
access;
symbols
	pkgsrc-2023Q2:1.1.0.42
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.40
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.38
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.36
	pkgsrc-2022Q3-base:1.1
	pkgsrc-2022Q2:1.1.0.34
	pkgsrc-2022Q2-base:1.1
	pkgsrc-2022Q1:1.1.0.32
	pkgsrc-2022Q1-base:1.1
	pkgsrc-2021Q4:1.1.0.30
	pkgsrc-2021Q4-base:1.1
	pkgsrc-2021Q3:1.1.0.28
	pkgsrc-2021Q3-base:1.1
	pkgsrc-2021Q2:1.1.0.26
	pkgsrc-2021Q2-base:1.1
	pkgsrc-2021Q1:1.1.0.24
	pkgsrc-2021Q1-base:1.1
	pkgsrc-2020Q4:1.1.0.22
	pkgsrc-2020Q4-base:1.1
	pkgsrc-2020Q3:1.1.0.20
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.18
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.14
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.16
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.12
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.10
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.8
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.6
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.4
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.2
	pkgsrc-2018Q2-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2023.08.16.22.35.08;	author markd;	state dead;
branches;
next	1.1;
commitid	KjUaInjyGKKNX3BE;

1.1
date	2018.04.26.07.55.21;	author markd;	state Exp;
branches;
next	;
commitid	mtYkPpjb8YtfoVzA;


desc
@@


1.2
log
@kdepimlibs4: remove

old kde4 version.  nothing now uses it.
@
text
@$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);
@


1.1
log
@kdepimlibs4: work with libical-3
@
text
@d1 1
a1 1
$NetBSD$
@