diff --git a/rpm/0001-Use-UTC-times-when-calculating-the-transition-dates-.patch b/rpm/0001-Use-UTC-times-when-calculating-the-transition-dates-.patch index 2d12783..925cbb0 100644 --- a/rpm/0001-Use-UTC-times-when-calculating-the-transition-dates-.patch +++ b/rpm/0001-Use-UTC-times-when-calculating-the-transition-dates-.patch @@ -1,4 +1,4 @@ -From 1485372ddd6c8ce0ea76f2f0716973c5315cc84d Mon Sep 17 00:00:00 2001 +From 0162239b712a44d0c3bc6e1bde75d0a5800ffb30 Mon Sep 17 00:00:00 2001 From: Christoph Lenggenhager Date: Wed, 10 Jun 2015 17:34:12 +0200 Subject: [PATCH] Use UTC times when calculating the transition dates of @@ -57,5 +57,5 @@ index 361988a16..f8ea6f86d 100644 break; } -- -2.28.0 +2.29.2 diff --git a/rpm/0002-Adjust-for-lower-Qt-versions.patch b/rpm/0002-Adjust-for-lower-Qt-versions.patch index 1d82fb8..e0e861b 100644 --- a/rpm/0002-Adjust-for-lower-Qt-versions.patch +++ b/rpm/0002-Adjust-for-lower-Qt-versions.patch @@ -1,4 +1,4 @@ -From 54c81cb665e5c30238e2ca36bf69b8fc1ac561d0 Mon Sep 17 00:00:00 2001 +From b74f1213e823d8d3389a0b22bebbc1b55f8183a5 Mon Sep 17 00:00:00 2001 From: Damien Caliste Date: Tue, 14 May 2019 11:35:15 +0200 Subject: [PATCH] Adjust for lower Qt versions. @@ -13,21 +13,21 @@ Subject: [PATCH] Adjust for lower Qt versions. autotests/testtimesininterval.cpp | 12 +++++++++++ src/calendar.cpp | 1 + src/icalformat.cpp | 1 + - src/icalformat_p.cpp | 3 +++ + src/icalformat_p.cpp | 5 ++++- src/occurrenceiterator.cpp | 1 + src/recurrencerule.cpp | 32 +++++++++++++++++++++++++++++ src/utils_p.h | 8 ++++++++ - 13 files changed, 82 insertions(+), 3 deletions(-) + 13 files changed, 83 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 53d1c7754..2776c8430 100644 +index 23e72e650..1c27dd317 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -5,13 +5,13 @@ project(KCalendarCore VERSION ${KF5_VERSION}) +@@ -5,13 +5,13 @@ project(KCalendarCore VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) --find_package(ECM 5.78.0 NO_MODULE) +-find_package(ECM 5.79.0 NO_MODULE) +find_package(ECM 5.75.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) @@ -100,10 +100,10 @@ index ee5eeb9dc..01a590aed 100644 alarm->setType(Alarm::Display); alarm->setStartOffset(Duration(0)); diff --git a/autotests/testmemorycalendar.cpp b/autotests/testmemorycalendar.cpp -index b065a692c..e5f876fe3 100644 +index fbe96258a..a708ba2a5 100644 --- a/autotests/testmemorycalendar.cpp +++ b/autotests/testmemorycalendar.cpp -@@ -121,7 +121,7 @@ void MemoryCalendarTest::testIncidences() +@@ -150,7 +150,7 @@ void MemoryCalendarTest::testIncidences() QVERIFY(store.load()); Todo::Ptr todo = cal->incidence(QStringLiteral("4")).staticCast(); @@ -170,7 +170,7 @@ index d7e4e9a85..d426e228a 100644 QCOMPARE(timesInInterval.size(), expectedDays.size()); } diff --git a/src/calendar.cpp b/src/calendar.cpp -index c8702d8c7..74866f1d4 100644 +index d8612e01e..03ad52938 100644 --- a/src/calendar.cpp +++ b/src/calendar.cpp @@ -27,6 +27,7 @@ @@ -194,7 +194,7 @@ index 4c31c3143..fe372ba2d 100644 #include #include diff --git a/src/icalformat_p.cpp b/src/icalformat_p.cpp -index 2dee76f9f..4ac7b0553 100644 +index 97e14670d..4aa340b9d 100644 --- a/src/icalformat_p.cpp +++ b/src/icalformat_p.cpp @@ -32,6 +32,7 @@ @@ -205,7 +205,16 @@ index 2dee76f9f..4ac7b0553 100644 #include "kcalendarcore_debug.h" -@@ -2614,7 +2615,9 @@ QDateTime ICalFormatImpl::readICalDateTimeProperty(icalproperty *p, const ICalTi +@@ -1820,7 +1821,7 @@ void ICalFormatImpl::readIncidence(icalcomponent *parent, const Incidence::Ptr & + // We can't change that -- in order to retain backwards compatibility. + text = icalproperty_get_categories(p); + const QString val = QString::fromUtf8(text); +- const QStringList lstVal = val.split(QLatin1Char(','), Qt::SkipEmptyParts); ++ const QStringList lstVal = val.split(QLatin1Char(','), QString::SkipEmptyParts); + for (const QString &cat : lstVal) { + // ensure no duplicates + if (!categories.contains(cat)) { +@@ -2610,7 +2611,9 @@ QDateTime ICalFormatImpl::readICalDateTimeProperty(icalproperty *p, const ICalTi break; } } //end of ICAL_X_PROPERTY diff --git a/rpm/0003-Add-pkgconfig-packaging.patch b/rpm/0003-Add-pkgconfig-packaging.patch index ed4bd85..4132e1d 100644 --- a/rpm/0003-Add-pkgconfig-packaging.patch +++ b/rpm/0003-Add-pkgconfig-packaging.patch @@ -1,4 +1,4 @@ -From 69905ba8c7b8454712bdb941f0b2658a01192fc3 Mon Sep 17 00:00:00 2001 +From 316ade83e27fe261849d3335c5c9f5a5ac062feb Mon Sep 17 00:00:00 2001 From: Damien Caliste Date: Tue, 14 May 2019 13:30:00 +0200 Subject: [PATCH] Add pkgconfig packaging. @@ -10,7 +10,7 @@ Subject: [PATCH] Add pkgconfig packaging. create mode 100644 KF5CalendarCore.pc.in diff --git a/CMakeLists.txt b/CMakeLists.txt -index 76d7ad7d9..bd93b4788 100644 +index 1c27dd317..7fb473963 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,4 +118,16 @@ if (NOT KCALENDARCORE_NO_DEPRECATED_NAMESPACE) @@ -49,5 +49,5 @@ index 000000000..b17360158 +Libs: -L${libdir} @PRIVATE_LIBS@ +Cflags: -I${includedir} -- -2.28.0 +2.29.2 diff --git a/upstream b/upstream index 8198fad..d82e9a5 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit 8198fad8f8ff5b658400f5c77b07ea403a8c02da +Subproject commit d82e9a5e6b6ba8984e416652dad7ce1ef0909c63