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

Antonio Rojas arojas at archlinux.org
Sat Aug 24 16:34:14 UTC 2019


    Date: Saturday, August 24, 2019 @ 16:34:13
  Author: arojas
Revision: 360878

kcalcore and kcontacts 19.08 rebuild

Added:
  calligra-plan/trunk/calligra-plan-kcalcore-19.08-b.patch
  calligra-plan/trunk/calligra-plan-kcalcore-19.08-c.patch
Modified:
  calligra-plan/trunk/PKGBUILD

--------------------------------------+
 PKGBUILD                             |   25 +++++++--
 calligra-plan-kcalcore-19.08-b.patch |   85 +++++++++++++++++++++++++++++++++
 calligra-plan-kcalcore-19.08-c.patch |   33 ++++++++++++
 3 files changed, 138 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-24 16:14:32 UTC (rev 360877)
+++ PKGBUILD	2019-08-24 16:34:13 UTC (rev 360878)
@@ -3,7 +3,7 @@
 pkgname=calligra-plan
 pkgdesc="A project management application intended for managing moderately large projects with multiple resources"
 pkgver=3.1.0
-pkgrel=1
+pkgrel=2
 arch=(x86_64)
 url='https://www.calligra-suite.org/'
 license=(FDL1.2 GPL2 LGPL)
@@ -10,21 +10,36 @@
 depends=(kinit kcmutils akonadi-contacts kdiagram kactivities kholidays kcalcore khtml)
 makedepends=(extra-cmake-modules kdoctools boost)
 conflicts=('calligra<3.1.0')
