Hello community, here is the log from the commit of package calligra-plan for openSUSE:Factory checked in at 2019-07-29 17:29:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calligra-plan (Old) and /work/SRC/openSUSE:Factory/.calligra-plan.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "calligra-plan" Mon Jul 29 17:29:06 2019 rev:4 rq:719366 version:3.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/calligra-plan/calligra-plan.changes 2018-06-04 13:23:12.615126101 +0200 +++ /work/SRC/openSUSE:Factory/.calligra-plan.new.4126/calligra-plan.changes 2019-07-29 17:29:12.614239602 +0200 @@ -1,0 +2,6 @@ +Sat Jul 27 11:37:57 UTC 2019 - wbauer@tmo.at + +- Add Fix-compilation-after-recent-KCalCore-API-changes.patch to + fix build with kcalcore 19.08 + +------------------------------------------------------------------- New: ---- Fix-compilation-after-recent-KCalCore-API-changes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra-plan.spec ++++++ --- /var/tmp/diff_new_pack.nLeRyC/_old 2019-07-29 17:29:13.474239284 +0200 +++ /var/tmp/diff_new_pack.nLeRyC/_new 2019-07-29 17:29:13.478239282 +0200 @@ -28,6 +28,8 @@ Patch0: 0001-Plan-fix-build-with-Qt-5.6.patch # PATCH-FIX-UPSTREAM -- Fix-build-with-Qt-511.patch Patch1: Fix-build-with-Qt-511.patch +# PATCH-FIX-UPSTREAM +Patch2: Fix-compilation-after-recent-KCalCore-API-changes.patch BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: update-desktop-files ++++++ Fix-compilation-after-recent-KCalCore-API-changes.patch ++++++

From 2d484fda1b31a72659088a4bfce5c3708e923cb0 Mon Sep 17 00:00:00 2001 From: David Faure <faure@kde.org> Date: Tue, 23 Jul 2019 12:20:29 +0200 Subject: Fix compilation after recent KCalCore API changes

--- .../filters/icalendar/export/icalendarexport.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp b/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp index 757d693..daf1c2d 100644 --- a/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp +++ b/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp @@ -31,6 +31,7 @@ #include <kcalcore/attachment.h> #include <kcalcore/icalformat.h> #include <kcalcore/memorycalendar.h> +#include <kcalcore_version.h> #include <QTextCodec> #include <QByteArray> @@ -140,9 +141,15 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node, todo->setOrganizer(node->projectNode()->leader()); } if ( node->type() != Node::Type_Project && ! node->leader().isEmpty()) { +#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80) + KCalCore::Person p = KCalCore::Person::fromFullName(node->leader()); + KCalCore::Attendee a(p.name(), p.email()); + a.setRole(KCalCore::Attendee::NonParticipant); +#else KCalCore::Person::Ptr p = KCalCore::Person::fromFullName(node->leader()); KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p->name(), p->email())); a->setRole(KCalCore::Attendee::NonParticipant); +#endif todo->addAttendee(a); } DateTime st = node->startTime(id); @@ -161,13 +168,21 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node, const QList<Resource*> lst = task->requestedResources(); foreach(const Resource *r, lst) { if (r->type() == Resource::Type_Work) { +#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80) + todo->addAttendee(KCalCore::Attendee(r->name(), r->email())); +#else todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email()))); +#endif } } } else { foreach(const Resource *r, s->resources()) { if (r->type() == Resource::Type_Work) { +#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80) + todo->addAttendee(KCalCore::Attendee(r->name(), r->email())); +#else todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email()))); +#endif } } @@ -178,7 +193,11 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node, todo->setPercentComplete(task->completion().percentFinished()); } foreach(const Document *doc, node->documents().documents()) { +#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80) + todo->addAttachment(KCalCore::Attachment(doc->url().url())); +#else todo->addAttachment(KCalCore::Attachment::Ptr(new KCalCore::Attachment(doc->url().url()))); +#endif } if (! parent.isNull()) { todo->setRelatedTo(parent->uid(), KCalCore::Incidence::RelTypeParent); -- cgit v1.1