Hello community, here is the log from the commit of package kcalendarcore for openSUSE:Leap:15.2 checked in at 2020-02-16 18:26:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/kcalendarcore (Old) and /work/SRC/openSUSE:Leap:15.2/.kcalendarcore.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcalendarcore" Sun Feb 16 18:26:30 2020 rev:4 rq:773898 version:5.67.0 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/kcalendarcore/kcalendarcore.changes 2020-01-15 15:15:01.598228803 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.kcalendarcore.new.26092/kcalendarcore.changes 2020-02-16 18:27:39.786697352 +0100 @@ -1,0 +2,28 @@ +Sun Feb 2 18:06:45 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Replace %make_jobs with %cmake_build. + +------------------------------------------------------------------- +Sun Feb 2 14:32:31 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.67.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.67.0.php +- No code change since 5.66.0 + +------------------------------------------------------------------- +Sun Jan 5 09:02:00 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.66.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.66.0.php +- Changes since 5.65.0: + * Remove endl. qCritical/qDebug already adds a endl. + * Improve README.md to have an Introduction section + * Make incidence geographic coordinate also accessible as a property + * Fix RRULE generation for timezones + * Update the obsolete projects.kde.org URL + +------------------------------------------------------------------- Old: ---- kcalendarcore-5.65.0.tar.xz kcalendarcore-5.65.0.tar.xz.sig New: ---- kcalendarcore-5.67.0.tar.xz kcalendarcore-5.67.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcalendarcore.spec ++++++ --- /var/tmp/diff_new_pack.0JfYXc/_old 2020-02-16 18:27:40.190697564 +0100 +++ /var/tmp/diff_new_pack.0JfYXc/_new 2020-02-16 18:27:40.190697564 +0100 @@ -1,7 +1,7 @@ # # spec file for package kcalendarcore # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,14 @@ # -%define _tar_path 5.65 +%define _tar_path 5.67 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kcalendarcore -Version: 5.65.0 +Version: 5.67.0 Release: 0 Summary: Library to access and handle calendar data License: LGPL-2.0-or-later @@ -36,9 +36,9 @@ %endif BuildRequires: extra-cmake-modules >= %{_kf5_version} BuildRequires: cmake(LibIcal) >= 2.0 -BuildRequires: cmake(Qt5Core) >= 5.11.0 -BuildRequires: cmake(Qt5Gui) >= 5.11.0 -BuildRequires: cmake(Qt5Test) >= 5.11.0 +BuildRequires: cmake(Qt5Core) >= 5.12.0 +BuildRequires: cmake(Qt5Gui) >= 5.12.0 +BuildRequires: cmake(Qt5Test) >= 5.12.0 %description KCalendarCore is a library to provide access to and handling of calendar data. @@ -77,7 +77,7 @@ %build %cmake_kf5 -d build - %make_jobs + %cmake_build %install %kf5_makeinstall -C build ++++++ kcalendarcore-5.65.0.tar.xz -> kcalendarcore-5.67.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/CMakeLists.txt new/kcalendarcore-5.67.0/CMakeLists.txt --- old/kcalendarcore-5.65.0/CMakeLists.txt 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/CMakeLists.txt 2020-02-01 10:00:07.000000000 +0100 @@ -1,17 +1,17 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.65.0") # handled by release scripts +set(KF5_VERSION "5.67.0") # handled by release scripts project(KCalendarCore VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.65.0 NO_MODULE) -set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) +find_package(ECM 5.67.0 NO_MODULE) +set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) -set(REQUIRED_QT_VERSION 5.11.0) +set(REQUIRED_QT_VERSION 5.12.0) include(KDEInstallDirs) include(KDECMakeSettings) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/README.md new/kcalendarcore-5.67.0/README.md --- old/kcalendarcore-5.65.0/README.md 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/README.md 2020-02-01 10:00:07.000000000 +0100 @@ -1,7 +1,10 @@ -# KCalendarCore # +# KCalendarCore This library provides access to and handling of calendar data. -It supports the standard formats iCalendar and vCalendar and the + +## Introduction + +KCalendarCore supports the standard formats iCalendar and vCalendar and the group scheduling standard iTIP. A calendar contains information like incidences (events, to-dos, journals), @@ -9,6 +12,8 @@ access to that calendar information via well known calendar formats [iCalendar (or iCal)](https://en.wikipedia.org/wiki/Icalendar) and the older [vCalendar](https://en.wikipedia.org/wiki/VCalendar). + +## Acknowledgments Credit goes to Eric Bossum \<[email protected]\> for his libical software that does most of the heavy-lifting of the iCalendar support diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/autotests/CMakeLists.txt new/kcalendarcore-5.67.0/autotests/CMakeLists.txt --- old/kcalendarcore-5.65.0/autotests/CMakeLists.txt 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/autotests/CMakeLists.txt 2020-02-01 10:00:07.000000000 +0100 @@ -77,9 +77,7 @@ file(GLOB_RECURSE compatFiles data/Compat-libical3/*.ics) endif() -if(WIN32) - find_program(PERL_EXECUTABLE perl) -endif() +find_program(PERL_EXECUTABLE perl) macro(kcalcore_run_single_test _prefix _f _test _testarg) get_filename_component(_fn ${_f} NAME) @@ -89,10 +87,7 @@ get_filename_component(_outputPath ${_outFile} PATH) file(MAKE_DIRECTORY ${_outputPath}) - set(_runner ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl) - if(WIN32) - set(_runner ${PERL_EXECUTABLE} ${_runner}) - endif() + set(_runner ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/runsingletestcase.pl) add_test(NAME ${_prefix}-${_fn} COMMAND ${_runner} $<TARGET_FILE:${_test}> ${_testarg} ${_f} ${_outFile}) endmacro() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/autotests/data/Compat/AppleICal_1.5.ics.ical.ref new/kcalendarcore-5.67.0/autotests/data/Compat/AppleICal_1.5.ics.ical.ref --- old/kcalendarcore-5.65.0/autotests/data/Compat/AppleICal_1.5.ics.ical.ref 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/autotests/data/Compat/AppleICal_1.5.ics.ical.ref 2020-02-01 10:00:07.000000000 +0100 @@ -17,7 +17,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -68,7 +68,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -119,7 +119,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -170,7 +170,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -221,7 +221,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -272,7 +272,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -323,7 +323,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -374,7 +374,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -425,7 +425,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -476,7 +476,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -527,7 +527,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -578,7 +578,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -629,7 +629,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -680,7 +680,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -731,7 +731,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -782,7 +782,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -833,7 +833,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -884,7 +884,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -935,7 +935,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -986,7 +986,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -1037,7 +1037,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -1088,7 +1088,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -1139,7 +1139,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -1190,7 +1190,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -1241,7 +1241,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/autotests/data/Compat/Evolution_2.8.2_timezone_test.ics.ical.ref new/kcalendarcore-5.67.0/autotests/data/Compat/Evolution_2.8.2_timezone_test.ics.ical.ref --- old/kcalendarcore-5.65.0/autotests/data/Compat/Evolution_2.8.2_timezone_test.ics.ical.ref 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/autotests/data/Compat/Evolution_2.8.2_timezone_test.ics.ical.ref 2020-02-01 10:00:07.000000000 +0100 @@ -39,7 +39,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 RDATE;VALUE=DATE-TIME:19950924T030000 END:STANDARD END:VTIMEZONE @@ -79,7 +79,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 RDATE;VALUE=DATE-TIME:19950924T030000 END:STANDARD END:VTIMEZONE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/autotests/data/Compat/Mozilla_1.0.ics.ical.ref new/kcalendarcore-5.67.0/autotests/data/Compat/Mozilla_1.0.ics.ical.ref --- old/kcalendarcore-5.65.0/autotests/data/Compat/Mozilla_1.0.ics.ical.ref 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/autotests/data/Compat/Mozilla_1.0.ics.ical.ref 2020-02-01 10:00:07.000000000 +0100 @@ -38,7 +38,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 RDATE;VALUE=DATE-TIME:19950924T030000 END:STANDARD END:VTIMEZONE @@ -78,7 +78,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 RDATE;VALUE=DATE-TIME:19950924T030000 END:STANDARD END:VTIMEZONE @@ -118,7 +118,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 RDATE;VALUE=DATE-TIME:19950924T030000 END:STANDARD END:VTIMEZONE @@ -158,7 +158,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 RDATE;VALUE=DATE-TIME:19950924T030000 END:STANDARD END:VTIMEZONE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/autotests/data/Compat-libical3/AppleICal_1.5.ics.ical.ref new/kcalendarcore-5.67.0/autotests/data/Compat-libical3/AppleICal_1.5.ics.ical.ref --- old/kcalendarcore-5.65.0/autotests/data/Compat-libical3/AppleICal_1.5.ics.ical.ref 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/autotests/data/Compat-libical3/AppleICal_1.5.ics.ical.ref 2020-02-01 10:00:07.000000000 +0100 @@ -17,7 +17,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -68,7 +68,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -119,7 +119,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -170,7 +170,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -221,7 +221,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -272,7 +272,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -323,7 +323,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -374,7 +374,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -425,7 +425,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -476,7 +476,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -527,7 +527,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -578,7 +578,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -629,7 +629,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -680,7 +680,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -731,7 +731,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -782,7 +782,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -833,7 +833,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -884,7 +884,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -935,7 +935,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -986,7 +986,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -1037,7 +1037,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -1088,7 +1088,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -1139,7 +1139,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -1190,7 +1190,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET @@ -1241,7 +1241,7 @@ TZOFFSETFROM:+0200 TZOFFSETTO:+0100 DTSTART:19790930T030000 -RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9 +RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9 END:STANDARD BEGIN:STANDARD TZNAME:CET diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/autotests/data/Compat-libical3/Evolution_2.8.2_timezone_test.ics.ical.ref new/kcalendarcore-5.67.0/autotests/data/Compat-libical3/Evolution_2.8.2_timezone_test.ics.ical.ref --- old/kcalendarcore-5.65.0/autotests/data/Compat-libical3/Evolution_2.8.2_timezone_test.ics.ical.ref 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/autotests/data/Compat-libical3/Evolution_2.8.2_timezone_test.ics.ical.ref 2020-02-01 10:00:07.000000000 +0100 @@ -24,7 +24,7 @@ TZOFFSETFROM:-0400 TZOFFSETTO:-0500 DTSTART:19701025T020000 -RRULE:FREQ=YEARLY;UNTIL=20071104T020000;COUNT=37;BYDAY=-1SU;BYMONTH=10 +RRULE:FREQ=YEARLY;UNTIL=20071104T020000;BYDAY=-1SU;BYMONTH=10 RDATE:20061029T020000 END:STANDARD BEGIN:DAYLIGHT @@ -32,14 +32,14 @@ TZOFFSETFROM:-0500 TZOFFSETTO:-0400 DTSTART:19760425T020000 -RRULE:FREQ=YEARLY;UNTIL=19870405T020000;COUNT=11;BYDAY=-1SU;BYMONTH=4 +RRULE:FREQ=YEARLY;UNTIL=19870405T020000;BYDAY=-1SU;BYMONTH=4 END:DAYLIGHT BEGIN:DAYLIGHT TZNAME:EDT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 DTSTART:19880403T020000 -RRULE:FREQ=YEARLY;UNTIL=20070311T020000;COUNT=19;BYDAY=1SU;BYMONTH=4 +RRULE:FREQ=YEARLY;UNTIL=20070311T020000;BYDAY=1SU;BYMONTH=4 END:DAYLIGHT BEGIN:DAYLIGHT TZNAME:EDT @@ -83,7 +83,7 @@ TZOFFSETFROM:-0400 TZOFFSETTO:-0500 DTSTART:19701025T020000 -RRULE:FREQ=YEARLY;UNTIL=20071104T020000;COUNT=37;BYDAY=-1SU;BYMONTH=10 +RRULE:FREQ=YEARLY;UNTIL=20071104T020000;BYDAY=-1SU;BYMONTH=10 RDATE:20061029T020000 END:STANDARD BEGIN:DAYLIGHT @@ -91,14 +91,14 @@ TZOFFSETFROM:-0500 TZOFFSETTO:-0400 DTSTART:19760425T020000 -RRULE:FREQ=YEARLY;UNTIL=19870405T020000;COUNT=11;BYDAY=-1SU;BYMONTH=4 +RRULE:FREQ=YEARLY;UNTIL=19870405T020000;BYDAY=-1SU;BYMONTH=4 END:DAYLIGHT BEGIN:DAYLIGHT TZNAME:EDT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 DTSTART:19880403T020000 -RRULE:FREQ=YEARLY;UNTIL=20070311T020000;COUNT=19;BYDAY=1SU;BYMONTH=4 +RRULE:FREQ=YEARLY;UNTIL=20070311T020000;BYDAY=1SU;BYMONTH=4 END:DAYLIGHT BEGIN:DAYLIGHT TZNAME:EDT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/autotests/data/Compat-libical3/Mozilla_1.0.ics.ical.ref new/kcalendarcore-5.67.0/autotests/data/Compat-libical3/Mozilla_1.0.ics.ical.ref --- old/kcalendarcore-5.65.0/autotests/data/Compat-libical3/Mozilla_1.0.ics.ical.ref 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/autotests/data/Compat-libical3/Mozilla_1.0.ics.ical.ref 2020-02-01 10:00:07.000000000 +0100 @@ -23,7 +23,7 @@ TZOFFSETFROM:-0400 TZOFFSETTO:-0500 DTSTART:19701025T020000 -RRULE:FREQ=YEARLY;UNTIL=20071104T020000;COUNT=37;BYDAY=-1SU;BYMONTH=10 +RRULE:FREQ=YEARLY;UNTIL=20071104T020000;BYDAY=-1SU;BYMONTH=10 RDATE:20061029T020000 END:STANDARD BEGIN:DAYLIGHT @@ -31,14 +31,14 @@ TZOFFSETFROM:-0500 TZOFFSETTO:-0400 DTSTART:19760425T020000 -RRULE:FREQ=YEARLY;UNTIL=19870405T020000;COUNT=11;BYDAY=-1SU;BYMONTH=4 +RRULE:FREQ=YEARLY;UNTIL=19870405T020000;BYDAY=-1SU;BYMONTH=4 END:DAYLIGHT BEGIN:DAYLIGHT TZNAME:EDT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 DTSTART:19880403T020000 -RRULE:FREQ=YEARLY;UNTIL=20070311T020000;COUNT=19;BYDAY=1SU;BYMONTH=4 +RRULE:FREQ=YEARLY;UNTIL=20070311T020000;BYDAY=1SU;BYMONTH=4 END:DAYLIGHT BEGIN:DAYLIGHT TZNAME:EDT @@ -82,7 +82,7 @@ TZOFFSETFROM:-0400 TZOFFSETTO:-0500 DTSTART:19701025T020000 -RRULE:FREQ=YEARLY;UNTIL=20071104T020000;COUNT=37;BYDAY=-1SU;BYMONTH=10 +RRULE:FREQ=YEARLY;UNTIL=20071104T020000;BYDAY=-1SU;BYMONTH=10 RDATE:20061029T020000 END:STANDARD BEGIN:DAYLIGHT @@ -90,14 +90,14 @@ TZOFFSETFROM:-0500 TZOFFSETTO:-0400 DTSTART:19760425T020000 -RRULE:FREQ=YEARLY;UNTIL=19870405T020000;COUNT=11;BYDAY=-1SU;BYMONTH=4 +RRULE:FREQ=YEARLY;UNTIL=19870405T020000;BYDAY=-1SU;BYMONTH=4 END:DAYLIGHT BEGIN:DAYLIGHT TZNAME:EDT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 DTSTART:19880403T020000 -RRULE:FREQ=YEARLY;UNTIL=20070311T020000;COUNT=19;BYDAY=1SU;BYMONTH=4 +RRULE:FREQ=YEARLY;UNTIL=20070311T020000;BYDAY=1SU;BYMONTH=4 END:DAYLIGHT BEGIN:DAYLIGHT TZNAME:EDT @@ -141,7 +141,7 @@ TZOFFSETFROM:-0400 TZOFFSETTO:-0500 DTSTART:19701025T020000 -RRULE:FREQ=YEARLY;UNTIL=20071104T020000;COUNT=37;BYDAY=-1SU;BYMONTH=10 +RRULE:FREQ=YEARLY;UNTIL=20071104T020000;BYDAY=-1SU;BYMONTH=10 RDATE:20061029T020000 END:STANDARD BEGIN:DAYLIGHT @@ -149,14 +149,14 @@ TZOFFSETFROM:-0500 TZOFFSETTO:-0400 DTSTART:19760425T020000 -RRULE:FREQ=YEARLY;UNTIL=19870405T020000;COUNT=11;BYDAY=-1SU;BYMONTH=4 +RRULE:FREQ=YEARLY;UNTIL=19870405T020000;BYDAY=-1SU;BYMONTH=4 END:DAYLIGHT BEGIN:DAYLIGHT TZNAME:EDT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 DTSTART:19880403T020000 -RRULE:FREQ=YEARLY;UNTIL=20070311T020000;COUNT=19;BYDAY=1SU;BYMONTH=4 +RRULE:FREQ=YEARLY;UNTIL=20070311T020000;BYDAY=1SU;BYMONTH=4 END:DAYLIGHT BEGIN:DAYLIGHT TZNAME:EDT @@ -200,7 +200,7 @@ TZOFFSETFROM:-0400 TZOFFSETTO:-0500 DTSTART:19701025T020000 -RRULE:FREQ=YEARLY;UNTIL=20071104T020000;COUNT=37;BYDAY=-1SU;BYMONTH=10 +RRULE:FREQ=YEARLY;UNTIL=20071104T020000;BYDAY=-1SU;BYMONTH=10 RDATE:20061029T020000 END:STANDARD BEGIN:DAYLIGHT @@ -208,14 +208,14 @@ TZOFFSETFROM:-0500 TZOFFSETTO:-0400 DTSTART:19760425T020000 -RRULE:FREQ=YEARLY;UNTIL=19870405T020000;COUNT=11;BYDAY=-1SU;BYMONTH=4 +RRULE:FREQ=YEARLY;UNTIL=19870405T020000;BYDAY=-1SU;BYMONTH=4 END:DAYLIGHT BEGIN:DAYLIGHT TZNAME:EDT TZOFFSETFROM:-0500 TZOFFSETTO:-0400 DTSTART:19880403T020000 -RRULE:FREQ=YEARLY;UNTIL=20070311T020000;COUNT=19;BYDAY=1SU;BYMONTH=4 +RRULE:FREQ=YEARLY;UNTIL=20070311T020000;BYDAY=1SU;BYMONTH=4 END:DAYLIGHT BEGIN:DAYLIGHT TZNAME:EDT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/autotests/testicaltimezones.cpp new/kcalendarcore-5.67.0/autotests/testicaltimezones.cpp --- old/kcalendarcore-5.65.0/autotests/testicaltimezones.cpp 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/autotests/testicaltimezones.cpp 2020-02-01 10:00:07.000000000 +0100 @@ -123,7 +123,7 @@ "TZOFFSETFROM:+0200\r\n" "TZOFFSETTO:+0100\r\n" "DTSTART:19790930T030000\r\n" - "RRULE:FREQ=YEARLY;UNTIL=19961027T030000;COUNT=17;BYDAY=-1SU;BYMONTH=9\r\n" + "RRULE:FREQ=YEARLY;UNTIL=19961027T030000;BYDAY=-1SU;BYMONTH=9\r\n" "RDATE;VALUE=DATE-TIME:19950924T030000\r\n" "END:STANDARD\r\n" "BEGIN:DAYLIGHT\r\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/autotests/testrecurprevious.cpp new/kcalendarcore-5.67.0/autotests/testrecurprevious.cpp --- old/kcalendarcore-5.65.0/autotests/testrecurprevious.cpp 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/autotests/testrecurprevious.cpp 2020-02-01 10:00:07.000000000 +0100 @@ -114,7 +114,7 @@ ++i; dt = incidence->recurrence()->getPreviousDateTime(dt); if (dt.isValid()) { - (*outstream) << dumpTime(dt, viewZone) << endl; + (*outstream) << dumpTime(dt, viewZone) << '\n'; } } } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/autotests/testrecurrence.cpp new/kcalendarcore-5.67.0/autotests/testrecurrence.cpp --- old/kcalendarcore-5.65.0/autotests/testrecurrence.cpp 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/autotests/testrecurrence.cpp 2020-02-01 10:00:07.000000000 +0100 @@ -103,7 +103,7 @@ ++i; dt = incidence->recurrence()->getNextDateTime(dt); if (dt.isValid()) { - (*outstream) << dumpTime(dt, viewZone) << endl; + (*outstream) << dumpTime(dt, viewZone) << '\n'; } } } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/autotests/testrecurrencetype.cpp new/kcalendarcore-5.67.0/autotests/testrecurrencetype.cpp --- old/kcalendarcore-5.65.0/autotests/testrecurrencetype.cpp 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/autotests/testrecurrencetype.cpp 2020-02-01 10:00:07.000000000 +0100 @@ -101,7 +101,7 @@ ++i; dt = incidence->recurrence()->getNextDateTime(dt); if (dt.isValid()) { - (*outstream) << dumpTime(dt, viewZone) << endl; + (*outstream) << dumpTime(dt, viewZone) << '\n'; } } } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/autotests/testrecurson.cpp new/kcalendarcore-5.67.0/autotests/testrecurson.cpp --- old/kcalendarcore-5.65.0/autotests/testrecurson.cpp 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/autotests/testrecurson.cpp 2020-02-01 10:00:07.000000000 +0100 @@ -97,7 +97,7 @@ int nr = 0; while (dt.year() <= 2020 && nr <= 500) { if (incidence->recursOn(dt, viewZone)) { - (*outstream) << dt.toString(Qt::ISODate) << endl; + (*outstream) << dt.toString(Qt::ISODate) << '\n'; nr++; } dt = dt.addDays(1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/autotests/testtimesininterval.cpp new/kcalendarcore-5.67.0/autotests/testtimesininterval.cpp --- old/kcalendarcore-5.65.0/autotests/testtimesininterval.cpp 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/autotests/testtimesininterval.cpp 2020-02-01 10:00:07.000000000 +0100 @@ -155,3 +155,103 @@ } QCOMPARE(expectedEventOccurrences.size(), 0); } + +void TimesInIntervalTest::testLocalTimeHandlingNonAllDay() +{ + // Create an event which occurs every weekday of every week, + // starting from Friday the 11th of October, from 12 pm until 1 pm, clock time, + // and lasts for two weeks, with three exception datetimes, + // (only two of which will apply). + QTimeZone anotherZone(QTimeZone::systemTimeZoneId().contains("Toronto") + ? QTimeZone(QByteArray("Pacific/Midway")) + : QTimeZone(QByteArray("America/Toronto"))); + Event event; + event.setAllDay(false); + event.setDtStart(QDateTime(QDate(2019, 10, 11), QTime(12, 0), Qt::LocalTime)); + + RecurrenceRule * const rule = new RecurrenceRule(); + rule->setRecurrenceType(RecurrenceRule::rDaily); + rule->setStartDt(event.dtStart()); + rule->setFrequency(1); + rule->setDuration(14); + rule->setByDays(QList<RecurrenceRule::WDayPos>() + << RecurrenceRule::WDayPos(0, 1) // Monday + << RecurrenceRule::WDayPos(0, 2) // Tuesday + << RecurrenceRule::WDayPos(0, 3) // Wednesday + << RecurrenceRule::WDayPos(0, 4) // Thursday + << RecurrenceRule::WDayPos(0, 5)); // Friday + + Recurrence *recurrence = event.recurrence(); + recurrence->addRRule(rule); + // 12 o'clock in local time, will apply. + recurrence->addExDateTime(QDateTime(QDate(2019, 10, 15), QTime(12, 0), + Qt::LocalTime)); + // 12 o'clock in another time zone, will not apply. + recurrence->addExDateTime(QDateTime(QDate(2019, 10, 17), QTime(12, 0), + anotherZone)); + // The time in another time zone, corresponding to 12 o'clock in the system time zone, will apply. + recurrence->addExDateTime(QDateTime(QDate(2019, 10, 24), QTime(12, 00), + QTimeZone::systemTimeZone()).toTimeZone(anotherZone)); + + // Expand the events and within a wide interval + const DateTimeList timesInInterval = + recurrence->timesInInterval(QDateTime(QDate(2019, 10, 05), QTime(0, 0)), + QDateTime(QDate(2019, 10, 25), QTime(23, 59))); + + // ensure that the expansion does not include weekend days, + // nor either of the exception date times. + const QList<int> expectedDays { 11, 14, 16, 17, 18, 21, 22, 23, 25 }; + for (int day : expectedDays) { + QVERIFY(timesInInterval.contains(QDateTime(QDate(2019, 10, day), QTime(12, 0), Qt::LocalTime))); + } + QCOMPARE(timesInInterval.size(), expectedDays.size()); +} + +void TimesInIntervalTest::testLocalTimeHandlingAllDay() +{ + // Create an event which occurs every weekday of every week, + // starting from Friday the 11th of October, and lasts for two weeks, + // with four exception datetimes (only three of which will apply). + QTimeZone anotherZone(QTimeZone::systemTimeZoneId().contains("Toronto") + ? QTimeZone(QByteArray("Pacific/Midway")) + : QTimeZone(QByteArray("America/Toronto"))); + Event event; + event.setAllDay(true); + event.setDtStart(QDateTime(QDate(2019, 10, 11))); + + RecurrenceRule * const rule = new RecurrenceRule(); + rule->setRecurrenceType(RecurrenceRule::rDaily); + rule->setStartDt(event.dtStart()); + rule->setFrequency(1); + rule->setDuration(14); + rule->setByDays(QList<RecurrenceRule::WDayPos>() + << RecurrenceRule::WDayPos(0, 1) // Monday + << RecurrenceRule::WDayPos(0, 2) // Tuesday + << RecurrenceRule::WDayPos(0, 3) // Wednesday + << RecurrenceRule::WDayPos(0, 4) // Thursday + << RecurrenceRule::WDayPos(0, 5)); // Friday + + Recurrence *recurrence = event.recurrence(); + recurrence->addRRule(rule); + // A simple date, will apply. + recurrence->addExDate(QDate(2019, 10, 14)); + // A date only local time, will apply. + recurrence->addExDateTime(QDateTime(QDate(2019, 10, 15))); + // A date time starting at 00:00 in another zone, will not apply. + recurrence->addExDateTime(QDateTime(QDate(2019, 10, 17), QTime(), anotherZone)); + // A date time starting at 00:00 in the system time zone, will apply. + recurrence->addExDateTime(QDateTime(QDate(2019, 10, 24), QTime(), QTimeZone::systemTimeZone())); + + // Expand the events and within a wide interval + const DateTimeList timesInInterval = + recurrence->timesInInterval(QDateTime(QDate(2019, 10, 05), QTime(0, 0)), + QDateTime(QDate(2019, 10, 25), QTime(23, 59))); + + // ensure that the expansion does not include weekend days, + // nor either of the exception date times. + const QList<int> expectedDays { 11, 16, 17, 18, 21, 22, 23, 25 }; + for (int day : expectedDays) { + QVERIFY(timesInInterval.contains(QDateTime(QDate(2019, 10, day)))); + } + QCOMPARE(timesInInterval.size(), expectedDays.size()); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/autotests/testtimesininterval.h new/kcalendarcore-5.67.0/autotests/testtimesininterval.h --- old/kcalendarcore-5.65.0/autotests/testtimesininterval.h 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/autotests/testtimesininterval.h 2020-02-01 10:00:07.000000000 +0100 @@ -33,6 +33,8 @@ void testSubDailyRecurrenceIntervalInclusive(); void testSubDailyRecurrence2(); void testSubDailyRecurrenceIntervalLimits(); + void testLocalTimeHandlingNonAllDay(); + void testLocalTimeHandlingAllDay(); }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/src/icalformat.cpp new/kcalendarcore-5.67.0/src/icalformat.cpp --- old/kcalendarcore-5.65.0/src/icalformat.cpp 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/src/icalformat.cpp 2020-02-01 10:00:07.000000000 +0100 @@ -586,8 +586,7 @@ } if (!icalrestriction_check(message)) { - qCWarning(KCALCORE_LOG) << endl - << "kcalcore library reported a problem while parsing:"; + qCWarning(KCALCORE_LOG) << "\nkcalcore library reported a problem while parsing:"; qCWarning(KCALCORE_LOG) << ScheduleMessage::methodName(method) << ":" << d->mImpl->extractErrorProperty(c); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/src/icalformat_p.cpp new/kcalendarcore-5.67.0/src/icalformat_p.cpp --- old/kcalendarcore-5.65.0/src/icalformat_p.cpp 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/src/icalformat_p.cpp 2020-02-01 10:00:07.000000000 +0100 @@ -1977,8 +1977,7 @@ if (!uidProcessed) { qCWarning(KCALCORE_LOG) << "The incidence didn't have any UID! Report a bug " - << "to the application that generated this file." - << endl; + << "to the application that generated this file."; // Our in-memory incidence has a random uid generated in Event's ctor. // Make it empty so it matches what's in the file: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/src/icaltimezones.cpp new/kcalendarcore-5.67.0/src/icaltimezones.cpp --- old/kcalendarcore-5.65.0/src/icaltimezones.cpp 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/src/icaltimezones.cpp 2020-02-01 10:00:07.000000000 +0100 @@ -386,7 +386,6 @@ icalrecurrencetype r; icalrecurrencetype_clear(&r); r.freq = ICAL_YEARLY_RECURRENCE; - r.count = (year >= 2030) ? 0 : times.count() - 1; r.by_month[0] = month; if (rule & DAY_OF_MONTH) { r.by_month_day[0] = dayOfMonth; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcalendarcore-5.65.0/src/incidence.h new/kcalendarcore-5.67.0/src/incidence.h --- old/kcalendarcore-5.65.0/src/incidence.h 2019-12-07 20:41:23.000000000 +0100 +++ new/kcalendarcore-5.67.0/src/incidence.h 2020-02-01 10:00:07.000000000 +0100 @@ -73,6 +73,9 @@ Q_PROPERTY(QString description READ description WRITE setDescription) Q_PROPERTY(QString summary READ summary WRITE setSummary) Q_PROPERTY(QString location READ location WRITE setLocation) + Q_PROPERTY(bool hasGeo READ hasGeo WRITE setHasGeo) + Q_PROPERTY(float geoLatitude READ geoLatitude WRITE setGeoLatitude) + Q_PROPERTY(float geoLongitude READ geoLongitude WRITE setGeoLongitude) Q_PROPERTY(QStringList categories READ categories WRITE setCategories) Q_PROPERTY(int priority READ priority WRITE setPriority) Q_PROPERTY(QDateTime created READ created WRITE setCreated)
