diff options
Diffstat (limited to 'media-gfx/digikam/files/digikam-5.7.0-kcalcore-1.patch')
| -rw-r--r-- | media-gfx/digikam/files/digikam-5.7.0-kcalcore-1.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/media-gfx/digikam/files/digikam-5.7.0-kcalcore-1.patch b/media-gfx/digikam/files/digikam-5.7.0-kcalcore-1.patch new file mode 100644 index 000000000000..9a9574fc982b --- /dev/null +++ b/media-gfx/digikam/files/digikam-5.7.0-kcalcore-1.patch @@ -0,0 +1,44 @@ +From 12ab7af4618f10d39d4a977e00a0e68a3aac9bd2 Mon Sep 17 00:00:00 2001 +From: Simon Frei <freisim93@gmail.com> +Date: Wed, 13 Sep 2017 15:43:49 +0200 +Subject: calendar: Adjust to new KCalCore API (fixes CI) + +--- + utilities/assistants/calendar/print/calsettings.cpp | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/utilities/assistants/calendar/print/calsettings.cpp b/utilities/assistants/calendar/print/calsettings.cpp +index b0bed5a..46e995d 100644 +--- a/utilities/assistants/calendar/print/calsettings.cpp ++++ b/utilities/assistants/calendar/print/calsettings.cpp +@@ -31,12 +31,17 @@ + #include "digikam_debug.h" + #include "calsystem.h" + +-// KCalCore includes + + #ifdef HAVE_KCALENDAR ++ // KCalCore includes ++ + # include <kcalcore/icalformat.h> + # include <kcalcore/filestorage.h> + # include <kcalcore/memorycalendar.h> ++ ++ // Qt includes ++ ++# include <QTimeZone> + #endif // HAVE_KCALENDAR + + namespace Digikam +@@ -290,7 +295,7 @@ void CalSettings::loadSpecial(const QUrl& url, const QColor& color) + return; + } + +- KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QString::fromLatin1("UTC"))); ++ KCalCore::MemoryCalendar::Ptr memCal(new KCalCore::MemoryCalendar(QTimeZone(0))); + KCalCore::FileStorage::Ptr fileStorage(new KCalCore::FileStorage(memCal, url.toLocalFile(), new KCalCore::ICalFormat)); + + qCDebug(DIGIKAM_GENERAL_LOG) << "Loading calendar from file " << url.toLocalFile(); +-- +cgit v0.11.2 + |