[arch-commits] Commit in zanshin/trunk (2 files)

Antonio Rojas arojas at archlinux.org
Sat Aug 24 17:35:30 UTC 2019


    Date: Saturday, August 24, 2019 @ 17:35:30
  Author: arojas
Revision: 501516

Drop unused patches

Deleted:
  zanshin/trunk/zanshin-akonadi-contacts.patch
  zanshin/trunk/zanshin-kcalcore-19.08.patch

--------------------------------+
 zanshin-akonadi-contacts.patch |   25 --------------
 zanshin-kcalcore-19.08.patch   |   67 ---------------------------------------
 2 files changed, 92 deletions(-)

Deleted: zanshin-akonadi-contacts.patch
===================================================================
--- zanshin-akonadi-contacts.patch	2019-08-24 17:35:19 UTC (rev 501515)
+++ zanshin-akonadi-contacts.patch	2019-08-24 17:35:30 UTC (rev 501516)
@@ -1,25 +0,0 @@
-From 87e98e6b0aa704558009574eed8d8bdf2bfa0fbb Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm at gentoo.org>
-Date: Sat, 22 Jun 2019 12:47:28 +0200
-Subject: [PATCH] Add missing KF5 dependency (fix broken cmake against >=19.04)
-
-Signed-off-by: Andreas Sturmlechner <asturm at gentoo.org>
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a6191f54..960fc6c7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -67,6 +67,7 @@ include_directories (
- 
- find_package(KF5 REQUIRED COMPONENTS
-     AkonadiCalendar
-+    AkonadiContact
-     AkonadiNotes
-     AkonadiSearch
-     IdentityManagement
--- 
-2.22.0
-

Deleted: zanshin-kcalcore-19.08.patch
===================================================================
--- zanshin-kcalcore-19.08.patch	2019-08-24 17:35:19 UTC (rev 501515)
+++ zanshin-kcalcore-19.08.patch	2019-08-24 17:35:30 UTC (rev 501516)
@@ -1,67 +0,0 @@
-diff --git a/src/akonadi/akonadiserializer.cpp b/src/akonadi/akonadiserializer.cpp
-index ee4d1ff9..61eff278 100644
---- a/src/akonadi/akonadiserializer.cpp
-+++ b/src/akonadi/akonadiserializer.cpp
-@@ -239,15 +239,15 @@ void Serializer::updateTaskFromItem(Domain::Task::Ptr task, Item item)
-     attachments.reserve(attachmentsInput.size());
-     std::transform(attachmentsInput.cbegin(), attachmentsInput.cend(),
-                    std::back_inserter(attachments),
--                   [&mimeDb] (const KCalCore::Attachment::Ptr &attach) {
-+                   [&mimeDb] (const KCalCore::Attachment attach) {
-                        Domain::Task::Attachment attachment;
--                       if (attach->isUri())
--                           attachment.setUri(QUrl(attach->uri()));
-+                       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());
-+                           attachment.setData(attach.decodedData());
-+                       attachment.setLabel(attach.label());
-+                       attachment.setMimeType(attach.mimeType());
-+                       attachment.setIconName(mimeDb.mimeTypeForName(attach.mimeType()).iconName());
-                        return attachment;
-                    });
-     task->setAttachments(attachments);
-@@ -255,11 +255,11 @@ void Serializer::updateTaskFromItem(Domain::Task::Ptr task, Item item)
-     if (todo->attendeeCount() > 0) {
-         const auto attendees = todo->attendees();
-         const auto delegate = std::find_if(attendees.begin(), attendees.end(),
--                                           [] (const KCalCore::Attendee::Ptr &attendee) {
--                                               return attendee->status() == KCalCore::Attendee::Accepted;
-+                                           [] (const KCalCore::Attendee attendee) {
-+                                               return attendee.status() == KCalCore::Attendee::Accepted;
-                                            });
-         if (delegate != attendees.end()) {
--            task->setDelegate(Domain::Task::Delegate((*delegate)->name(), (*delegate)->email()));
-+            task->setDelegate(Domain::Task::Delegate((*delegate).name(), (*delegate).email()));
-         }
-     }
- }
-@@ -324,18 +324,18 @@ Akonadi::Item Serializer::createItemFromTask(Domain::Task::Ptr task)
-     }
- 
-     for (const auto &attachment : task->attachments()) {
--        KCalCore::Attachment::Ptr attach(new KCalCore::Attachment(QByteArray()));
-+        KCalCore::Attachment attach(QByteArray{});
-         if (attachment.isUri())
--            attach->setUri(attachment.uri().toString());
-+            attach.setUri(attachment.uri().toString());
-         else
--            attach->setDecodedData(attachment.data());
--        attach->setMimeType(attachment.mimeType());
--        attach->setLabel(attachment.label());
-+            attach.setDecodedData(attachment.data());
-+        attach.setMimeType(attachment.mimeType());
-+        attach.setLabel(attachment.label());
-         todo->addAttachment(attach);
-     }
- 
-     if (task->delegate().isValid()) {
--        KCalCore::Attendee::Ptr attendee(new KCalCore::Attendee(task->delegate().name(),
-+        KCalCore::Attendee attendee(new KCalCore::Attendee(task->delegate().name(),
-                                                                 task->delegate().email(),
-                                                                 true,
-                                                                 KCalCore::Attendee::Accepted));


More information about the arch-commits mailing list