Date: Monday, July 19, 2021 @ 08:30:23 Author: arojas Revision: 978598
Update to 0.9.0 Modified: kube/trunk/PKGBUILD Deleted: kube/trunk/kube-kcalcore-19.08.patch ---------------------------+ PKGBUILD | 30 +++++--------- kube-kcalcore-19.08.patch | 93 -------------------------------------------- 2 files changed, 12 insertions(+), 111 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-07-19 08:29:50 UTC (rev 978597) +++ PKGBUILD 2021-07-19 08:30:23 UTC (rev 978598) @@ -1,35 +1,29 @@ # Maintainer: Antonio Rojas <[email protected]> pkgname=kube -pkgver=0.8.0 -pkgrel=2 -pkgdesc="A modern groupware client based on QtQuick and Sink" +pkgver=0.9.0 +pkgrel=1 +pkgdesc='A modern groupware client based on QtQuick and Sink' arch=(x86_64) -url="https://kube.kde.org/"; +url='https://kube.kde.org/' 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"; - kube-kcalcore-19.08.patch) -sha256sums=('2961acf94d528cbf1650cc420add12d5ec2c684d9232043c9d6d2d55b9d39782' - '329a9630159e8288b2a58044c45e831bfe768311e1cff8667778f31e4bf8a152') +makedepends=(extra-cmake-modules sonnet) +#source=(https://download.kde.org/unstable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz) +source=(https://invent.kde.org/pim/$pkgname/-/archive/v$pkgver/$pkgname-v$pkgver.tar.gz) +sha256sums=('75e6c0d1b04328eb2ada0ceea656753aa1a94361b94feaf81003733470400a63') prepare() { - mkdir -p build - - cd $pkgname-$pkgver - patch -p1 -i ../kube-kcalcore-19.08.patch # Fix build with kcalcore 19.08 + sed -e 's|CMAKE_CXX_STANDARD 20|CMAKE_CXX_STANDARD 17|' -i $pkgname-v$pkgver/CMakeLists.txt # Fix build find . -name CMakeLists.txt | xargs sed -e '/tests/d' -i # Don't build tests } build() { - cd build - cmake ../$pkgname-$pkgver \ + cmake -B build -S $pkgname-v$pkgver \ -DBUILD_TESTING=OFF - make + VERBOSE=1 cmake --build build } package() { - cd build - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" cmake --install build } Deleted: kube-kcalcore-19.08.patch =================================================================== --- kube-kcalcore-19.08.patch 2021-07-19 08:29:50 UTC (rev 978597) +++ kube-kcalcore-19.08.patch 2021-07-19 08:30:23 UTC (rev 978598) @@ -1,93 +0,0 @@ -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) {
