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

[Antonio Rojas]

    Date: Saturday, August 24, 2019 @ 17:35:19
  Author: arojas
Revision: 501515

Update to a git snapshot for kcalcore 19.08 compatibility

Added:
  zanshin/trunk/zanshin-akonadi-contacts.patch
  zanshin/trunk/zanshin-kcalcore-19.08.patch
Modified:
  zanshin/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   19 ++++++-----
 zanshin-akonadi-contacts.patch |   25 ++++++++++++++
 zanshin-kcalcore-19.08.patch   |   67 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 104 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-24 17:20:01 UTC (rev 501514)
+++ PKGBUILD	2019-08-24 17:35:19 UTC (rev 501515)
@@ -1,19 +1,25 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=zanshin
-pkgver=0.5.0
+pkgver=0.5.0+179+g074d2c34
 pkgrel=1
+_commit=074d2c34883a7136ce07138dd0de62a370936f9e
 pkgdesc="To-do management application based on Akonadi"
 arch=(x86_64)
 url="https://zanshin.kde.org"
 license=(GPL)
 depends=(kdepim-runtime kontactinterface)
-makedepends=(extra-cmake-modules kdoctools boost krunner kdesignerplugin)
-source=("https://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('0781c088741186f3d9ff3027dc961103d33a59b0e3aeb6bc4c66ff24eb3adb4f'
-            'SKIP')
+makedepends=(extra-cmake-modules kdoctools boost krunner kdesignerplugin kdelibs4support git)
+#source=("https://download.kde.org/stable/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
+source=(git://git.kde.org/zanshin.git#commit=$_commit)
+sha256sums=('SKIP')
 validpgpkeys=(17166A5275C5FA6F1A48FD78074BBBCB8DECC9E2) # Kevin Ottens <ervin+bluesystems at kde.org>
 
+pkgver() {
+  cd $pkgname
+  git describe --tags | sed -e 's/-/+/g' -e 's/v//'
+}
+
 prepare() {
   mkdir -p build
 }
@@ -20,8 +26,7 @@
 
 build() {
   cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
+  cmake ../$pkgname \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DBUILD_TESTING=OFF
   make

Added: zanshin-akonadi-contacts.patch
===================================================================
--- zanshin-akonadi-contacts.patch	                        (rev 0)
+++ zanshin-akonadi-contacts.patch	2019-08-24 17:35:19 UTC (rev 501515)
@@ -0,0 +1,25 @@
+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
+

Added: zanshin-kcalcore-19.08.patch
===================================================================
--- zanshin-kcalcore-19.08.patch	                        (rev 0)
+++ zanshin-kcalcore-19.08.patch	2019-08-24 17:35:19 UTC (rev 501515)
@@ -0,0 +1,67 @@
+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));