From fc637fb28da700da71ec2064d65ca5a7a31b9c6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Aug 2019 18:16:17 +0100 Subject: gentoo resync : 18.08.2019 --- app-office/calligraplan/Manifest | 8 +- .../calligraplan/calligraplan-3.1.0-r1.ebuild | 97 +++++++++++++++++++ .../calligraplan/calligraplan-3.1.0-r2.ebuild | 99 +++++++++++++++++++ app-office/calligraplan/calligraplan-3.1.0.ebuild | 105 --------------------- .../calligraplan-3.1.0-kcalcore-19.08-1.patch | 46 +++++++++ .../calligraplan-3.1.0-kcalcore-19.08-2.patch | 84 +++++++++++++++++ .../calligraplan-3.1.0-kcalcore-19.08-3.patch | 33 +++++++ .../files/calligraplan-3.1.0-missing-header.patch | 24 +++++ .../files/calligraplan-3.1.0-unused-deps.patch | 57 +++++++++++ 9 files changed, 447 insertions(+), 106 deletions(-) create mode 100644 app-office/calligraplan/calligraplan-3.1.0-r1.ebuild create mode 100644 app-office/calligraplan/calligraplan-3.1.0-r2.ebuild delete mode 100644 app-office/calligraplan/calligraplan-3.1.0.ebuild create mode 100644 app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch create mode 100644 app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-2.patch create mode 100644 app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-3.patch create mode 100644 app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch create mode 100644 app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch (limited to 'app-office/calligraplan') diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest index f4814633bfe0..89346bbdac64 100644 --- a/app-office/calligraplan/Manifest +++ b/app-office/calligraplan/Manifest @@ -1,5 +1,11 @@ +AUX calligraplan-3.1.0-kcalcore-19.08-1.patch 1917 BLAKE2B 83a31567dd6a36564b613eeb4f48d9e7c833fad0523ef4a86d25208a9ae7fa7636a6b3122ca56a260a23cbfc35c1ae94f17d5278dbdad9d7a217f715e21a0440 SHA512 e303aae1707230e2e57d0695bf28df141f22f70508861515e00989e747c80dc7ff8d8222150d44b2bcd2ee00242cdb29c5bc31ac322ca0501d71343c03f57783 +AUX calligraplan-3.1.0-kcalcore-19.08-2.patch 3664 BLAKE2B 1a631c4fa8e323868a291bc7356d8485171963f883540e88ca5da963d3aa0356e0edbcb4b932d9b1a3dc7f309d49e61a038db2be884feb5dcc23c9c0e30491f5 SHA512 146658f0cb82583171ff2cc700fce1ecf87ee4b4baf545904b65e4328f08ccb230004ed63a8ca952ffbfc177061bd3831b8272186f0887922aa3338c8a31f7e3 +AUX calligraplan-3.1.0-kcalcore-19.08-3.patch 1140 BLAKE2B fb7d3e4a4944e60c2222221d6d8e05fab71e02ff64596164642f252ecd66b53750ab7ffc29aa9743cedce0dd96fd6c7e0f95b2994934627a294a7eb55d78af39 SHA512 5c345ba7a81e0e84ff0bffc4e83a30784a67f8264680f056baf545b8713d69586e79e2b2610f103ff76565f2d53e962c1c13d1f27e6d6e38b7f4692e2233b263 +AUX calligraplan-3.1.0-missing-header.patch 629 BLAKE2B 8b6debd0dcaf51a492be0f17a7f35d184fe26ff9ff636329858526a9f42c00ac6e66f26fc2d4a94b7ce6878dd3a4176d891b38808119d964f5dd43ff6d639213 SHA512 fdf4511240bb89df0253b2e140209583edf769993fa2ed8c27580d72a062da877d51a2dd0bc3878c386c0bb1042ce4ec50eec5675702db99377ddafcece6311d AUX calligraplan-3.1.0-qca.patch 3725 BLAKE2B dfcc41d00c7c90691e6c9a8a8c25308ace7819c88282ed2f4a36725b9d26ce6ae7d1bf547ec01d097971302278bee914f23039bbf66e952ed1a5fedd84423bbc SHA512 df94f3348d824de566c0a6566f076ff2a25236030353907c828a0e1cde58768c6403e2d699c419e8ef05635e6af43cb3c7cb4780568c7bf8c9e6bdcf0086463c AUX calligraplan-3.1.0-qt-5.11.patch 3618 BLAKE2B b1b3053e07f83eb2b07a8fde231a7deb727a34e9922246e75690e469b8b599525eb8148a5babd5771e18421bed1930bc800fddcafca6ce43d08eab1093f2d135 SHA512 3db56dfc75c667ab141259718899e7294b000ddc10084266fa9d6226da4ccde74e70673ef5603b4dbc4f92322eb0fbaaf3b0ec6bca312603f4da95463414df10 +AUX calligraplan-3.1.0-unused-deps.patch 1594 BLAKE2B 9e24816c0a69eb725e0bda2718cc629399f5fe30491f08e69a1dc9f6ab86057ce9d832f873358953c3a68ec235ac69e06e56fb076c6bc70ed8871b38c0233d82 SHA512 2f59c6c5dda49e7f579b0a623a4fc2aabbb2fa896abd4bc3ab28267d3d04e26db318da7940830563289c2deddf9ce8ad9a08fc98b528dddc67d00656c49969b1 DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156 -EBUILD calligraplan-3.1.0.ebuild 2731 BLAKE2B db355ac83b4eb55c1167d832d8ac6ad56f43c5f376368769f58946b38cbf28d2d9a5af99d89a1bc4c1d772ab25edb8110fc828f2149e8e8a470b7ad0fd6ded83 SHA512 28731d480bb25d40f4cff2dcbbe96a291bafc4bf9a6cf90701c9dea43ad2c4b245f51c513d7087de813e8d3f15b72a6e14b5eecfe72f294b966bbbef740414f7 +EBUILD calligraplan-3.1.0-r1.ebuild 2583 BLAKE2B ae97f0026b07912dd74628d3f071f6233b3758e9c553d9eec00d236092fc35b1b18f7209e87ffeb6ab2edc9203a35390e06bc43daafbdddd6debed72cd9c081b SHA512 7d8624dfa0483ca08dee39c9c7691e553f5bcebc462e7152d711d9fa0da9ef8cb06bb7dbe21b3ddb61011248293b88dbf37b6553418d23a0f820291beabfd13d +EBUILD calligraplan-3.1.0-r2.ebuild 2659 BLAKE2B 36443a7a35d9ba45b6137a4c1408742812918c38e5ee0481f6aefd8b3af9462e7f1c5ecd715d8cbf33e52d12dec1b8b3dd64ee4ee8d7964a926115b06e6f2894 SHA512 2b3bb0dde3f010c66c2e6c2eba2ed358a02413e7375a811f9248d0dc14830848ff7ce20ff619b4ae35f12487821d470738b6212b2a687140574a8d1104c3c8b1 MISC metadata.xml 724 BLAKE2B dd7cca931c7ffc08be44c9df711973d13fadc3deee2956b235af3653aab250977cbb491ac308da5a5502efbd359114e646ae1cb10e3f445308b90b4eeab8a6dd SHA512 367dbf0d7d0a2d03167e4e7abec2975ada6d047dd767a60967532c1fb89db09f2082ff52c1940a306dbff4feec5c8050f163d2fff6170dbe287b241d3f7c1c02 diff --git a/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild b/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild new file mode 100644 index 000000000000..98cc37a75950 --- /dev/null +++ b/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +KDE_HANDBOOK="forceoptional" +KDE_TEST="forceoptional" +inherit kde5 + +DESCRIPTION="Project management application" +HOMEPAGE="https://www.calligra.org/" +SRC_URI="mirror://kde/stable/${PN/plan/}/${PV}/${P}.tar.xz" + +LICENSE="GPL-2" +KEYWORDS="amd64 x86" +IUSE="activities +holidays kwallet pim X" + +# FIXME: Disabled by upstream for good reason +# Crashes (https://bugs.kde.org/show_bug.cgi?id=311940) +# $(add_kdeapps_dep akonadi) +# $(add_kdeapps_dep akonadi-contacts) +# Currently upstream-disabled: +# =dev-libs/kproperty-3.0*:5 +# =dev-libs/kreport-3.0*:5 +DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep khtml) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep designer) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + dev-lang/perl + dev-libs/kdiagram:5 + sys-libs/zlib + activities? ( $(add_frameworks_dep kactivities) ) + holidays? ( $(add_frameworks_dep kholidays) ) + kwallet? ( + $(add_frameworks_dep kwallet) + app-crypt/qca:2[qt5(+)] + ) + pim? ( + +Date: Thu, 20 Jun 2019 10:52:00 +0200 +Subject: ICal: Adapt to api changes in KCalCore + +--- + CMakeLists.txt | 37 +++++++++++----------- + src/CMakeLists.txt | 4 +++ + .../filters/icalendar/export/icalendarexport.cpp | 5 +++ + 3 files changed, 27 insertions(+), 19 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 0dabbaf..49fa642 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -75,6 +75,10 @@ if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.6.40) + set(HAVE_QDATETIME_KCALCORE TRUE) + endif() + ++if ("${KF5CalendarCore_VERSION}" VERSION_GREATER 5.11.42) ++ set(KCALCORE_HAVE_NO_PERSION_PTR TRUE) ++endif() ++ + if (PLANCHARTDEBUG) + add_definitions(-DPLAN_CHART_DEBUG) + endif () +diff --git a/src/plugins/filters/icalendar/export/icalendarexport.cpp b/src/plugins/filters/icalendar/export/icalendarexport.cpp +index cd75598..ce29bfe 100644 +--- a/src/plugins/filters/icalendar/export/icalendarexport.cpp ++++ b/src/plugins/filters/icalendar/export/icalendarexport.cpp +@@ -141,8 +141,13 @@ 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 ++ KCalCore::Person p = KCalCore::Person::fromFullName(node->leader()); ++ KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p.name(), p.email())); ++#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); + todo->addAttendee(a); + } +-- +cgit v1.1 diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-2.patch b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-2.patch new file mode 100644 index 000000000000..02c67d5ada73 --- /dev/null +++ b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-2.patch @@ -0,0 +1,84 @@ +From a9eaf1c98ed408fd6e8897fa9e2f99ed17db1ebc Mon Sep 17 00:00:00 2001 +From: David Faure +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@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 + #include + #include ++#include + + #include + #include +@@ -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, 80) + 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 lst = task->requestedResources(); + foreach(const Resource *r, lst) { + if (r->type() == Resource::Type_Work) { ++#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80) ++ 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, 80) ++ 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, 80) ++ 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 diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-3.patch b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-3.patch new file mode 100644 index 000000000000..14cc70ab1c8e --- /dev/null +++ b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-3.patch @@ -0,0 +1,33 @@ +From 2f5505cf03ff865349d06e1d5c39007c52e7cd10 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +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 + #include "kptdebug.h" + +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + + #include + #include +-- +2.22.1 + diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch b/app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch new file mode 100644 index 000000000000..4ee031865a39 --- /dev/null +++ b/app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch @@ -0,0 +1,24 @@ +From fe36bf6f0dc1f0c1e927850dd78093cfe3b7aae2 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid +Date: Sun, 28 Jul 2019 00:07:33 +0200 +Subject: Fix compile on CI + +src/workpackage/view.h:148:31: error: field m_scheduleActions has incomplete type QMap +--- + src/workpackage/view.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/workpackage/view.h b/src/workpackage/view.h +index 6cae32b..cd2fc4e 100644 +--- a/src/workpackage/view.h ++++ b/src/workpackage/view.h +@@ -24,6 +24,7 @@ + + #include + ++#include + #include + + class QPrinter; +-- +cgit v1.1 diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch b/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch new file mode 100644 index 000000000000..707b6c8cdd5a --- /dev/null +++ b/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch @@ -0,0 +1,57 @@ +From 5924e3ad82b5dfc95acf9f6751946d5f086d9ce7 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Tue, 1 Jan 2019 20:13:57 +0100 +Subject: Drop unused dependencies + +Test Plan: Built fine with deps removed. + +Reviewers: #calligra:_3.0, danders + +Reviewed By: #calligra:_3.0, danders + +Subscribers: danders + +Differential Revision: https://phabricator.kde.org/D17903 +--- + CMakeLists.txt | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3cb4b63..a6a3c79 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -121,7 +121,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED + IconThemes + ItemViews + JobWidgets +- KCMUtils + KIO + Notifications + # NotifyConfig +@@ -169,22 +168,13 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED + COMPONENTS + Core + Gui +- Network + PrintSupport +- Svg + Test + Widgets + Xml + ) +- find_package(Qt5 ${REQUIRED_QT_VERSION} QUIET +- COMPONENTS +- DBus +- OpenGL +- # Quick +- # Sql +- # WebKit +- # WebKitWidgets +- ) ++ find_package(Qt5DBus ${REQUIRED_QT_VERSION} QUIET) ++ + # Qt5Declarative was removed in Qt 5.6.0 so search for it in a separate call + # Including it in a collected find_package(Qt5 ...) call can lead to a fatal not-found error: + # * Qt5 (required version >= 5.3.0) +-- +cgit v1.1 -- cgit v1.2.3