Skip to content

Commit

Permalink
[kf5-calendarcore] Update to 5.76.0 plus the timesInInterval correction.
Browse files Browse the repository at this point in the history
  • Loading branch information
dcaliste committed Nov 16, 2020
1 parent 6f8437f commit 99ebf3a
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 19 deletions.
@@ -1,7 +1,7 @@
From ef3122d9e20f5a1b9079c93c8314f282d5dc7736 Mon Sep 17 00:00:00 2001
From 1485372ddd6c8ce0ea76f2f0716973c5315cc84d Mon Sep 17 00:00:00 2001
From: Christoph Lenggenhager <clenggenhager@gmail.com>
Date: Wed, 10 Jun 2015 17:34:12 +0200
Subject: [PATCH 1/3] Use UTC times when calculating the transition dates of
Subject: [PATCH] Use UTC times when calculating the transition dates of
standard and dst phases.

Using UTC ensures that the rrule calculation does not encounter any invalid dates, e.g. during the hour lost when switching to DST.
Expand Down
25 changes: 16 additions & 9 deletions rpm/0002-Adjust-for-lower-Qt-versions.patch
@@ -1,10 +1,10 @@
From be90d546451837df25f944eed4f8f4e628598bbc Mon Sep 17 00:00:00 2001
From c781f5a6014d7e04b1018da3d8a073a5afc846ff Mon Sep 17 00:00:00 2001
From: Damien Caliste <dcaliste@free.fr>
Date: Tue, 14 May 2019 11:35:15 +0200
Subject: [PATCH 2/3] Adjust for lower Qt versions.
Subject: [PATCH] Adjust for lower Qt versions.

---
CMakeLists.txt | 2 +-
CMakeLists.txt | 4 ++--
autotests/testmemorycalendar.cpp | 2 +-
autotests/testrecurtodo.cpp | 5 +++++
src/calendar.cpp | 1 +
Expand All @@ -14,13 +14,20 @@ Subject: [PATCH 2/3] Adjust for lower Qt versions.
src/occurrenceiterator.cpp | 1 +
src/recurrencerule.cpp | 32 ++++++++++++++++++++++++++++++++
src/utils_p.h | 8 ++++++++
10 files changed, 55 insertions(+), 4 deletions(-)
10 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74f453288..829fe7dd1 100644
index 8487320fb..36b0aabf5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKA
@@ -5,13 +5,13 @@ project(KCalendarCore VERSION ${KF5_VERSION})

# ECM setup
include(FeatureSummary)
-find_package(ECM 5.76.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)

set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)

Expand All @@ -30,7 +37,7 @@ index 74f453288..829fe7dd1 100644
include(KDEInstallDirs)
include(KDECMakeSettings)
diff --git a/autotests/testmemorycalendar.cpp b/autotests/testmemorycalendar.cpp
index 6a6910f5b..0b503f62f 100644
index b065a692c..e5f876fe3 100644
--- a/autotests/testmemorycalendar.cpp
+++ b/autotests/testmemorycalendar.cpp
@@ -121,7 +121,7 @@ void MemoryCalendarTest::testIncidences()
Expand Down Expand Up @@ -106,7 +113,7 @@ index 51ebda04a..8683816fc 100644
switch (kind) {
case ICAL_RDATE_PROPERTY:
diff --git a/src/memorycalendar.cpp b/src/memorycalendar.cpp
index 7b52f502d..51cfac413 100644
index 78e3665a9..590533b1a 100644
--- a/src/memorycalendar.cpp
+++ b/src/memorycalendar.cpp
@@ -209,8 +209,8 @@ bool MemoryCalendar::deleteIncidence(const Incidence::Ptr &incidence)
Expand All @@ -133,7 +140,7 @@ index 82d9964f9..76b352546 100644
#include <QDate>

diff --git a/src/recurrencerule.cpp b/src/recurrencerule.cpp
index cf009a6d9..5a70da143 100644
index cd4afc4a0..99e416fd6 100644
--- a/src/recurrencerule.cpp
+++ b/src/recurrencerule.cpp
@@ -655,19 +655,29 @@ bool Constraint::readDateTime(const QDateTime &dt, RecurrenceRule::PeriodType ty
Expand Down
6 changes: 3 additions & 3 deletions rpm/0003-Add-pkgconfig-packaging.patch
@@ -1,7 +1,7 @@
From 096260fda4c824e721588943edec228ec793bc82 Mon Sep 17 00:00:00 2001
From 69905ba8c7b8454712bdb941f0b2658a01192fc3 Mon Sep 17 00:00:00 2001
From: Damien Caliste <dcaliste@free.fr>
Date: Tue, 14 May 2019 13:30:00 +0200
Subject: [PATCH 3/3] Add pkgconfig packaging.
Subject: [PATCH] Add pkgconfig packaging.

---
CMakeLists.txt | 11 +++++++++++
Expand All @@ -10,7 +10,7 @@ Subject: [PATCH 3/3] Add pkgconfig packaging.
create mode 100644 KF5CalendarCore.pc.in

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 829fe7dd1..aae2c5615 100644
index 36b0aabf5..788534a77 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,4 +120,15 @@ if (NOT KCALENDARCORE_NO_DEPRECATED_NAMESPACE)
Expand Down
10 changes: 6 additions & 4 deletions rpm/kf5-calendarcore.spec
@@ -1,6 +1,6 @@
Name: kf5-calendarcore
Summary: KDE calendar library
Version: 5.75.0
Version: 5.76.0
Release: 1
License: LGPLv2+ and BSD
URL: https://invent.kde.org/frameworks/kcalendarcore
Expand Down Expand Up @@ -55,8 +55,10 @@ install KF5CalendarCore.pc %{pkg_config_dir}

%files devel
%defattr(-,root,root,-)
%{_includedir}/KF5
%{_datadir}/qt5
%{_includedir}/KF5/KCalendarCore
%{_includedir}/KF5/kcalcore_version.h
%{_includedir}/KF5/kcalendarcore_version.h
%{_datadir}/qt5/mkspecs/modules/qt_KCalendarCore.pri
%{_libdir}/cmake/KF5CalendarCore
%{_libdir}/libKF5CalendarCore.so
%{_libdir}/pkgconfig
%{_libdir}/pkgconfig/KF5CalendarCore.pc
2 changes: 1 addition & 1 deletion upstream
Submodule upstream updated from ad915f to 5fd0c3

0 comments on commit 99ebf3a

Please sign in to comment.