From 52b1f1cb9f8d4e1fb1fcbde59930a105a819b0b4 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 30 Jul 2020 19:45:19 +0200 Subject: Cleanup unused KDE patches Thanks to Patrick Volkerding for the effort. --- .../calligraplan/calligraplan.kcalcore.1.patch | 47 -------- .../calligraplan/calligraplan.kcalcore.2.patch | 85 -------------- .../calligraplan/calligraplan.kcalendarcore.patch | 34 ------ .../calligraplan/calligraplan.missingheader.patch | 25 ----- kde/patch/calligraplan/calligraplan.qt-511.patch | 125 --------------------- 5 files changed, 316 deletions(-) delete mode 100644 kde/patch/calligraplan/calligraplan.kcalcore.1.patch delete mode 100644 kde/patch/calligraplan/calligraplan.kcalcore.2.patch delete mode 100644 kde/patch/calligraplan/calligraplan.kcalendarcore.patch delete mode 100644 kde/patch/calligraplan/calligraplan.missingheader.patch delete mode 100644 kde/patch/calligraplan/calligraplan.qt-511.patch (limited to 'kde/patch/calligraplan') diff --git a/kde/patch/calligraplan/calligraplan.kcalcore.1.patch b/kde/patch/calligraplan/calligraplan.kcalcore.1.patch deleted file mode 100644 index dcbe903..0000000 --- a/kde/patch/calligraplan/calligraplan.kcalcore.1.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 3a01affd66f8dfdcc124e23595217f3ae5a09723 Mon Sep 17 00:00:00 2001 -From: Dag Andersen -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/kde/patch/calligraplan/calligraplan.kcalcore.2.patch b/kde/patch/calligraplan/calligraplan.kcalcore.2.patch deleted file mode 100644 index 5c118e1..0000000 --- a/kde/patch/calligraplan/calligraplan.kcalcore.2.patch +++ /dev/null @@ -1,85 +0,0 @@ -From a9eaf1c98ed408fd6e8897fa9e2f99ed17db1ebc Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Tue, 23 Jul 2019 12:26:17 +0200 -Subject: Port to KCalCore API changes - -The code is in #if 0, but I tested compilation of this in the calligra -stable branch: -https://commits.kde.org/calligra/2d484fda1b31a72659088a4bfce5c3708e923cb0 - -So you can use KCalCore again if you want :-) -It's turning into a KF5 framework so the API will be stable from now on. - -CCMAIL: danders@get2net.dk ---- - .../filters/icalendar/export/icalendarexport.cpp | 20 +++++++++++++++++--- - 1 file changed, 17 insertions(+), 3 deletions(-) - -diff --git a/src/plugins/filters/icalendar/export/icalendarexport.cpp b/src/plugins/filters/icalendar/export/icalendarexport.cpp -index b21320f..828b641 100644 ---- a/src/plugins/filters/icalendar/export/icalendarexport.cpp -+++ b/src/plugins/filters/icalendar/export/icalendarexport.cpp -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -355,14 +356,15 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node, - todo->setOrganizer(node->projectNode()->leader()); - } - if ( node->type() != Node::Type_Project && ! node->leader().isEmpty()) { --#if KCALCORE_HAVE_NO_PERSION_PTR -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80) - KCalCore::Person p = KCalCore::Person::fromFullName(node->leader()); -- KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p.name(), p.email())); -+ KCalCore::Attendee a(p.name(), p.email()); -+ a.setRole(KCalCore::Attendee::NonParticipant); - #else - KCalCore::Person::Ptr p = KCalCore::Person::fromFullName(node->leader()); - KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p->name(), p->email())); --#endif - a->setRole(KCalCore::Attendee::NonParticipant); -+#endif - todo->addAttendee(a); - } - DateTime st = node->startTime(id); -@@ -381,13 +383,21 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node, - const QList lst = task->requestedResources(); - foreach(const Resource *r, lst) { - if (r->type() == Resource::Type_Work) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80) -+ todo->addAttendee(KCalCore::Attendee(r->name(), r->email())); -+#else - todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email()))); -+#endif - } - } - } else { - foreach(const Resource *r, s->resources()) { - if (r->type() == Resource::Type_Work) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80) -+ todo->addAttendee(KCalCore::Attendee(r->name(), r->email())); -+#else - todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email()))); -+#endif - } - } - -@@ -398,7 +408,11 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node, - todo->setPercentComplete(task->completion().percentFinished()); - } - foreach(const Document *doc, node->documents().documents()) { -+#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 80) -+ todo->addAttachment(KCalCore::Attachment(doc->url().url())); -+#else - todo->addAttachment(KCalCore::Attachment::Ptr(new KCalCore::Attachment(doc->url().url()))); -+#endif - } - if (! parent.isNull()) { - todo->setRelatedTo(parent->uid(), KCalCore::Incidence::RelTypeParent); --- -cgit v1.1 - diff --git a/kde/patch/calligraplan/calligraplan.kcalendarcore.patch b/kde/patch/calligraplan/calligraplan.kcalendarcore.patch deleted file mode 100644 index 42aa135..0000000 --- a/kde/patch/calligraplan/calligraplan.kcalendarcore.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2f5505cf03ff865349d06e1d5c39007c52e7cd10 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Fri, 16 Aug 2019 15:49:09 +0200 -Subject: [PATCH] Fix headers after kcalcore->kcalendercore rename happened - ---- - .../filters/icalendar/export/icalendarexport.cpp | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/plugins/filters/icalendar/export/icalendarexport.cpp b/src/plugins/filters/icalendar/export/icalendarexport.cpp -index bb6b097d..729d6e50 100644 ---- a/src/plugins/filters/icalendar/export/icalendarexport.cpp -+++ b/src/plugins/filters/icalendar/export/icalendarexport.cpp -@@ -31,11 +31,11 @@ - #include - #include "kptdebug.h" - --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include - - #include - #include --- -2.22.1 - - diff --git a/kde/patch/calligraplan/calligraplan.missingheader.patch b/kde/patch/calligraplan/calligraplan.missingheader.patch deleted file mode 100644 index b5941c5..0000000 --- a/kde/patch/calligraplan/calligraplan.missingheader.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fe36bf6f0dc1f0c1e927850dd78093cfe3b7aae2 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Sun, 28 Jul 2019 00:07:33 +0200 -Subject: Fix compile on CI - -src/workpackage/view.h:148:31: error: field m_scheduleActions has incomplete type QMap ---- - src/workpackage/view.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/workpackage/view.h b/src/workpackage/view.h -index 6cae32b..cd2fc4e 100644 ---- a/src/workpackage/view.h -+++ b/src/workpackage/view.h -@@ -24,6 +24,7 @@ - - #include - -+#include - #include - - class QPrinter; --- -cgit v1.1 - diff --git a/kde/patch/calligraplan/calligraplan.qt-511.patch b/kde/patch/calligraplan/calligraplan.qt-511.patch deleted file mode 100644 index c0776fa..0000000 --- a/kde/patch/calligraplan/calligraplan.qt-511.patch +++ /dev/null @@ -1,125 +0,0 @@ -From f53805bdc108b608e40f217e6a78e7e4df4284f2 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -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 ---- - plan/src/kptview.h | 1 + - plan/src/kptviewlist.cpp | 1 + - plan/src/libs/ui/kptaccountseditor.cpp | 1 + - plan/src/libs/ui/kptdocumentspanel.h | 1 + - plan/src/libs/ui/kptitemviewsettup.cpp | 2 +- - plan/src/libs/ui/kpttaskeditor.cpp | 1 + - plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 + - plan/src/libs/widgets/KoPageLayoutWidget.cpp | 2 ++ - 15 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/plan/src/kptview.h b/plan/src/kptview.h -index 44d11935e71..a98e55342db 100644 ---- a/plan/src/kptview.h -+++ b/plan/src/kptview.h -@@ -28,6 +28,7 @@ - #include "kptcontext.h" - #include "kptviewbase.h" - -+#include - #include - #include - -diff --git a/plan/src/kptviewlist.cpp b/plan/src/kptviewlist.cpp -index f34e702e055..0e6db7b2ffe 100644 ---- a/plan/src/kptviewlist.cpp -+++ b/plan/src/kptviewlist.cpp -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - - #include -diff --git a/plan/src/libs/ui/kptaccountseditor.cpp b/plan/src/libs/ui/kptaccountseditor.cpp -index 7991fafd779..54e3a87c94f 100644 ---- a/plan/src/libs/ui/kptaccountseditor.cpp -+++ b/plan/src/libs/ui/kptaccountseditor.cpp -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - #include - #include -diff --git a/plan/src/libs/ui/kptdocumentspanel.h b/plan/src/libs/ui/kptdocumentspanel.h -index 00ea3af80b2..491cb1ebb86 100644 ---- a/plan/src/libs/ui/kptdocumentspanel.h -+++ b/plan/src/libs/ui/kptdocumentspanel.h -@@ -26,6 +26,7 @@ - - #include "kptdocuments.h" - -+#include - #include - #include - -diff --git a/plan/src/libs/ui/kptitemviewsettup.cpp b/plan/src/libs/ui/kptitemviewsettup.cpp -index d1c3b1fc157..7c97a070b9a 100644 ---- a/plan/src/libs/ui/kptitemviewsettup.cpp -+++ b/plan/src/libs/ui/kptitemviewsettup.cpp -@@ -25,9 +25,9 @@ - - #include "KoPageLayoutWidget.h" - -+#include - #include - -- - namespace KPlato - { - -diff --git a/plan/src/libs/ui/kpttaskeditor.cpp b/plan/src/libs/ui/kpttaskeditor.cpp -index 21546118d33..91db5acbb18 100644 ---- a/plan/src/libs/ui/kpttaskeditor.cpp -+++ b/plan/src/libs/ui/kpttaskeditor.cpp -@@ -45,6 +45,7 @@ - #include - #include - #include -+#include - #include - - #include -diff --git a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp -index 344ebc2b599..9146f06ab8c 100644 ---- a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp -+++ b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp -@@ -31,6 +31,7 @@ - #include - - #include -+#include - #include - #include - #include -diff --git a/plan/src/libs/widgets/KoPageLayoutWidget.cpp b/plan/src/libs/widgets/KoPageLayoutWidget.cpp -index c9e17b748a9..b67e9848807 100644 ---- a/plan/src/libs/widgets/KoPageLayoutWidget.cpp -+++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp -@@ -23,6 +23,8 @@ - - #include - -+#include -+ - class Q_DECL_HIDDEN KoPageLayoutWidget::Private - { - public: --- -2.16.2 - - -- cgit v1.2.3