e1214e61a2
- Fix the license tag. Zanshin has GPL-2.0-only and MIT files - Add patches to build with recent kcalendarcore versions: * 0001-Fix-compilation-with-latest-KCalCore-API-changes-Att.patch * 0001-Fix-build-with-Boost-1.70.0.patch * 0001-Look-for-AkonadiContact.patch * 0001-Remove-the-delegation-feature.patch * 0001-Fix-compilation-after-Collection-referenced-was-removed.patch * 0001-Fix-linking-of-the-cuke-steps.patch * 0001-Make-it-build-both-with-pre-and-post.patch - Drop patches: * findKF5sooner.patch * useknownGCCflag.patch * qpointerconnect.diff * fix-build-with-Qt-5.6.patch OBS-URL: https://build.opensuse.org/request/show/742248 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zanshin?expand=0&rev=5
133 lines
6.5 KiB
Diff
133 lines
6.5 KiB
Diff
From 3d73d1733190245c23b921c0da11aac0d783345d Mon Sep 17 00:00:00 2001
|
|
From: David Faure <faure@kde.org>
|
|
Date: Sat, 27 Jul 2019 19:31:42 +0200
|
|
Subject: [PATCH 01/23] Fix compilation with latest KCalCore API changes
|
|
(Attachment now a value class)
|
|
|
|
---
|
|
src/akonadi/akonadiserializer.cpp | 25 ++++++++++++++++++
|
|
tests/units/akonadi/akonadiserializertest.cpp | 26 +++++++++++++++++++
|
|
2 files changed, 51 insertions(+)
|
|
diff --git a/src/akonadi/akonadiserializer.cpp b/src/akonadi/akonadiserializer.cpp
|
|
index ee4d1ff..8cb60ff 100644
|
|
--- a/src/akonadi/akonadiserializer.cpp
|
|
+++ b/src/akonadi/akonadiserializer.cpp
|
|
@@ -239,6 +239,19 @@ void Serializer::updateTaskFromItem(Domain::Task::Ptr task, Item item)
|
|
attachments.reserve(attachmentsInput.size());
|
|
std::transform(attachmentsInput.cbegin(), attachmentsInput.cend(),
|
|
std::back_inserter(attachments),
|
|
+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80)
|
|
+ [&mimeDb] (const KCalCore::Attachment &attach) {
|
|
+ Domain::Task::Attachment attachment;
|
|
+ if (attach.isUri())
|
|
+ attachment.setUri(QUrl(attach.uri()));
|
|
+ else
|
|
+ attachment.setData(attach.decodedData());
|
|
+ attachment.setLabel(attach.label());
|
|
+ attachment.setMimeType(attach.mimeType());
|
|
+ attachment.setIconName(mimeDb.mimeTypeForName(attach.mimeType()).iconName());
|
|
+ return attachment;
|
|
+ });
|
|
+#else
|
|
[&mimeDb] (const KCalCore::Attachment::Ptr &attach) {
|
|
Domain::Task::Attachment attachment;
|
|
if (attach->isUri())
|
|
@@ -250,6 +263,7 @@ void Serializer::updateTaskFromItem(Domain::Task::Ptr task, Item item)
|
|
attachment.setIconName(mimeDb.mimeTypeForName(attach->mimeType()).iconName());
|
|
return attachment;
|
|
});
|
|
+#endif
|
|
task->setAttachments(attachments);
|
|
|
|
if (todo->attendeeCount() > 0) {
|
|
@@ -324,6 +338,15 @@ Akonadi::Item Serializer::createItemFromTask(Domain::Task::Ptr task)
|
|
}
|
|
|
|
for (const auto &attachment : task->attachments()) {
|
|
+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80)
|
|
+ KCalCore::Attachment attach(QByteArray{});
|
|
+ if (attachment.isUri())
|
|
+ attach.setUri(attachment.uri().toString());
|
|
+ else
|
|
+ attach.setDecodedData(attachment.data());
|
|
+ attach.setMimeType(attachment.mimeType());
|
|
+ attach.setLabel(attachment.label());
|
|
+#else
|
|
KCalCore::Attachment::Ptr attach(new KCalCore::Attachment(QByteArray()));
|
|
if (attachment.isUri())
|
|
attach->setUri(attachment.uri().toString());
|
|
@@ -331,6 +354,7 @@ Akonadi::Item Serializer::createItemFromTask(Domain::Task::Ptr task)
|
|
attach->setDecodedData(attachment.data());
|
|
attach->setMimeType(attachment.mimeType());
|
|
attach->setLabel(attachment.label());
|
|
+#endif
|
|
todo->addAttachment(attach);
|
|
}
|
|
|
|
diff --git a/tests/units/akonadi/akonadiserializertest.cpp b/tests/units/akonadi/akonadiserializertest.cpp
|
|
index 3be5450..e380baf 100644
|
|
--- a/tests/units/akonadi/akonadiserializertest.cpp
|
|
+++ b/tests/units/akonadi/akonadiserializertest.cpp
|
|
@@ -696,10 +696,17 @@ private slots:
|
|
setTodoDates(originalTodo, QDateTime(QDate(2013, 11, 24)), QDateTime(QDate(2014, 03, 01)));
|
|
|
|
originalTodo->setRelatedTo(QStringLiteral("my-uid"));
|
|
+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80)
|
|
+ KCalCore::Attendee originalAttendee(QStringLiteral("John Doe"),
|
|
+ QStringLiteral("j@d.com"),
|
|
+ true,
|
|
+ KCalCore::Attendee::Accepted);
|
|
+#else
|
|
KCalCore::Attendee::Ptr originalAttendee(new KCalCore::Attendee(QStringLiteral("John Doe"),
|
|
QStringLiteral("j@d.com"),
|
|
true,
|
|
KCalCore::Attendee::Accepted));
|
|
+#endif
|
|
originalTodo->addAttendee(originalAttendee);
|
|
|
|
// ... as payload of an item...
|
|
@@ -758,6 +765,15 @@ private slots:
|
|
updatedTodo->recurrence()->setDaily(1);
|
|
|
|
for (int i = 0; i < updatedAttachmentData.size(); i++) {
|
|
+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80)
|
|
+ KCalCore::Attachment attachment(QByteArray{});
|
|
+ if (!updatedAttachmentData.at(i).isEmpty())
|
|
+ attachment.setDecodedData(updatedAttachmentData.at(i));
|
|
+ else
|
|
+ attachment.setUri(updatedAttachmentUris.at(i));
|
|
+ attachment.setMimeType(updatedAttachmentMimeTypes.at(i));
|
|
+ attachment.setLabel(updatedAttachmentLabels.at(i));
|
|
+#else
|
|
KCalCore::Attachment::Ptr attachment(new KCalCore::Attachment(QByteArray()));
|
|
if (!updatedAttachmentData.at(i).isEmpty())
|
|
attachment->setDecodedData(updatedAttachmentData.at(i));
|
|
@@ -765,6 +781,7 @@ private slots:
|
|
attachment->setUri(updatedAttachmentUris.at(i));
|
|
attachment->setMimeType(updatedAttachmentMimeTypes.at(i));
|
|
attachment->setLabel(updatedAttachmentLabels.at(i));
|
|
+#endif
|
|
updatedTodo->addAttachment(attachment);
|
|
}
|
|
|
|
@@ -1289,11 +1306,19 @@ private slots:
|
|
QCOMPARE(todo->attachments().size(), attachments.size());
|
|
for (int i = 0; i < attachments.size(); i++) {
|
|
auto attachment = todo->attachments().at(i);
|
|
+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80)
|
|
+ QCOMPARE(attachment.isUri(), attachments.at(i).isUri());
|
|
+ QCOMPARE(QUrl(attachment.uri()), attachments.at(i).uri());
|
|
+ QCOMPARE(attachment.decodedData(), attachments.at(i).data());
|
|
+ QCOMPARE(attachment.label(), attachments.at(i).label());
|
|
+ QCOMPARE(attachment.mimeType(), attachments.at(i).mimeType());
|
|
+#else
|
|
QCOMPARE(attachment->isUri(), attachments.at(i).isUri());
|
|
QCOMPARE(QUrl(attachment->uri()), attachments.at(i).uri());
|
|
QCOMPARE(attachment->decodedData(), attachments.at(i).data());
|
|
QCOMPARE(attachment->label(), attachments.at(i).label());
|
|
QCOMPARE(attachment->mimeType(), attachments.at(i).mimeType());
|
|
+#endif
|
|
}
|
|
|
|
if (delegate.isValid()) {
|