-source=("https://download.kde.org/stable/calligra/$pkgver/calligraplan-$pkgver.tar.xz"{,.sig})
+source=("https://download.kde.org/stable/calligra/$pkgver/calligraplan-$pkgver.tar.xz"{,.sig}
+        calligra-plan-qt-5.11.patch::"https://cgit.kde.org/calligraplan.git/patch/?id=334cc8cb"
+        calligra-plan-kcalcore-19.08-a.patch::"https://cgit.kde.org/calligraplan.git/patch/src?id=3a01affd"
+        calligra-plan-kcalcore-19.08-b.patch
+        calligra-plan-kcalcore-19.08-c.patch
+        calligra-plan-kf5.61.patch::"https://cgit.kde.org/calligraplan.git/patch/?id=fe36bf6f")
 sha256sums=('59f985bae0482789c13c9440af3bf5da0a1d04756c1c1ccf39f68f66cd3e7ddd'
-            'SKIP')
+            'SKIP'
+            'a0b313914e8e6d6e0e66acf59dd1655886282f91fc19e959159f526002fb9a8c'
+            'bb4595a782694ed808c59436cebe249472ebd8c9915c7687531804baf3dc7ccb'
+            '6038e79e3f94bd4ab628566fc475b73da89e63f7d3b0c1e85cffdb771861b5bf'
+            '87925afc3c3b7b8a77a8cab5a712e192a92902b2d70914e55eeb27741cfc872a'
+            'b99ed215c917d1daff06f9e06e583c4f369f7912f48ae61bf26a4384be470caf')
 validpgpkeys=(05D00A8B73A686789E0A156858B9596C722EA3BD  # Boudewijn Rempt <foundation at krita.org>
               42A60D06F449E895F40F09C01638B8A616108B8A) # Dag Andersen <danders at get2net.dk>
 
 prepare() {
   mkdir -p build
+
+  cd calligraplan-$pkgver
+  patch -p1 -i ../calligra-plan-qt-5.11.patch # Fix build with Qt 5.11
+  patch -p1 -i ../calligra-plan-kcalcore-19.08-a.patch # Fix build with kcalcore 19.08
+  patch -p1 -i ../calligra-plan-kcalcore-19.08-b.patch
+  patch -p1 -i ../calligra-plan-kcalcore-19.08-c.patch
+  patch -p1 -i ../calligra-plan-kf5.61.patch # Fix build with Frameworks 5.61
 }
 
 build() {
   cd build
   cmake ../calligraplan-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DBUILD_TESTING=OFF
   make

Added: calligra-plan-kcalcore-19.08-b.patch
===================================================================
--- calligra-plan-kcalcore-19.08-b.patch	                        (rev 0)
+++ calligra-plan-kcalcore-19.08-b.patch	2019-08-24 16:34:13 UTC (rev 360878)
@@ -0,0 +1,85 @@
+From a9eaf1c98ed408fd6e8897fa9e2f99ed17db1ebc Mon Sep 17 00:00:00 2001
+From: David Faure <faure at kde.org>
+Date: Tue, 23 Jul 2019 12:26:17 +0200
+Subject: Port to KCalCore API changes
+
+The code is in #if 0, but I tested compilation of this in the calligra
+stable branch:
+https://commits.kde.org/calligra/2d484fda1b31a72659088a4bfce5c3708e923cb0
+
+So you can use KCalCore again if you want :-)
+It's turning into a KF5 framework so the API will be stable from now on.
+
+CCMAIL: danders at get2net.dk
+---
+ .../filters/icalendar/export/icalendarexport.cpp     | 20 +++++++++++++++++---
+ 1 file changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/src/plugins/filters/icalendar/export/icalendarexport.cpp b/src/plugins/filters/icalendar/export/icalendarexport.cpp
+index b21320f..828b641 100644
+--- a/src/plugins/filters/icalendar/export/icalendarexport.cpp
++++ b/src/plugins/filters/icalendar/export/icalendarexport.cpp
+@@ -35,6 +35,7 @@
+ #include <kcalcore/attachment.h>
+ #include <kcalcore/icalformat.h>
+ #include <kcalcore/memorycalendar.h>
++#include <kcalcore_version.h>
+ 
+ #include <QTextCodec>
+ #include <QByteArray>
+@@ -355,14 +356,15 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
+         todo->setOrganizer(node->projectNode()->leader());
+     }
+     if ( node->type() != Node::Type_Project && ! node->leader().isEmpty()) {
+-#if KCALCORE_HAVE_NO_PERSION_PTR
++#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90)
+         KCalCore::Person p = KCalCore::Person::fromFullName(node->leader());
+-        KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p.name(), p.email()));
++        KCalCore::Attendee a(p.name(), p.email());
++        a.setRole(KCalCore::Attendee::NonParticipant);
+ #else
+         KCalCore::Person::Ptr p = KCalCore::Person::fromFullName(node->leader());
+         KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p->name(), p->email()));
+-#endif
+         a->setRole(KCalCore::Attendee::NonParticipant);
++#endif
+         todo->addAttendee(a);
+     }
+     DateTime st = node->startTime(id);
+@@ -381,13 +383,21 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
+             const QList<Resource*> lst = task->requestedResources();
+             foreach(const Resource *r, lst) {
+                 if (r->type() == Resource::Type_Work) {
++#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90)
++                    todo->addAttendee(KCalCore::Attendee(r->name(), r->email()));
++#else
+                     todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email())));
++#endif
+                 }
+             }
+         } else {
+             foreach(const Resource *r, s->resources()) {
+                 if (r->type() == Resource::Type_Work) {
++#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90)
++                    todo->addAttendee(KCalCore::Attendee(r->name(), r->email()));
++#else
+                     todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email())));
++#endif
+                 }
+             }
+ 
+@@ -398,7 +408,11 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
+         todo->setPercentComplete(task->completion().percentFinished());
+     }
+     foreach(const Document *doc, node->documents().documents()) {
++#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90)
++        todo->addAttachment(KCalCore::Attachment(doc->url().url()));
++#else
+         todo->addAttachment(KCalCore::Attachment::Ptr(new KCalCore::Attachment(doc->url().url())));
++#endif
+     }
+     if (! parent.isNull()) {
+         todo->setRelatedTo(parent->uid(), KCalCore::Incidence::RelTypeParent);
+-- 
+cgit v1.1
+

Added: calligra-plan-kcalcore-19.08-c.patch
===================================================================
--- calligra-plan-kcalcore-19.08-c.patch	                        (rev 0)
+++ calligra-plan-kcalcore-19.08-c.patch	2019-08-24 16:34:13 UTC (rev 360878)
@@ -0,0 +1,33 @@
+From 2f5505cf03ff865349d06e1d5c39007c52e7cd10 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm at gentoo.org>
+Date: Fri, 16 Aug 2019 15:49:09 +0200
+Subject: [PATCH] Fix headers after kcalcore->kcalendercore rename happened
+
+---
+ .../filters/icalendar/export/icalendarexport.cpp       | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/plugins/filters/icalendar/export/icalendarexport.cpp b/src/plugins/filters/icalendar/export/icalendarexport.cpp
+index bb6b097d..729d6e50 100644
+--- a/src/plugins/filters/icalendar/export/icalendarexport.cpp
++++ b/src/plugins/filters/icalendar/export/icalendarexport.cpp
+@@ -31,11 +31,11 @@
+ #include <kptdocuments.h>
+ #include "kptdebug.h"
+ 
+-#include <kcalcore/attendee.h>
+-#include <kcalcore/attachment.h>
+-#include <kcalcore/icalformat.h>
+-#include <kcalcore/memorycalendar.h>
+-#include <kcalcore_version.h>
++#include <kcalendarcore/attendee.h>
++#include <kcalendarcore/attachment.h>
++#include <kcalendarcore/icalformat.h>
++#include <kcalendarcore/memorycalendar.h>
++#include <kcalendarcore_version.h>
+ 
+ #include <QTextCodec>
+ #include <QByteArray>
+-- 
+2.22.1
+


More information about the arch-commits mailing list