* [gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/files/, app-office/calligraplan/
@ 2019-08-11 8:19 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-08-11 8:19 UTC (permalink / raw
To: gentoo-commits
commit: 569f8c4dd13fc5ba4ec57f7cfd7367c34b92be5f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 07:56:09 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 08:19:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=569f8c4d
app-office/calligraplan: Fix missing header with Frameworks 5.61
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/calligraplan/calligraplan-3.1.0.ebuild | 1 +
| 24 ++++++++++++++++++++++
2 files changed, 25 insertions(+)
diff --git a/app-office/calligraplan/calligraplan-3.1.0.ebuild b/app-office/calligraplan/calligraplan-3.1.0.ebuild
index 9a721d96356..d18ff1274e1 100644
--- a/app-office/calligraplan/calligraplan-3.1.0.ebuild
+++ b/app-office/calligraplan/calligraplan-3.1.0.ebuild
@@ -78,6 +78,7 @@ RESTRICT+=" test"
PATCHES=(
"${FILESDIR}"/${P}-qt-5.11.patch
"${FILESDIR}"/${P}-qca.patch
+ "${FILESDIR}"/${P}-missing-header.patch
)
src_prepare() {
--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 00000000000..4ee031865a3
--- /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 <aacid@kde.org>
+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<QAction*, KPlato::Schedule*>
+---
+ 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 <KoView.h>
+
++#include <QMap>
+ #include <QStackedWidget>
+
+ class QPrinter;
+--
+cgit v1.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/files/, app-office/calligraplan/
@ 2019-08-16 14:40 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-08-16 14:40 UTC (permalink / raw
To: gentoo-commits
commit: 76b3807cb00c92d643409640b010b1a542e28574
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 13:09:41 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 14:40:32 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76b3807c
app-office/calligraplan: Backport KCalCore 19.08.0 API changes
Upstream commits
3a01affd66f8dfdcc124e23595217f3ae5a09723
a9eaf1c98ed408fd6e8897fa9e2f99ed17db1ebc
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../calligraplan/calligraplan-3.1.0-r2.ebuild | 99 ++++++++++++++++++++++
.../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 ++++++++
4 files changed, 262 insertions(+)
diff --git a/app-office/calligraplan/calligraplan-3.1.0-r2.ebuild b/app-office/calligraplan/calligraplan-3.1.0-r2.ebuild
new file mode 100644
index 00000000000..8be9484950d
--- /dev/null
+++ b/app-office/calligraplan/calligraplan-3.1.0-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_APPS_MINIMAL="19.08.0"
+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? (
+ $(add_kdeapps_dep kcalcore)
+ $(add_kdeapps_dep kcontacts)
+ )
+ X? (
+ $(add_qt_dep qtx11extras)
+ x11-libs/libX11
+ )
+"
+RDEPEND="${DEPEND}
+ !app-office/calligra[calligra_features_plan(-)]
+ !app-office/calligra-l10n:4
+ $(add_qt_dep qtsvg)
+"
+
+RESTRICT+=" test"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-qt-5.11.patch
+ "${FILESDIR}"/${P}-qca.patch
+ "${FILESDIR}"/${P}-missing-header.patch
+ "${FILESDIR}"/${P}-unused-deps.patch
+ "${FILESDIR}"/${P}-kcalcore-19.08-{1,2,3}.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_find_package activities KF5Activities)
+ $(cmake-utils_use_find_package holidays KF5Holidays)
+ $(cmake-utils_use_find_package pim KF5CalendarCore)
+ $(cmake-utils_use_find_package pim KF5Contacts)
+ $(cmake-utils_use_find_package kwallet Qca-qt5)
+ $(cmake-utils_use_find_package kwallet KF5Wallet)
+ )
+ # Qt5DBus can't be disabled because of KF5DBusAddons dependency
+
+ kde5_src_configure
+}
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch
new file mode 100644
index 00000000000..cfe8b552d9d
--- /dev/null
+++ b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch
@@ -0,0 +1,46 @@
+From 3a01affd66f8dfdcc124e23595217f3ae5a09723 Mon Sep 17 00:00:00 2001
+From: Dag Andersen <danders@get2net.dk>
+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 00000000000..02c67d5ada7
--- /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 <faure@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@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, 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<Resource*> 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 00000000000..14cc70ab1c8
--- /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 <asturm@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
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/files/, app-office/calligraplan/
@ 2019-12-03 5:04 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-12-03 5:04 UTC (permalink / raw
To: gentoo-commits
commit: 3d905db98e4e2542be61b93b4774760c53c384a9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 2 17:19:32 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 3 05:03:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d905db9
app-office/calligraplan: Drop 3.1.0-r1 and 3.1.0-r3
And a lot of patches.
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/calligraplan/Manifest | 1 -
.../calligraplan/calligraplan-3.1.0-r1.ebuild | 97 ----------------
.../calligraplan/calligraplan-3.1.0-r3.ebuild | 99 ----------------
.../calligraplan-3.1.0-kcalcore-19.08-1.patch | 46 --------
.../calligraplan-3.1.0-kcalcore-19.08-2.patch | 84 --------------
| 24 ----
.../files/calligraplan-3.1.0-qca.patch | 127 ---------------------
.../files/calligraplan-3.1.0-qt-5.11.patch | 124 --------------------
.../files/calligraplan-3.1.0-unused-deps.patch | 57 ---------
app-office/calligraplan/metadata.xml | 1 -
10 files changed, 660 deletions(-)
diff --git a/app-office/calligraplan/Manifest b/app-office/calligraplan/Manifest
index 11fac6f2280..0af8917299c 100644
--- a/app-office/calligraplan/Manifest
+++ b/app-office/calligraplan/Manifest
@@ -1,2 +1 @@
-DIST calligraplan-3.1.0.tar.xz 3617600 BLAKE2B af45aa28529c18c9fa9fae2b7c03ea1b795d3fec3fd44dbcc4ed056a4b1b843b10cb8a9ad6dab319775a7d7032520721a4719605859dd60100a19eafdcb621ed SHA512 a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156
DIST calligraplan-3.2.1.tar.xz 3417328 BLAKE2B dee2fe03a013abee0fab17495b98927eaf6ef3d2d4daaa344fccfcbd06dbaeb64717d4e844dc8659c61773a39a367fe3f93ba69b621a4dfaa9919835112e5ce9 SHA512 cd73a6ef0b9230f41d5edfeffb3664465643ca7dde8179eab0f7e4fc5e26d1331d110222256bbe18926feb39a2928abbaf0186af0376e7262df2f863941696c5
diff --git a/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild b/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild
deleted file mode 100644
index 98cc37a7595..00000000000
--- a/app-office/calligraplan/calligraplan-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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? (
- <kde-apps/kcalcore-19.04.50:5
- $(add_kdeapps_dep kcontacts)
- )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libX11
- )
-"
-RDEPEND="${DEPEND}
- !app-office/calligra[calligra_features_plan(-)]
- !app-office/calligra-l10n:4
- $(add_qt_dep qtsvg)
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-qt-5.11.patch
- "${FILESDIR}"/${P}-qca.patch
- "${FILESDIR}"/${P}-missing-header.patch
- "${FILESDIR}"/${P}-unused-deps.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package activities KF5Activities)
- $(cmake-utils_use_find_package holidays KF5Holidays)
- $(cmake-utils_use_find_package pim KF5CalendarCore)
- $(cmake-utils_use_find_package pim KF5Contacts)
- $(cmake-utils_use_find_package kwallet Qca-qt5)
- $(cmake-utils_use_find_package kwallet KF5Wallet)
- )
- # Qt5DBus can't be disabled because of KF5DBusAddons dependency
-
- kde5_src_configure
-}
diff --git a/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild b/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
deleted file mode 100644
index 2f0f38c3d9f..00000000000
--- a/app-office/calligraplan/calligraplan-3.1.0-r3.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_APPS_MINIMAL="19.08.0"
-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? (
- $(add_frameworks_dep kcalendarcore)
- $(add_frameworks_dep kcontacts)
- )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libX11
- )
-"
-RDEPEND="${DEPEND}
- !app-office/calligra[calligra_features_plan(-)]
- !app-office/calligra-l10n:4
- $(add_qt_dep qtsvg)
-"
-
-RESTRICT+=" test"
-
-PATCHES=(
- "${FILESDIR}"/${P}-qt-5.11.patch
- "${FILESDIR}"/${P}-qca.patch
- "${FILESDIR}"/${P}-missing-header.patch
- "${FILESDIR}"/${P}-unused-deps.patch
- "${FILESDIR}"/${P}-kcalcore-19.08-{1,2}.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_find_package activities KF5Activities)
- $(cmake-utils_use_find_package holidays KF5Holidays)
- $(cmake-utils_use_find_package pim KF5CalendarCore)
- $(cmake-utils_use_find_package pim KF5Contacts)
- $(cmake-utils_use_find_package kwallet Qca-qt5)
- $(cmake-utils_use_find_package kwallet KF5Wallet)
- )
- # Qt5DBus can't be disabled because of KF5DBusAddons dependency
-
- kde5_src_configure
-}
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch b/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch
deleted file mode 100644
index cfe8b552d9d..00000000000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-1.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 3a01affd66f8dfdcc124e23595217f3ae5a09723 Mon Sep 17 00:00:00 2001
-From: Dag Andersen <danders@get2net.dk>
-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
deleted file mode 100644
index 02c67d5ada7..00000000000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-kcalcore-19.08-2.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From a9eaf1c98ed408fd6e8897fa9e2f99ed17db1ebc Mon Sep 17 00:00:00 2001
-From: David Faure <faure@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@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, 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<Resource*> 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-missing-header.patch b/app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch
deleted file mode 100644
index 4ee031865a3..00000000000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-missing-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From fe36bf6f0dc1f0c1e927850dd78093cfe3b7aae2 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-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<QAction*, KPlato::Schedule*>
----
- 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 <KoView.h>
-
-+#include <QMap>
- #include <QStackedWidget>
-
- class QPrinter;
---
-cgit v1.1
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch b/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch
deleted file mode 100644
index 213cc9935be..00000000000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-qca.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 9c5eb86128da46899e719209a92a65df012c6d8e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Tue, 1 Jan 2019 19:19:19 +0100
-Subject: [PATCH] Re-add accidentally removed test for QCA, KF5Wallet is
- optional
-
----
- CMakeLists.txt | 18 +++++++++++++++++-
- src/libs/store/CMakeLists.txt | 15 +++++++--------
- 2 files changed, 24 insertions(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eed9d3c..3cb4b63 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -128,7 +128,6 @@ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
- Parts
- # Sonnet
- TextWidgets
-- Wallet
- WidgetsAddons
- WindowSystem
- XmlGui
-@@ -260,6 +259,23 @@ set_package_properties(KChart PROPERTIES
- TYPE REQUIRED
- )
-
-+##
-+## Test for QCA2
-+##
-+macro_optional_find_package(Qca-qt5 2.1.0 QUIET)
-+set_package_properties(Qca-qt5 PROPERTIES
-+ DESCRIPTION "Qt Cryptographic Architecture"
-+ URL "https:/download.kde.org/stable/qca-qt5"
-+ PURPOSE "Required for encrypted OpenDocument files and encrypted xls files support"
-+ TYPE OPTIONAL
-+)
-+
-+find_package(KF5Wallet ${REQUIRED_KF5_VERSION})
-+
-+if(Qca-qt5_FOUND AND KF5Wallet_FOUND)
-+ add_definitions( -DQCA2 )
-+endif()
-+
- find_package(Perl REQUIRED)
- find_package(ZLIB REQUIRED)
-
-diff --git a/src/libs/store/CMakeLists.txt b/src/libs/store/CMakeLists.txt
-index 2c96fa7..f998264 100644
---- a/src/libs/store/CMakeLists.txt
-+++ b/src/libs/store/CMakeLists.txt
-@@ -4,14 +4,8 @@ endif()
-
- ########### libkostore ###############
-
--if( Qca-qt5_FOUND )
-- add_definitions( -DQCA2 )
--endif()
--
- set(kostore_LIB_SRCS
- KoDirectoryStore.cpp
-- KoEncryptedStore.cpp
-- KoEncryptionChecker.cpp
- KoLZF.cpp
- KoStore.cpp
- KoStoreDevice.cpp
-@@ -23,6 +17,12 @@ set(kostore_LIB_SRCS
- StoreDebug.cpp
- KoNetAccess.cpp # temporary while porting
- )
-+if( Qca-qt5_FOUND )
-+ set(kostore_LIB_SRCS ${kostore_LIB_SRCS}
-+ KoEncryptedStore.cpp
-+ KoEncryptionChecker.cpp
-+ )
-+endif()
-
- add_library(planstore SHARED ${kostore_LIB_SRCS})
- generate_export_header(planstore BASE_NAME kostore)
-@@ -35,12 +35,11 @@ target_link_libraries(planstore
- PRIVATE
- Qt5::Gui
- KF5::Archive
-- KF5::Wallet
- KF5::KIOWidgets
- KF5::I18n
- )
- if( Qca-qt5_FOUND )
-- target_link_libraries(planstore PRIVATE qca-qt5)
-+ target_link_libraries(planstore PRIVATE qca-qt5 KF5::Wallet)
- endif()
-
- set_target_properties(planstore PROPERTIES
-diff --git a/src/libs/widgets/KoDocumentInfoDlg.cpp b/src/libs/widgets/KoDocumentInfoDlg.cpp
-index 1615a61..55e2c32 100644
---- a/src/libs/widgets/KoDocumentInfoDlg.cpp
-+++ b/src/libs/widgets/KoDocumentInfoDlg.cpp
-@@ -26,7 +26,9 @@
- #include "KoDocumentInfo.h"
- #include "KoDocumentBase.h"
- #include "KoGlobal.h"
-+#ifdef QCA2
- #include <KoEncryptionChecker.h>
-+#endif
- #include "KoPageWidgetItem.h"
- //#include <KoDocumentRdfBase.h>
- #include <KoIcon.h>
-@@ -105,12 +107,16 @@ KoDocumentInfoDlg::KoDocumentInfoDlg(QWidget* parent, KoDocumentInfo* docInfo)
- d->aboutUi = new Ui::KoDocumentInfoAboutWidget();
- QWidget *infodlg = new QWidget();
- d->aboutUi->setupUi(infodlg);
-+#ifdef QCA2
- if (!KoEncryptionChecker::isEncryptionSupported()) {
-+#endif
- d->aboutUi->lblEncryptedDesc->setVisible(false);
- d->aboutUi->lblEncrypted->setVisible(false);
- d->aboutUi->pbEncrypt->setVisible(false);
- d->aboutUi->lblEncryptedPic->setVisible(false);
-+#ifdef QCA2
- }
-+#endif
- d->aboutUi->cbLanguage->addItems(KoGlobal::listOfLanguages());
- d->aboutUi->cbLanguage->setCurrentIndex(-1);
-
---
-2.20.1
-
diff --git a/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch b/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch
deleted file mode 100644
index 584d14e447e..00000000000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-qt-5.11.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From f53805bdc108b608e40f217e6a78e7e4df4284f2 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 18 Mar 2018 11:56:57 +0100
-Subject: [PATCH] Fix build with Qt 5.11 (missing headers)
-
-Reviewers: #calligra:_3.0
-
-Tags: #calligra:_3.0
-
-Differential Revision: https://phabricator.kde.org/D11454
----
- src/kptview.h | 1 +
- src/kptviewlist.cpp | 1 +
- src/libs/ui/kptaccountseditor.cpp | 1 +
- src/libs/ui/kptdocumentspanel.h | 1 +
- src/libs/ui/kptitemviewsettup.cpp | 2 +-
- src/libs/ui/kpttaskeditor.cpp | 1 +
- src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 +
- src/libs/widgets/KoPageLayoutWidget.cpp | 2 ++
- 15 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/src/kptview.h b/src/kptview.h
-index 44d11935e71..a98e55342db 100644
---- a/src/kptview.h
-+++ b/src/kptview.h
-@@ -28,6 +28,7 @@
- #include "kptcontext.h"
- #include "kptviewbase.h"
-
-+#include <QActionGroup>
- #include <QDockWidget>
- #include <QMap>
-
-diff --git a/src/kptviewlist.cpp b/src/kptviewlist.cpp
-index f34e702e055..0e6db7b2ffe 100644
---- a/src/kptviewlist.cpp
-+++ b/src/kptviewlist.cpp
-@@ -25,6 +25,7 @@
- #include <QStyle>
- #include <QBrush>
- #include <QContextMenuEvent>
-+#include <QHeaderView>
- #include <QMenu>
-
- #include <kmessagebox.h>
-diff --git a/src/libs/ui/kptaccountseditor.cpp b/src/libs/ui/kptaccountseditor.cpp
-index 7991fafd779..54e3a87c94f 100644
---- a/src/libs/ui/kptaccountseditor.cpp
-+++ b/src/libs/ui/kptaccountseditor.cpp
-@@ -40,6 +40,7 @@
- #include <QContextMenuEvent>
- #include <QMenu>
- #include <QAction>
-+#include <QHeaderView>
-
- #include <KLocalizedString>
- #include <kactioncollection.h>
-diff --git a/src/libs/ui/kptdocumentspanel.h b/src/libs/ui/kptdocumentspanel.h
-index 00ea3af80b2..491cb1ebb86 100644
---- a/src/libs/ui/kptdocumentspanel.h
-+++ b/src/libs/ui/kptdocumentspanel.h
-@@ -26,6 +26,7 @@
-
- #include "kptdocuments.h"
-
-+#include <QModelIndexList>
- #include <QWidget>
- #include <kundo2qstack.h>
-
-diff --git a/src/libs/ui/kptitemviewsettup.cpp b/src/libs/ui/kptitemviewsettup.cpp
-index d1c3b1fc157..7c97a070b9a 100644
---- a/src/libs/ui/kptitemviewsettup.cpp
-+++ b/src/libs/ui/kptitemviewsettup.cpp
-@@ -25,9 +25,9 @@
-
- #include "KoPageLayoutWidget.h"
-
-+#include <QHeaderView>
- #include <QPushButton>
-
--
- namespace KPlato
- {
-
-diff --git a/src/libs/ui/kpttaskeditor.cpp b/src/libs/ui/kpttaskeditor.cpp
-index 21546118d33..91db5acbb18 100644
---- a/src/libs/ui/kpttaskeditor.cpp
-+++ b/src/libs/ui/kpttaskeditor.cpp
-@@ -45,6 +45,7 @@
- #include <QVBoxLayout>
- #include <QDragMoveEvent>
- #include <QAction>
-+#include <QHeaderView>
- #include <QMenu>
-
- #include <kactionmenu.h>
-diff --git a/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-index 344ebc2b599..9146f06ab8c 100644
---- a/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-+++ b/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
-@@ -31,6 +31,7 @@
- #include <KFile>
-
- #include <QAction>
-+#include <QHeaderView>
- #include <QTreeView>
- #include <QStandardItemModel>
- #include <QModelIndex>
-diff --git a/src/libs/widgets/KoPageLayoutWidget.cpp b/src/libs/widgets/KoPageLayoutWidget.cpp
-index c9e17b748a9..b67e9848807 100644
---- a/src/libs/widgets/KoPageLayoutWidget.cpp
-+++ b/src/libs/widgets/KoPageLayoutWidget.cpp
-@@ -23,6 +23,8 @@
-
- #include <KoUnit.h>
-
-+#include <QButtonGroup>
-+
- class Q_DECL_HIDDEN KoPageLayoutWidget::Private
- {
- public:
---
-2.16.2
-
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
deleted file mode 100644
index 707b6c8cdd5..00000000000
--- a/app-office/calligraplan/files/calligraplan-3.1.0-unused-deps.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 5924e3ad82b5dfc95acf9f6751946d5f086d9ce7 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-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
diff --git a/app-office/calligraplan/metadata.xml b/app-office/calligraplan/metadata.xml
index a7529db60e6..192aa1d0ef0 100644
--- a/app-office/calligraplan/metadata.xml
+++ b/app-office/calligraplan/metadata.xml
@@ -13,6 +13,5 @@
<flag name="activities">Enable kactivities support</flag>
<flag name="holidays">Enable <pkg>kde-frameworks/kholidays</pkg> integration</flag>
<flag name="kwallet">Enable access to encrypted OpenDocument files with <pkg>kde-frameworks/kwallet</pkg> storage</flag>
- <flag name="pim">Enable support for KDE PIM resources integration</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/files/, app-office/calligraplan/
@ 2020-09-13 11:19 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-09-13 11:19 UTC (permalink / raw
To: gentoo-commits
commit: 4641de7e07373988d5589b72cea167d486442e65
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 09:00:45 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 11:18:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4641de7e
app-office/calligraplan: Fix build with Qt 5.15
Reported-by: Leonid Kopylov <leonchik1976 <AT> gmail.com>
Closes: https://bugs.gentoo.org/741710
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/calligraplan/calligraplan-3.2.2.ebuild | 2 ++
.../files/calligraplan-3.2.2-qt-5.15.patch | 33 ++++++++++++++++++++++
2 files changed, 35 insertions(+)
diff --git a/app-office/calligraplan/calligraplan-3.2.2.ebuild b/app-office/calligraplan/calligraplan-3.2.2.ebuild
index a8dc309bb5c..3287da88dd8 100644
--- a/app-office/calligraplan/calligraplan-3.2.2.ebuild
+++ b/app-office/calligraplan/calligraplan-3.2.2.ebuild
@@ -75,6 +75,8 @@ RDEPEND="${DEPEND}
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) # bug 741710
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package activities KF5Activities)
diff --git a/app-office/calligraplan/files/calligraplan-3.2.2-qt-5.15.patch b/app-office/calligraplan/files/calligraplan-3.2.2-qt-5.15.patch
new file mode 100644
index 00000000000..fd925ffee68
--- /dev/null
+++ b/app-office/calligraplan/files/calligraplan-3.2.2-qt-5.15.patch
@@ -0,0 +1,33 @@
+From f77fb06dc5d9f7930da9c757d6916f1149dc42bd Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Sun, 29 Mar 2020 13:55:53 +0200
+Subject: [PATCH] Fix build with Qt 5.15
+
+Summary:
+QPainterPath is no longer included via qtransform.h (since
+5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
+
+Test Plan: Builds
+
+Reviewers: #calligra:_3.0, danders
+
+Differential Revision: https://phabricator.kde.org/D28403
+---
+ src/libs/ui/kptganttitemdelegate.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libs/ui/kptganttitemdelegate.cpp b/src/libs/ui/kptganttitemdelegate.cpp
+index 04217da4..d2f3e6d8 100644
+--- a/src/libs/ui/kptganttitemdelegate.cpp
++++ b/src/libs/ui/kptganttitemdelegate.cpp
+@@ -28,6 +28,7 @@
+ #include <QModelIndex>
+ #include <QApplication>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLocale>
+
+ #include <KLocalizedString>
+--
+GitLab
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/files/, app-office/calligraplan/
@ 2020-10-29 19:41 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-10-29 19:41 UTC (permalink / raw
To: gentoo-commits
commit: 1834efa38ba3349b146aa504de48c91d176bbaa9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 29 19:29:52 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Oct 29 19:41:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1834efa3
app-office/calligraplan: Patch out KF5KHtml dependency, fix DEPENDs
- Update HOMEPAGE
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../calligraplan/calligraplan-3.2.2-r1.ebuild | 92 ++++
.../files/calligraplan-3.2.2-no-khtml.patch | 463 +++++++++++++++++++++
2 files changed, 555 insertions(+)
diff --git a/app-office/calligraplan/calligraplan-3.2.2-r1.ebuild b/app-office/calligraplan/calligraplan-3.2.2-r1.ebuild
new file mode 100644
index 00000000000..275d4ee1d2f
--- /dev/null
+++ b/app-office/calligraplan/calligraplan-3.2.2-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.74.0
+QTMIN=5.15.1
+inherit ecm kde.org
+
+DESCRIPTION="Project management application"
+HOMEPAGE="https://calligra.org/plan/"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+ SRC_URI="mirror://kde/stable/calligra/${PV}/${P}.tar.xz"
+ KEYWORDS="amd64 x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +holidays kwallet 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="
+ >=dev-qt/designer-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ dev-lang/perl
+ dev-libs/kdiagram:5
+ activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+ holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+ kwallet? (
+ >=app-crypt/qca-2.3.0:2
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ )
+"
+RDEPEND="${DEPEND}
+ !app-office/calligra[calligra_features_plan(-)]
+ >=dev-qt/qtsvg-${QTMIN}:5
+"
+
+RESTRICT+=" test"
+
+PATCHES=(
+ "${FILESDIR}/${P}-qt-5.15.patch" # bug 741710
+ "${FILESDIR}/${P}-no-khtml.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package activities KF5Activities)
+ $(cmake_use_find_package holidays KF5Holidays)
+ $(cmake_use_find_package kwallet Qca-qt5)
+ $(cmake_use_find_package kwallet KF5Wallet)
+ )
+ # Qt5DBus can't be disabled because of KF5DBusAddons dependency
+
+ ecm_src_configure
+}
diff --git a/app-office/calligraplan/files/calligraplan-3.2.2-no-khtml.patch b/app-office/calligraplan/files/calligraplan-3.2.2-no-khtml.patch
new file mode 100644
index 00000000000..c307e332f61
--- /dev/null
+++ b/app-office/calligraplan/files/calligraplan-3.2.2-no-khtml.patch
@@ -0,0 +1,463 @@
+From 3097da1c42ba7fe3b6a26ccb64df64db9c5588b7 Mon Sep 17 00:00:00 2001
+From: Dag Andersen <dag.andersen@kdemail.net>
+Date: Mon, 26 Oct 2020 13:46:06 +0100
+Subject: [PATCH 1/2] Remove dependency on KHtml
+
+This also removes the introductory pages,
+but these should be cver by the documentation.
+---
+ CMakeLists.txt | 10 +++----
+ src/CMakeLists.txt | 2 --
+ src/kptmaindocument.cpp | 1 -
+ src/kptmaindocument.h | 5 ----
+ src/kptpart.cpp | 47 --------------------------------
+ src/kptpart.h | 4 ---
+ src/kptview.cpp | 53 -------------------------------------
+ src/kptview.h | 10 -------
+ src/libs/ui/CMakeLists.txt | 5 +---
+ src/welcome/WelcomeView.cpp | 9 -------
+ src/welcome/WelcomeView.h | 1 -
+ src/welcome/WelcomeView.ui | 6 +----
+ 12 files changed, 7 insertions(+), 146 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4348601c..13ac4d24 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -150,11 +150,11 @@ if(KF5Activities_FOUND)
+ set(HAVE_KACTIVITIES TRUE)
+ endif()
+
+-find_package(KF5KHtml)
+-set_package_properties(KF5KHtml PROPERTIES
+- PURPOSE "Required for rich text support"
+- TYPE REQUIRED
+-)
++#find_package(KF5KHtml)
++#set_package_properties(KF5KHtml PROPERTIES
++ #PURPOSE "Required for rich text support"
++ #TYPE REQUIRED
++#)
+
+ find_package(KF5Holidays)
+ set_package_properties(KF5Holidays PROPERTIES
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 54f1df57..ee1a6137 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -145,8 +145,6 @@ set(planprivate_LIB_SRCS
+ kptinsertfiledlg.cpp
+ kptloadsharedprojectsdialog.cpp
+
+- about/aboutpage.cpp
+-
+ KPlatoXmlLoader.cpp
+ )
+
+diff --git a/src/kptmaindocument.cpp b/src/kptmaindocument.cpp
+index b4fe670f..f65f2eb0 100644
+--- a/src/kptmaindocument.cpp
++++ b/src/kptmaindocument.cpp
+@@ -257,7 +257,6 @@ void MainDocument::setProject(Project *project)
+ connect(m_project, &Project::nodeChanged, this, &MainDocument::slotNodeChanged);
+ connect(m_project, &Project::sigCalculationFinished, this, &MainDocument::slotCalculationFinished);
+ }
+- m_aboutPage.setProject(project);
+
+ QString dir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
+ if (!dir.isEmpty()) {
+diff --git a/src/kptmaindocument.h b/src/kptmaindocument.h
+index 44ab931c..01ad942d 100644
+--- a/src/kptmaindocument.h
++++ b/src/kptmaindocument.h
+@@ -31,7 +31,6 @@
+ #include "kptconfig.h"
+ #include "kptwbsdefinition.h"
+ #include "kptxmlloaderobject.h"
+-#include "about/aboutpage.h"
+
+ #include "KoDocument.h"
+
+@@ -130,8 +129,6 @@ public:
+ bool insertProject(Project &project, Node *parent, Node *after);
+ bool mergeResources(Project &project);
+
+- KPlatoAboutPage &aboutPage() { return m_aboutPage; }
+-
+ bool extractFiles(KoStore *store, Package *package);
+ bool extractFile(KoStore *store, Package *package, const Document *doc);
+
+@@ -254,8 +251,6 @@ private:
+ QList<QUrl> m_skipUrls;
+ QMap<QDateTime, Project*> m_mergedPackages;
+
+- KPlatoAboutPage m_aboutPage;
+-
+ QDomDocument m_reports;
+
+ bool m_viewlistModified;
+diff --git a/src/kptpart.cpp b/src/kptpart.cpp
+index cd31b6ce..d498f5e1 100644
+--- a/src/kptpart.cpp
++++ b/src/kptpart.cpp
+@@ -25,7 +25,6 @@
+ #include "kptmaindocument.h"
+ #include "kptfactory.h"
+ #include "welcome/WelcomeView.h"
+-#include "kpthtmlview.h"
+ #include "Help.h"
+ #include "calligraplansettings.h"
+ #include "kptdebug.h"
+@@ -163,7 +162,6 @@ void Part::createStarUpWidget(KoMainWindow *parent)
+ startUpWidget = new QStackedWidget(parent);
+
+ startUpWidget->addWidget(createWelcomeView(parent));
+- startUpWidget->addWidget(createIntroductionView());
+ }
+
+ void Part::finish()
+@@ -188,7 +186,6 @@ QWidget *Part::createWelcomeView(KoMainWindow *mw)
+
+ connect(v, &WelcomeView::loadSharedResources, doc, &MainDocument::insertResourcesFile);
+ connect(v, &WelcomeView::recentProject, mw, &KoMainWindow::slotFileOpenRecent);
+- connect(v, &WelcomeView::showIntroduction, this, &Part::slotShowIntroduction);
+ connect(v, &WelcomeView::projectCreated, doc, &MainDocument::slotProjectCreated);
+ connect(v, &WelcomeView::finished, this, &Part::finish);
+
+@@ -197,50 +194,6 @@ QWidget *Part::createWelcomeView(KoMainWindow *mw)
+ return v;
+ }
+
+-void Part::slotShowIntroduction()
+-{
+- startUpWidget->setCurrentIndex(1);
+- slotOpenUrlRequest(static_cast<HtmlView*>(startUpWidget->currentWidget()), QUrl("about:plan/main"));
+-}
+-
+-void Part::slotOpenUrlRequest(HtmlView *v, const QUrl &url)
+-{
+- debugPlan<<url;
+- if (url.scheme() == QLatin1String("about")) {
+- if (url.url() == QLatin1String("about:close")) {
+- startUpWidget->setCurrentIndex(0);
+- return;
+- }
+- if (url.url().startsWith(QLatin1String("about:plan"))) {
+- MainDocument *doc = static_cast<MainDocument*>(document());
+- doc->aboutPage().generatePage(v->htmlPart(), url);
+- return;
+- }
+- }
+- if (url.scheme() == QLatin1String("help")) {
+- KHelpClient::invokeHelp("", url.fileName());
+- return;
+- }
+- // try to open the url
+- debugPlan<<url<<"is external, discard";
+- new KRun(url, currentMainwindow());
+-}
+-
+-QWidget *Part::createIntroductionView()
+-{
+- HtmlView *v = new HtmlView(this, document(), startUpWidget);
+- v->htmlPart().setJScriptEnabled(false);
+- v->htmlPart().setJavaEnabled(false);
+- v->htmlPart().setMetaRefreshEnabled(false);
+- v->htmlPart().setPluginsEnabled(false);
+-
+- slotOpenUrlRequest(v, QUrl("about:plan/main"));
+-
+- connect(v, &KPlato::HtmlView::openUrlRequest, this, &KPlato::Part::slotOpenUrlRequest);
+-
+- return v;
+-}
+-
+ void Part::configure(KoMainWindow *mw)
+ {
+ //debugPlan;
+diff --git a/src/kptpart.h b/src/kptpart.h
+index 90f50257..20429fe2 100644
+--- a/src/kptpart.h
++++ b/src/kptpart.h
+@@ -33,7 +33,6 @@ class QStackedWidget;
+ namespace KPlato
+ {
+ class MainDocument;
+-class HtmlView;
+
+ class PLAN_EXPORT Part : public KoPart
+ {
+@@ -63,8 +62,6 @@ public Q_SLOTS:
+ void finish();
+
+ protected Q_SLOTS:
+- void slotShowIntroduction();
+- void slotOpenUrlRequest(KPlato::HtmlView *v, const QUrl &url);
+ void openTemplate(const QUrl& url) override;
+ void slotOpenTemplate(const QUrl& url);
+
+@@ -74,7 +71,6 @@ protected Q_SLOTS:
+ protected:
+ void createStarUpWidget(KoMainWindow *parent);
+ QWidget *createWelcomeView(KoMainWindow *parent);
+- QWidget *createIntroductionView();
+
+ private:
+ KPlato::MainDocument *m_document;
+diff --git a/src/kptview.cpp b/src/kptview.cpp
+index aa2c3dd7..7af53136 100644
+--- a/src/kptview.cpp
++++ b/src/kptview.cpp
+@@ -103,7 +103,6 @@
+ #include "kptpertresult.h"
+ #include "kptinsertfiledlg.h"
+ #include "kptloadsharedprojectsdialog.h"
+-#include "kpthtmlview.h"
+ #include "about/aboutpage.h"
+ #include "kptlocaleconfigmoneydialog.h"
+ #include "kptflatproxymodel.h"
+@@ -196,7 +195,6 @@ View::View(KoPart *part, MainDocument *doc, QWidget *parent)
+ ////////////////////////////////////////////////////////////////////////////////////////////////////
+
+ // Add sub views
+- createIntroductionView();
+
+ // The menu items
+ // ------ File
+@@ -258,11 +256,6 @@ View::View(KoPart *part, MainDocument *doc, QWidget *parent)
+ connect(actionOpenReportFile, QAction::triggered, this, &View::slotOpenReportFile);
+ #endif
+
+- // ------ Help
+- actionIntroduction = new QAction(koIcon("dialog-information"), i18n("Introduction to Plan"), this);
+- actionCollection()->addAction("plan_introduction", actionIntroduction);
+- connect(actionIntroduction, &QAction::triggered, this, &View::slotIntroduction);
+-
+ // ------ Popup
+ actionOpenNode = new QAction(koIcon("document-edit"), i18n("Edit..."), this);
+ actionCollection()->addAction("node_properties", actionOpenNode);
+@@ -762,46 +755,6 @@ ViewInfo View::defaultCategoryInfo(const QString &type) const
+ return vi;
+ }
+
+-void View::slotOpenUrlRequest(HtmlView *v, const QUrl &url)
+-{
+- debugPlan<<url;
+- if (url.scheme() == QLatin1String("about")) {
+- if (url.url() == QLatin1String("about:close")) {
+- int view = m_visitedViews.count() < 2 ? qMin(m_defaultView, m_tab->count()-1) : m_visitedViews.at(m_visitedViews.count() - 2);
+- debugPlan<<"Prev:"<<view<<m_visitedViews;
+- m_tab->setCurrentIndex(view);
+- return;
+- }
+- if (url.url().startsWith(QLatin1String("about:plan"))) {
+- getPart()->aboutPage().generatePage(v->htmlPart(), url);
+- return;
+- }
+- }
+- if (url.scheme() == QLatin1String("help")) {
+- KHelpClient::invokeHelp("", url.fileName());
+- return;
+- }
+- // try to open the url
+- debugPlan<<url<<"is external, try to open";
+- new KRun(url, mainWindow());
+-}
+-
+-ViewBase *View::createIntroductionView()
+-{
+- HtmlView *v = new HtmlView(getKoPart(), getPart(), m_tab);
+- v->htmlPart().setJScriptEnabled(false);
+- v->htmlPart().setJavaEnabled(false);
+- v->htmlPart().setMetaRefreshEnabled(false);
+- v->htmlPart().setPluginsEnabled(false);
+-
+- slotOpenUrlRequest(v, QUrl("about:plan/main"));
+-
+- connect(v, &HtmlView::openUrlRequest, this, &View::slotOpenUrlRequest);
+-
+- m_tab->addWidget(v);
+- return v;
+-}
+-
+ ViewBase *View::createResourceAppointmentsGanttView(ViewListItem *cat, const QString &tag, const QString &name, const QString &tip, int index)
+ {
+ ResourceAppointmentsGanttView *v = new ResourceAppointmentsGanttView(getKoPart(), getPart(), m_tab);
+@@ -1966,12 +1919,6 @@ void View::slotDefineWBSFinished(int result)
+ dia->deleteLater();
+ }
+
+-void View::slotIntroduction()
+-{
+- m_tab->setCurrentIndex(0);
+-}
+-
+-
+ Calendar *View::currentCalendar()
+ {
+ ViewBase *v = dynamic_cast<ViewBase*>(m_tab->currentWidget());
+diff --git a/src/kptview.h b/src/kptview.h
+index b9242811..33b9a198 100644
+--- a/src/kptview.h
++++ b/src/kptview.h
+@@ -84,7 +84,6 @@ class ResourceGroup;
+ class Relation;
+ class Context;
+ class ViewAdaptor;
+-class HtmlView;
+ class ReportView;
+
+ class ReportDesignDialog;
+@@ -179,8 +178,6 @@ public Q_SLOTS:
+
+ void slotCreateView();
+
+- void slotIntroduction();
+-
+ void openRelationDialog(KPlato::Node *par, KPlato::Node *child);
+ void slotEditRelation(KPlato::Relation *rel);
+ void slotAddRelation(KPlato::Node *par, KPlato::Node *child, int linkType);
+@@ -258,8 +255,6 @@ protected Q_SLOTS:
+ void slotMailWorkpackage(KPlato::Node *node, KPlato::Resource *resource = nullptr);
+ void slotPublishWorkpackages(const QList<KPlato::Node*> &nodes, KPlato::Resource *resource, bool mailTo);
+
+- void slotOpenUrlRequest(KPlato::HtmlView *v, const QUrl &url);
+-
+ void createReportView(const QDomDocument &doc);
+
+ void saveTaskModule(const QUrl &url, KPlato::Project *project);
+@@ -281,8 +276,6 @@ protected:
+
+ ViewBase *currentView() const;
+
+- ViewBase *createIntroductionView();
+-
+ private Q_SLOTS:
+ void slotActionDestroyed(QObject *o);
+ void slotViewListItemRemoved(KPlato::ViewListItem *item);
+@@ -383,9 +376,6 @@ private:
+ // ------ Settings
+ QAction *actionConfigure;
+
+- // ------ Help
+- QAction *actionIntroduction;
+-
+ // ------ Popup
+ QAction *actionOpenNode;
+ QAction *actionTaskProgress;
+diff --git a/src/libs/ui/CMakeLists.txt b/src/libs/ui/CMakeLists.txt
+index ca22f77f..15d8087c 100644
+--- a/src/libs/ui/CMakeLists.txt
++++ b/src/libs/ui/CMakeLists.txt
+@@ -96,8 +96,6 @@ set(planui_LIB_SRCS
+ kptworkpackagemergedialog.cpp
+ kptrecalculatedialog.cpp
+
+- kpthtmlview.cpp
+-
+ locale/localemon.cpp
+ kptlocaleconfigmoneydialog.cpp
+
+@@ -166,13 +164,12 @@ target_link_libraries(planui
+ PUBLIC
+ planmain
+ planmodels
+- KF5::KHtml
++ KF5::TextWidgets
+ PRIVATE
+ KChart
+ KF5::ItemViews
+ KF5::IconThemes
+ KF5::Archive
+- KF5::TextWidgets
+ KF5::KIOCore
+ KF5::KIOFileWidgets
+ KF5::KIOWidgets
+diff --git a/src/welcome/WelcomeView.cpp b/src/welcome/WelcomeView.cpp
+index bede7f4f..b6115fd7 100644
+--- a/src/welcome/WelcomeView.cpp
++++ b/src/welcome/WelcomeView.cpp
+@@ -156,14 +156,6 @@ WelcomeView::WelcomeView(KoPart *part, KoDocument *doc, QWidget *parent)
+ "<nl/>This enables you to quickly open projects you have worked on recently."
+ "</para>"));
+
+- Help::add(ui.introductionBtn,
+- xi18nc("@info:whatsthis",
+- "<title>Introduction to <application>Plan</application></title>"
+- "<para>"
+- "These introductory pages gives you hints and tips on what"
+- " you can use <application>Plan</application> for, and how to use it."
+- "</para>"));
+-
+ Help::add(ui.contextHelp,
+ xi18nc("@info:whatsthis",
+ "<title>Context help</title>"
+@@ -199,7 +191,6 @@ WelcomeView::WelcomeView(KoPart *part, KoDocument *doc, QWidget *parent)
+ connect(ui.newProjectBtn, &QAbstractButton::clicked, this, &WelcomeView::slotNewProject);
+ connect(ui.createResourceFileBtn, &QAbstractButton::clicked, this, &WelcomeView::slotCreateResourceFile);
+ connect(ui.openProjectBtn, &QAbstractButton::clicked, this, &WelcomeView::slotOpenProject);
+- connect(ui.introductionBtn, &QAbstractButton::clicked, this, &WelcomeView::showIntroduction);
+
+ connect(ui.recentProjects, &QAbstractItemView::activated, this, &WelcomeView::slotRecentFileSelected);
+
+diff --git a/src/welcome/WelcomeView.h b/src/welcome/WelcomeView.h
+index a09ebe2d..be604de7 100644
+--- a/src/welcome/WelcomeView.h
++++ b/src/welcome/WelcomeView.h
+@@ -64,7 +64,6 @@ Q_SIGNALS:
+ void newProject();
+ void openProject();
+ void recentProject(const QUrl &file, KoPart *part);
+- void showIntroduction();
+ void selectDefaultView();
+ void loadSharedResources(const QUrl &url, const QUrl &projects);
+ void openExistingFile(const QUrl &url);
+diff --git a/src/welcome/WelcomeView.ui b/src/welcome/WelcomeView.ui
+index 7317214b..9b3363db 100644
+--- a/src/welcome/WelcomeView.ui
++++ b/src/welcome/WelcomeView.ui
+@@ -231,14 +231,10 @@
+ </spacer>
+ </item>
+ <item>
+- <widget class="QPushButton" name="introductionBtn">
++ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>Introduction</string>
+ </property>
+- <property name="icon">
+- <iconset theme="help-hint">
+- <normaloff>.</normaloff>.</iconset>
+- </property>
+ </widget>
+ </item>
+ <item>
+--
+2.29.1
+
+
+From 8aec5de56c525e71ae650abd4abfba756f5e5724 Mon Sep 17 00:00:00 2001
+From: Dag Andersen <dag.andersen@kdemail.net>
+Date: Mon, 26 Oct 2020 14:17:48 +0100
+Subject: [PATCH 2/2] User docs now on docs.kde.org
+
+---
+ src/welcome/WelcomeView.ui | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/welcome/WelcomeView.ui b/src/welcome/WelcomeView.ui
+index 9b3363db..741913b3 100644
+--- a/src/welcome/WelcomeView.ui
++++ b/src/welcome/WelcomeView.ui
+@@ -307,7 +307,7 @@
+ <string>https://userbase.kde.org/Plan</string>
+ </property>
+ <property name="text">
+- <string comment="@action:button"><a href="https://userbase.kde.org/Plan">Plan user documentation</a></string>
++ <string comment="@action:button"><a href="https://docs.kde.org/index.php?application=calligraplan">Plan user documentation</a></string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+--
+2.29.1
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/files/, app-office/calligraplan/
@ 2024-01-21 20:50 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2024-01-21 20:50 UTC (permalink / raw
To: gentoo-commits
commit: fb559bc84696eab050dbfa1849fc13183921d16c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 21 20:15:41 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 21 20:49:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb559bc8
app-office/calligraplan: Port away from deprecated kinit
Closes: https://bugs.gentoo.org/922506
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../calligraplan/calligraplan-3.3.0-r1.ebuild | 91 ++++++++++++++
.../files/calligraplan-3.3.0-no-kinit.patch | 134 +++++++++++++++++++++
2 files changed, 225 insertions(+)
diff --git a/app-office/calligraplan/calligraplan-3.3.0-r1.ebuild b/app-office/calligraplan/calligraplan-3.3.0-r1.ebuild
new file mode 100644
index 000000000000..79b9a52b5fff
--- /dev/null
+++ b/app-office/calligraplan/calligraplan-3.3.0-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="forceoptional"
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm kde.org
+
+DESCRIPTION="Project management application"
+HOMEPAGE="https://calligra.org/plan/"
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+ SRC_URI="mirror://kde/stable/calligra/${PV}/${PN}-${PV}.tar.xz"
+ KEYWORDS="amd64 ~arm64 ~riscv x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="activities +holidays kwallet X"
+
+RESTRICT="test"
+
+# 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="
+ dev-lang/perl
+ >=dev-libs/kdiagram-2.8.0:5
+ >=dev-qt/designer-${QTMIN}:5
+ >=dev-qt/qtdbus-${QTMIN}:5
+ >=dev-qt/qtgui-${QTMIN}:5
+ >=dev-qt/qtprintsupport-${QTMIN}:5
+ >=dev-qt/qtwidgets-${QTMIN}:5
+ >=dev-qt/qtxml-${QTMIN}:5
+ >=kde-frameworks/karchive-${KFMIN}:5
+ >=kde-frameworks/kcalendarcore-${KFMIN}:5
+ >=kde-frameworks/kconfig-${KFMIN}:5
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5
+ >=kde-frameworks/kdbusaddons-${KFMIN}:5
+ >=kde-frameworks/kglobalaccel-${KFMIN}:5
+ >=kde-frameworks/kguiaddons-${KFMIN}:5
+ >=kde-frameworks/ki18n-${KFMIN}:5
+ >=kde-frameworks/kiconthemes-${KFMIN}:5
+ >=kde-frameworks/kio-${KFMIN}:5
+ >=kde-frameworks/kitemmodels-${KFMIN}:5
+ >=kde-frameworks/kitemviews-${KFMIN}:5
+ >=kde-frameworks/kjobwidgets-${KFMIN}:5
+ >=kde-frameworks/knotifications-${KFMIN}:5
+ >=kde-frameworks/kparts-${KFMIN}:5
+ >=kde-frameworks/kservice-${KFMIN}:5
+ >=kde-frameworks/ktextwidgets-${KFMIN}:5
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+ >=kde-frameworks/kwindowsystem-${KFMIN}:5
+ >=kde-frameworks/kxmlgui-${KFMIN}:5
+ activities? ( >=kde-plasma/plasma-activities-${KFMIN}:5 )
+ holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+ kwallet? (
+ >=app-crypt/qca-2.3.0:2[qt5(+)]
+ >=kde-frameworks/kwallet-${KFMIN}:5
+ )
+ X? (
+ >=dev-qt/qtx11extras-${QTMIN}:5
+ x11-libs/libX11
+ )
+"
+RDEPEND="${DEPEND}
+ !app-office/calligra[calligra_features_plan(-)]
+ >=dev-qt/qtsvg-${QTMIN}:5
+"
+
+PATCHES=( "${FILESDIR}/${P}-no-kinit.patch" ) # bug 922506
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake_use_find_package activities KF5Activities)
+ $(cmake_use_find_package holidays KF5Holidays)
+ $(cmake_use_find_package kwallet Qca-qt5)
+ $(cmake_use_find_package kwallet KF5Wallet)
+ )
+ # Qt5DBus can't be disabled because of KF5DBusAddons dependency
+
+ ecm_src_configure
+}
diff --git a/app-office/calligraplan/files/calligraplan-3.3.0-no-kinit.patch b/app-office/calligraplan/files/calligraplan-3.3.0-no-kinit.patch
new file mode 100644
index 000000000000..16ee6b1e09a4
--- /dev/null
+++ b/app-office/calligraplan/files/calligraplan-3.3.0-no-kinit.patch
@@ -0,0 +1,134 @@
+From 1883014daa5ae1dedf4d9356dbdaafd4d9d3014f Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sat, 17 Sep 2022 17:11:05 +0200
+Subject: [PATCH] Port away from deprecated kinit
+
+(cherry picked from commit d0c9c05bfb1d1eae6b1d92ac7d5a22ed5238329f)
+---
+ CMakeLists.txt | 1 -
+ src/CMakeLists.txt | 11 ++++-------
+ src/main.cpp | 2 +-
+ src/workpackage/CMakeLists.txt | 10 +++-------
+ src/workpackage/main.cpp | 2 +-
+ 5 files changed, 9 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 70025827..a354e4a0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -112,7 +112,6 @@ set(REQUIRED_KF5_VERSION "5.45.0")
+
+ find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED
+ COMPONENTS
+- Init
+ Archive
+ # Codecs
+ # Completion
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3c77e9f4..755863a2 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -207,7 +207,7 @@ install(TARGETS calligraplanpart DESTINATION ${PLUGIN_INSTALL_DIR}/calligraplan/
+
+ ########### KPlato executable ###############
+
+-set(calligraplan_KDEINIT_SRCS main.cpp )
++set(calligraplan_SRCS main.cpp )
+
+ file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/*-apps-calligraplan.png")
+ ecm_add_app_icon(kdeinit_app_ICONS_SRCS ICONS ${ICONS_SRCS})
+@@ -215,20 +215,17 @@ if(WIN32)
+ set(_resourcefile "${CMAKE_CURRENT_BINARY_DIR}/kdeinit_app_ICONS_SRCS.rc")
+ endif()
+
+-kf5_add_kdeinit_executable( calligraplan ${calligraplan_KDEINIT_SRCS})
++add_executable( calligraplan ${calligraplan_SRCS})
+
+ if (APPLE)
+ set_target_properties(calligraplan PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
+ set_target_properties(calligraplan PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.calligra.plan")
+ set_target_properties(calligraplan PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Plan")
+- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/calligraplan_KDEINIT_SRCS.icns DESTINATION ${BUNDLE_INSTALL_DIR}/calligraplan.app/Contents/Resources)
++ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/calligraplan_SRCS.icns DESTINATION ${BUNDLE_INSTALL_DIR}/calligraplan.app/Contents/Resources)
+ endif ()
+
+-target_link_libraries(kdeinit_calligraplan planmain)
++target_link_libraries(calligraplan planmain)
+
+-install(TARGETS kdeinit_calligraplan ${INSTALL_TARGETS_DEFAULT_ARGS})
+-
+-target_link_libraries(calligraplan kdeinit_calligraplan planmain)
+ install(TARGETS calligraplan ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ ########### install files ###############
+diff --git a/src/main.cpp b/src/main.cpp
+index 3b807381..64ae2e8f 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -27,7 +27,7 @@
+ #include <QApplication>
+ #include <QLoggingCategory>
+
+-extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+ /**
+ * Disable debug output by default, only log warnings.
+diff --git a/src/workpackage/CMakeLists.txt b/src/workpackage/CMakeLists.txt
+index 9072ebad..808646d9 100644
+--- a/src/workpackage/CMakeLists.txt
++++ b/src/workpackage/CMakeLists.txt
+@@ -77,7 +77,7 @@ install(TARGETS calligraplanworkpart DESTINATION ${PLUGIN_INSTALL_DIR})
+
+ ########### Calligra PlanWork executable ###############
+
+-set(calligraplanwork_KDEINIT_SRCS main.cpp commandlineparser.cpp)
++set(calligraplanwork_SRCS main.cpp commandlineparser.cpp)
+
+ file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/pics/*-apps-calligraplanwork.png")
+ ecm_add_app_icon(kdeinit_app_ICONS_SRCS ICONS ${ICONS_SRCS})
+@@ -85,7 +85,7 @@ if(WIN32)
+ set(_resourcefile "${CMAKE_CURRENT_BINARY_DIR}/kdeinit_app_ICONS_SRCS.rc")
+ endif()
+
+-kf5_add_kdeinit_executable(calligraplanwork ${calligraplanwork_KDEINIT_SRCS})
++add_executable(calligraplanwork ${calligraplanwork_SRCS})
+
+ if (APPLE)
+ set_target_properties(calligraplanwork PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
+@@ -94,7 +94,7 @@ if (APPLE)
+ endif ()
+
+ target_link_libraries(
+- kdeinit_calligraplanwork
++ calligraplanwork
+
+ planworkfactory
+ plankernel
+@@ -105,10 +105,6 @@ target_link_libraries(
+ KF5::DBusAddons
+ )
+
+-install(TARGETS kdeinit_calligraplanwork ${INSTALL_TARGETS_DEFAULT_ARGS})
+-
+-target_link_libraries( calligraplanwork kdeinit_calligraplanwork )
+-
+ install(TARGETS calligraplanwork ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+ ########### install files ###############
+diff --git a/src/workpackage/main.cpp b/src/workpackage/main.cpp
+index 12af06e1..56c0be4f 100644
+--- a/src/workpackage/main.cpp
++++ b/src/workpackage/main.cpp
+@@ -29,7 +29,7 @@
+
+ #include <Calligra2Migration.h>
+
+-extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+ QApplication app(argc, argv);
+ #ifdef Q_OS_MACOS
+--
+2.43.0
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-01-21 20:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-11 8:19 [gentoo-commits] repo/gentoo:master commit in: app-office/calligraplan/files/, app-office/calligraplan/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2019-08-16 14:40 Andreas Sturmlechner
2019-12-03 5:04 Andreas Sturmlechner
2020-09-13 11:19 Andreas Sturmlechner
2020-10-29 19:41 Andreas Sturmlechner
2024-01-21 20:50 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox