[arch-commits] Commit in kube/trunk (PKGBUILD kube-kcalcore-19.08.patch)

[Antonio Rojas]

    Date: Wednesday, October 2, 2019 @ 09:26:48
  Author: arojas
Revision: 512409

Update to 0.8.0

Added:
  kube/trunk/kube-kcalcore-19.08.patch
Modified:
  kube/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   14 ++++--
 kube-kcalcore-19.08.patch |   93 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 102 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-02 02:37:17 UTC (rev 512408)
+++ PKGBUILD	2019-10-02 09:26:48 UTC (rev 512409)
@@ -1,8 +1,8 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=kube
-pkgver=0.7.0
-pkgrel=5
+pkgver=0.8.0
+pkgrel=1
 pkgdesc="A modern groupware client based on QtQuick and Sink"
 arch=(x86_64)
 url="https://kube.kde.org/"
@@ -9,13 +9,17 @@
 license=(LGPL)
 depends=(sink gpgme qt5-quickcontrols2 qt5-webengine qt5-quickcontrols)
 makedepends=(extra-cmake-modules)
-source=("https://download.kde.org/unstable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz")
-sha256sums=('6f3dc84548dcf3e432a592e44717132a282d107d32c82560a2c5495c678a874f')
+source=("https://download.kde.org/unstable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz"
+        kube-kcalcore-19.08.patch)
+sha256sums=('2961acf94d528cbf1650cc420add12d5ec2c684d9232043c9d6d2d55b9d39782'
+            '329a9630159e8288b2a58044c45e831bfe768311e1cff8667778f31e4bf8a152')
 
 prepare() {
   mkdir -p build
 
-  sed -e '/KDECompilerSettings/d' -i $pkgname-$pkgver/CMakeLists.txt # Don't enforce c++11
+  cd $pkgname-$pkgver
+  patch -p1 -i ../kube-kcalcore-19.08.patch # Fix build with kcalcore 19.08
+  find . -name CMakeLists.txt | xargs sed -e '/tests/d' -i # Don't build tests
 }
 
 build() {

Added: kube-kcalcore-19.08.patch
===================================================================
--- kube-kcalcore-19.08.patch	                        (rev 0)
+++ kube-kcalcore-19.08.patch	2019-10-02 09:26:48 UTC (rev 512409)
@@ -0,0 +1,93 @@
+diff --git a/framework/src/domain/eventcontroller.cpp b/framework/src/domain/eventcontroller.cpp
+index d2885c43..d5cf2b9a 100644
+--- a/framework/src/domain/eventcontroller.cpp
++++ b/framework/src/domain/eventcontroller.cpp
+@@ -54,28 +54,28 @@ static std::pair<QStringList, QStringList> getRecipients(const QString &organize
+     QStringList to;
+     QStringList cc;
+     for (const auto &a : attendees) {
+-        const auto email = a->email();
++        const auto email = a.email();
+         if (email.isEmpty()) {
+-            SinkTrace() << "Attendee has no email: " << a->fullName();
++            SinkTrace() << "Attendee has no email: " << a.fullName();
+             continue;
+         }
+ 
+         //Don't send ourselves an email if part of attendees
+         if (organizerEmail == email ) {
+-            SinkTrace() << "This is us: " << a->fullName();
++            SinkTrace() << "This is us: " << a.fullName();
+             continue;
+         }
+ 
+         //No updates if the attendee has already declined
+-        if (a->status() == KCalCore::Attendee::Declined) {
+-            SinkTrace() << "Already declined: " << a->fullName();
++        if (a.status() == KCalCore::Attendee::Declined) {
++            SinkTrace() << "Already declined: " << a.fullName();
+             continue;
+         }
+ 
+-        const auto prettyAddress = assembleEmailAddress(a->name(), email);
++        const auto prettyAddress = assembleEmailAddress(a.name(), email);
+ 
+-        if (a->role() == KCalCore::Attendee::OptParticipant ||
+-            a->role() == KCalCore::Attendee::NonParticipant) {
++        if (a.role() == KCalCore::Attendee::OptParticipant ||
++            a.role() == KCalCore::Attendee::NonParticipant) {
+             cc << prettyAddress;
+         } else {
+             to << prettyAddress;
+@@ -99,7 +99,7 @@ QString EventController::eventToBody(const KCalCore::Event &event)
+     body.append(QObject::tr("Attendees:"));
+     body.append("\n");
+     for (const auto &attendee : event.attendees()) {
+-        body.append("  " + attendee->fullName());
++        body.append("  " + attendee.fullName());
+     }
+     return body;
+ }
+@@ -325,9 +325,9 @@ void EventController::populateFromEvent(const KCalCore::Event &event)
+     setAllDay(event.allDay());
+     setOurEvent(true);
+ 
+-    setOrganizer(event.organizer()->fullName());
++    setOrganizer(event.organizer().fullName());
+     for (const auto &attendee : event.attendees()) {
+-        attendeesController()->add({{"name", attendee->fullName()}, {"email", attendee->email()}, {"status", toStatus(attendee->status())}});
++        attendeesController()->add({{"name", attendee.fullName()}, {"email", attendee.email()}, {"status", toStatus(attendee.status())}});
+     }
+ }
+ 
+@@ -348,7 +348,7 @@ void EventController::saveToEvent(KCalCore::Event &event)
+         KCalCore::Attendee::PartStat status = fromStatus(map["status"].value<ParticipantStatus>());
+         KCalCore::Attendee::Role role = KCalCore::Attendee::ReqParticipant;
+         const auto [name, email] = parseEmailAddress(map["name"].toString());
+-        event.addAttendee(KCalCore::Attendee::Ptr::create(name, email, rsvp, status, role, QString{}));
++        event.addAttendee(KCalCore::Attendee(name, email, rsvp, status, role, QString{}));
+     });
+ }
+ 
+diff --git a/framework/src/domain/invitationcontroller.cpp b/framework/src/domain/invitationcontroller.cpp
+index 735f0af8..98cdc8dc 100644
+--- a/framework/src/domain/invitationcontroller.cpp
++++ b/framework/src/domain/invitationcontroller.cpp
+@@ -113,7 +113,7 @@ void InvitationController::loadICal(const QString &ical)
+ 
+ static void sendIMipReply(const QByteArray &accountId, const QString &from, const QString &fromName, KCalCore::Event::Ptr event, KCalCore::Attendee::PartStat status)
+ {
+-    const auto organizerEmail = event->organizer()->fullName();
++    const auto organizerEmail = event->organizer().fullName();
+ 
+     if (organizerEmail.isEmpty()) {
+         SinkWarning() << "Failed to find the organizer to send the reply to " << organizerEmail;
+@@ -122,7 +122,7 @@ static void sendIMipReply(const QByteArray &accountId, const QString &from, cons
+ 
+     auto reply = KCalCore::Event::Ptr::create(*event);
+     reply->clearAttendees();
+-    reply->addAttendee(KCalCore::Attendee::Ptr::create(fromName, from, false, status));
++    reply->addAttendee(KCalCore::Attendee(fromName, from, false, status));
+ 
+     QString body;
+     if (status == KCalCore::Attendee::Accepted) {