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 -------------- .../files/calligraplan-3.1.0-missing-header.patch | 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 <[email protected]> -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 <[email protected]> -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: [email protected] ---- - .../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 <[email protected]> -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 <[email protected]> -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 <[email protected]> -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 <[email protected]> -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>
