diff --git a/deskutils/zanshin/Makefile b/deskutils/zanshin/Makefile index 923ac955b58e..f0d43b790074 100644 --- a/deskutils/zanshin/Makefile +++ b/deskutils/zanshin/Makefile @@ -1,8 +1,7 @@ # $FreeBSD PORTNAME= zanshin -DISTVERSION= 0.5.0 -PORTREVISION= 6 +DISTVERSION= 0.5.71 CATEGORIES= deskutils kde MASTER_SITES= KDE/stable/${PORTNAME}/ diff --git a/deskutils/zanshin/distinfo b/deskutils/zanshin/distinfo index cf70456c9421..33c4661d92cc 100644 --- a/deskutils/zanshin/distinfo +++ b/deskutils/zanshin/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1533125834 -SHA256 (zanshin-0.5.0.tar.xz) = 0781c088741186f3d9ff3027dc961103d33a59b0e3aeb6bc4c66ff24eb3adb4f -SIZE (zanshin-0.5.0.tar.xz) = 438300 +TIMESTAMP = 1579292379 +SHA256 (zanshin-0.5.71.tar.xz) = b0933d2d9a63bba372966da0ba9e313b85ab2d6aa513a43657da90c65a33612c +SIZE (zanshin-0.5.71.tar.xz) = 307872 diff --git a/deskutils/zanshin/files/patch-CMakeLists.txt b/deskutils/zanshin/files/patch-CMakeLists.txt deleted file mode 100644 index d28c420e8884..000000000000 --- a/deskutils/zanshin/files/patch-CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -Description: KDEPIM 19.08 does not add AkonadiContacts indirectly - previous versions add the depdendency to AkonadiContacts indirectly, - and we didn't need to search for AkonadiContact on our own. That chagned with - 19.08. Upstream has refactored a lot of code, so this depdendency isn't - needed anymore. -Author: Hefee -Origin: debian -Forwarded: not-needed -Last-Update: 2014-02-17 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -66,6 +66,7 @@ include_directories ( - ) - - find_package(KF5 REQUIRED COMPONENTS -+ AkonadiContact - AkonadiCalendar - AkonadiNotes - AkonadiSearch diff --git a/deskutils/zanshin/files/patch-git-0d1e500a88998e3419b3605ddc6435f5be22b056 b/deskutils/zanshin/files/patch-git-0d1e500a88998e3419b3605ddc6435f5be22b056 deleted file mode 100644 index edecd41eef36..000000000000 --- a/deskutils/zanshin/files/patch-git-0d1e500a88998e3419b3605ddc6435f5be22b056 +++ /dev/null @@ -1,37 +0,0 @@ -From 0d1e500a88998e3419b3605ddc6435f5be22b056 Mon Sep 17 00:00:00 2001 -From: Harald Sitter -Date: Mon, 12 Mar 2018 14:31:59 +0100 -Subject: [PATCH] don't set a zanshin screenshot for renku - -Summary: -I also couldn't find a screenshot of renku, so kill the screenshot -definition entirely in the absence of one. - -Reviewers: ervin - -Reviewed By: ervin - -Differential Revision: https://phabricator.kde.org/D11264 ---- - src/renku/app/org.kde.renku.appdata.xml | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/renku/app/org.kde.renku.appdata.xml b/src/renku/app/org.kde.renku.appdata.xml -index 82479cee..e1f1062e 100644 ---- src/renku/app/org.kde.renku.appdata.xml -+++ src/renku/app/org.kde.renku.appdata.xml -@@ -150,11 +150,6 @@ - - http://zanshin.kde.org - https://bugs.kde.org/enter_bug.cgi?format=guided&product=zanshin -- -- -- http://kde.org/images/screenshots/zanshin.png -- -- - KDE - - renku --- -2.19.1 - diff --git a/deskutils/zanshin/files/patch-git-0d3760b646d15e66f43a6a48546eae11cbf84497 b/deskutils/zanshin/files/patch-git-0d3760b646d15e66f43a6a48546eae11cbf84497 deleted file mode 100644 index 0db063b17aff..000000000000 --- a/deskutils/zanshin/files/patch-git-0d3760b646d15e66f43a6a48546eae11cbf84497 +++ /dev/null @@ -1,103 +0,0 @@ -From 0d3760b646d15e66f43a6a48546eae11cbf84497 Mon Sep 17 00:00:00 2001 -From: Kevin Ottens -Date: Sun, 25 Aug 2019 15:38:49 +0200 -Subject: [PATCH] Make it build both with pre and post 19.08.0 KCalCore - -Summary: -Obviously this assumes a compiler supporting __has_include in C++14 -mode, but that should be the case in most target platforms nowadays. -Beside this is hopefully temporary measure. - -Reviewers: dfaure - -Differential Revision: https://phabricator.kde.org/D23443 ---- - src/akonadi/akonadiserializer.cpp | 4 ++++ - tests/units/akonadi/akonadiserializertest.cpp | 4 ++++ - 2 files changed, 8 insertions(+) - ---- src/akonadi/akonadiserializer.cpp -+++ src/akonadi/akonadiserializer.cpp -@@ -30,7 +30,11 @@ - #include - #include - #include -+#if __has_include() - #include -+#else -+#include -+#endif - #include - #include - #if KCALCORE_VERSION < QT_VERSION_CHECK(5, 6, 80) ---- tests/units/akonadi/akonadiserializertest.cpp -+++ tests/units/akonadi/akonadiserializertest.cpp -@@ -34,7 +34,11 @@ - #include - #include - #include -+#if __has_include() - #include -+#else -+#include -+#endif - #include - - Q_DECLARE_METATYPE(Akonadi::Item*) ---- tests/benchmarks/serializerTest.cpp -+++ tests/benchmarks/serializerTest.cpp -@@ -24,7 +24,11 @@ - #include - #include - #include -+#if __has_include() - #include -+#else -+#include -+#endif - #include "domain/task.h" - #include "akonadi/akonadiserializer.h" - ---- tests/testlib/akonadistoragetestbase.cpp -+++ tests/testlib/akonadistoragetestbase.cpp -@@ -31,7 +31,11 @@ - - #include - #include -+#if __has_include() - #include -+#else -+#include -+#endif - #if KCALCORE_VERSION < QT_VERSION_CHECK(5, 6, 80) - #include - #endif ---- tests/testlib/gentodo.cpp -+++ tests/testlib/gentodo.cpp -@@ -25,7 +25,11 @@ - - #include - #include -+#if __has_include() - #include -+#else -+#include -+#endif - #if KCALCORE_VERSION < QT_VERSION_CHECK(5, 6, 80) - #include - #endif ---- tests/units/testlib/gentodotest.cpp -+++ tests/units/testlib/gentodotest.cpp -@@ -24,8 +24,11 @@ - #include "testlib/gentodo.h" - - #include -+#if __has_include() - #include -- -+#else -+#include -+#endif - #include - - using namespace Testlib; diff --git a/deskutils/zanshin/files/patch-git-3d73d1733190245c23b921c0da11aac0d783345d b/deskutils/zanshin/files/patch-git-3d73d1733190245c23b921c0da11aac0d783345d deleted file mode 100644 index 82a6c11a0cb8..000000000000 --- a/deskutils/zanshin/files/patch-git-3d73d1733190245c23b921c0da11aac0d783345d +++ /dev/null @@ -1,162 +0,0 @@ -From 3d73d1733190245c23b921c0da11aac0d783345d Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Sat, 27 Jul 2019 19:31:42 +0200 -Subject: [PATCH] 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(+) - ---- src/akonadi/akonadiserializer.cpp -+++ src/akonadi/akonadiserializer.cpp -@@ -243,6 +243,19 @@ void Serializer::updateTaskFromItem(Doma - attachments.reserve(attachmentsInput.size()); - std::transform(attachmentsInput.cbegin(), attachmentsInput.cend(), - std::back_inserter(attachments), -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90) -+ [&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()) -@@ -254,6 +267,7 @@ void Serializer::updateTaskFromItem(Doma - attachment.setIconName(mimeDb.mimeTypeForName(attach->mimeType()).iconName()); - return attachment; - }); -+#endif - task->setAttachments(attachments); - - if (todo->attendeeCount() > 0) { -@@ -328,6 +342,15 @@ Akonadi::Item Serializer::createItemFrom - } - - for (const auto &attachment : task->attachments()) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90) -+ 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()); -@@ -335,6 +358,7 @@ Akonadi::Item Serializer::createItemFrom - attach->setDecodedData(attachment.data()); - attach->setMimeType(attachment.mimeType()); - attach->setLabel(attachment.label()); -+#endif - todo->addAttachment(attach); - } - ---- tests/units/akonadi/akonadiserializertest.cpp -+++ tests/units/akonadi/akonadiserializertest.cpp -@@ -574,10 +574,17 @@ private slots: - setTodoDates(todo, startDate, dueDate); - todo->setRelatedTo(QStringLiteral("my-uid")); - if (!delegateName.isEmpty() || !delegateEmail.isEmpty()) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90) -+ KCalCore::Attendee attendee(delegateName, -+ delegateEmail, -+ true, -+ KCalCore::Attendee::Accepted); -+#else - KCalCore::Attendee::Ptr attendee(new KCalCore::Attendee(delegateName, - delegateEmail, - true, - KCalCore::Attendee::Accepted)); -+#endif - todo->addAttendee(attendee); - } - -@@ -700,10 +707,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, 90) -+ 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... -@@ -762,6 +776,15 @@ private slots: - updatedTodo->recurrence()->setDaily(1); - - for (int i = 0; i < updatedAttachmentData.size(); i++) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90) -+ 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)); -@@ -769,14 +792,22 @@ private slots: - attachment->setUri(updatedAttachmentUris.at(i)); - attachment->setMimeType(updatedAttachmentMimeTypes.at(i)); - attachment->setLabel(updatedAttachmentLabels.at(i)); -+#endif - updatedTodo->addAttachment(attachment); - } - - if (!updatedDelegateName.isEmpty() || !updatedDelegateEmail.isEmpty()) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90) -+ KCalCore::Attendee::Ptr updatedAttendee(updatedDelegateName, -+ updatedDelegateEmail, -+ true, -+ KCalCore::Attendee::Accepted); -+#else - KCalCore::Attendee::Ptr updatedAttendee(new KCalCore::Attendee(updatedDelegateName, - updatedDelegateEmail, - true, - KCalCore::Attendee::Accepted)); -+#endif - updatedTodo->addAttendee(updatedAttendee); - } - if (updatedRunning) { -@@ -1293,11 +1324,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, 90) -+ 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()) { diff --git a/deskutils/zanshin/files/patch-git-b41538f15c792e2106d6ce266568f9aae12e09c5 b/deskutils/zanshin/files/patch-git-b41538f15c792e2106d6ce266568f9aae12e09c5 deleted file mode 100644 index d4d8d1bf1ba9..000000000000 --- a/deskutils/zanshin/files/patch-git-b41538f15c792e2106d6ce266568f9aae12e09c5 +++ /dev/null @@ -1,30 +0,0 @@ -From b41538f15c792e2106d6ce266568f9aae12e09c5 Mon Sep 17 00:00:00 2001 -From: Harald Sitter -Date: Fri, 9 Mar 2018 17:18:01 +0100 -Subject: [PATCH] fix appdata to use new (working) screenshot location - -Reviewers: ervin - -Reviewed By: ervin - -Differential Revision: https://phabricator.kde.org/D11178 ---- - src/zanshin/app/org.kde.zanshin.appdata.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/zanshin/app/org.kde.zanshin.appdata.xml b/src/zanshin/app/org.kde.zanshin.appdata.xml -index 9273ed36..c2b8cfa1 100644 ---- src/zanshin/app/org.kde.zanshin.appdata.xml -+++ src/zanshin/app/org.kde.zanshin.appdata.xml -@@ -157,7 +157,7 @@ - https://bugs.kde.org/enter_bug.cgi?format=guided&product=zanshin - - -- http://kde.org/images/screenshots/zanshin.png -+ https://cdn.kde.org/screenshots/zanshin/zanshin.png - - - KDE --- -2.19.1 - diff --git a/deskutils/zanshin/files/patch-src_akonadi_akonadiserializer.cpp b/deskutils/zanshin/files/patch-src_akonadi_akonadiserializer.cpp deleted file mode 100644 index f3bae2378353..000000000000 --- a/deskutils/zanshin/files/patch-src_akonadi_akonadiserializer.cpp +++ /dev/null @@ -1,56 +0,0 @@ -Description: KCalendarCore 19.08 API changes. - There is no KCalCore::Attendee::Ptr anymore instead the API returns - KCalCore::Attendee items. Like done in - upstream_Make-it-build-both-with-pre-and-post-19.08.0-KCalCor.patch - make it possible to build with a wide range of KCalCore versions. - This is not needed to get upstream as master has removed this part of code. -Author: Hefee -Origin: debian -Forwarded: not-needed -Last-Update: 2014-02-17 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- src/akonadi/akonadiserializer.cpp -+++ src/akonadi/akonadiserializer.cpp -@@ -272,6 +272,15 @@ void Serializer::updateTaskFromItem(Doma - - if (todo->attendeeCount() > 0) { - const auto attendees = todo->attendees(); -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90) -+ const auto delegate = std::find_if(attendees.begin(), attendees.end(), -+ [] (const KCalCore::Attendee &attendee) { -+ return attendee.status() == KCalCore::Attendee::Accepted; -+ }); -+ if (delegate != attendees.end()) { -+ task->setDelegate(Domain::Task::Delegate((*delegate).name(), (*delegate).email())); -+ } -+#else - const auto delegate = std::find_if(attendees.begin(), attendees.end(), - [] (const KCalCore::Attendee::Ptr &attendee) { - return attendee->status() == KCalCore::Attendee::Accepted; -@@ -279,6 +288,7 @@ void Serializer::updateTaskFromItem(Doma - if (delegate != attendees.end()) { - task->setDelegate(Domain::Task::Delegate((*delegate)->name(), (*delegate)->email())); - } -+#endif - } - } - -@@ -363,10 +373,17 @@ Akonadi::Item Serializer::createItemFrom - } - - if (task->delegate().isValid()) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90) -+ KCalCore::Attendee attendee(task->delegate().name(), -+ task->delegate().email(), -+ true, -+ KCalCore::Attendee::Accepted); -+#else - KCalCore::Attendee::Ptr attendee(new KCalCore::Attendee(task->delegate().name(), - task->delegate().email(), - true, - KCalCore::Attendee::Accepted)); -+#endif - todo->addAttendee(attendee); - } - if (task->isRunning()) { diff --git a/deskutils/zanshin/pkg-plist b/deskutils/zanshin/pkg-plist index 9ef3b73ddddf..b5ac75edcf63 100644 --- a/deskutils/zanshin/pkg-plist +++ b/deskutils/zanshin/pkg-plist @@ -1,27 +1,18 @@ -bin/renku bin/zanshin bin/zanshin-migrator -%%QT_PLUGINDIR%%/kontact_renkuplugin.so %%QT_PLUGINDIR%%/kontact_zanshinplugin.so %%QT_PLUGINDIR%%/krunner_zanshin.so -%%QT_PLUGINDIR%%/renku_part.so %%QT_PLUGINDIR%%/zanshin_part.so -share/applications/org.kde.renku.desktop share/applications/org.kde.zanshin.desktop share/icons/hicolor/128x128/apps/zanshin.png share/icons/hicolor/256x256/apps/zanshin.png share/icons/hicolor/48x48/apps/zanshin.png share/icons/hicolor/64x64/apps/zanshin.png share/icons/hicolor/scalable/apps/zanshin.svgz -share/kservices5/kontact/renku_plugin.desktop share/kservices5/kontact/zanshin_plugin.desktop share/kservices5/plasma-runner-zanshin.desktop -share/kservices5/renku_part.desktop share/kservices5/zanshin_part.desktop -share/kxmlgui5/renku/renku_part.rc -share/kxmlgui5/renku/renkuui.rc share/kxmlgui5/zanshin/zanshin_part.rc -share/locale/ast/LC_MESSAGES/zanshin.mo share/locale/bs/LC_MESSAGES/zanshin.mo share/locale/ca/LC_MESSAGES/zanshin.mo share/locale/ca@valencia/LC_MESSAGES/zanshin.mo @@ -37,7 +28,7 @@ share/locale/ga/LC_MESSAGES/zanshin.mo share/locale/gl/LC_MESSAGES/zanshin.mo share/locale/hu/LC_MESSAGES/zanshin.mo share/locale/it/LC_MESSAGES/zanshin.mo -share/locale/ja/LC_MESSAGES/zanshin.mo +share/locale/ko/LC_MESSAGES/zanshin.mo share/locale/lt/LC_MESSAGES/zanshin.mo share/locale/mr/LC_MESSAGES/zanshin.mo share/locale/nb/LC_MESSAGES/zanshin.mo @@ -54,6 +45,4 @@ share/locale/tr/LC_MESSAGES/zanshin.mo share/locale/ug/LC_MESSAGES/zanshin.mo share/locale/uk/LC_MESSAGES/zanshin.mo share/locale/zh_CN/LC_MESSAGES/zanshin.mo -share/locale/zh_TW/LC_MESSAGES/zanshin.mo -share/metainfo/org.kde.renku.appdata.xml share/metainfo/org.kde.zanshin.appdata.xml