From 3d54610cc075a625687df61dee0d40608ddcd8726cee1978555033ff31d596cd Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 25 Nov 2019 14:55:42 +0000 Subject: [PATCH] Accepting request 750765 from home:wolfi323:branches:KDE:Extra - Update to 3.2.0 - Drop patches merged upstream: * Fix-build-with-Qt-511.patch * Fix-compilation-after-recent-KCalCore-API-changes.patch * Fix-build-with-Qt-5_13.patch OBS-URL: https://build.opensuse.org/request/show/750765 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/calligra-plan?expand=0&rev=12 --- Fix-build-with-Qt-511.patch | 116 ------------------ Fix-build-with-Qt-5_13.patch | 20 --- ...on-after-recent-KCalCore-API-changes.patch | 71 ----------- calligra-plan.changes | 76 ++++++++++++ calligra-plan.spec | 26 ++-- calligraplan-3.1.0.tar.xz | 3 - calligraplan-3.2.0.tar.xz | 3 + 7 files changed, 86 insertions(+), 229 deletions(-) delete mode 100644 Fix-build-with-Qt-511.patch delete mode 100644 Fix-build-with-Qt-5_13.patch delete mode 100644 Fix-compilation-after-recent-KCalCore-API-changes.patch delete mode 100644 calligraplan-3.1.0.tar.xz create mode 100644 calligraplan-3.2.0.tar.xz diff --git a/Fix-build-with-Qt-511.patch b/Fix-build-with-Qt-511.patch deleted file mode 100644 index 358f294..0000000 --- a/Fix-build-with-Qt-511.patch +++ /dev/null @@ -1,116 +0,0 @@ -commit a7ebecb9fbee2190e649c44ed53f1299013baa30 -Author: Andreas Sturmlechner -Date: Sun Mar 18 11:56:57 2018 +0100 - - Fix build with Qt 5.11 (missing headers) - - Reviewers: #calligra:_3.0, anthonyfieroni, danders - - Reviewed By: #calligra:_3.0, anthonyfieroni, danders - - Subscribers: anthonyfieroni, danders - - Tags: #calligra:_3.0 - - Differential Revision: https://phabricator.kde.org/D11454 - -diff --git a/src/kptview.h b/src/kptview.h -index 44d1193..a98e553 100644 ---- a/src/kptview.h -+++ b/src/kptview.h -@@ -28,6 +28,7 @@ - #include "kptcontext.h" - #include "kptviewbase.h" - -+#include - #include - #include - -diff --git a/src/kptviewlist.cpp b/src/kptviewlist.cpp -index f34e702..0e6db7b 100644 ---- a/src/kptviewlist.cpp -+++ b/src/kptviewlist.cpp -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - - #include -diff --git a/src/libs/ui/kptaccountseditor.cpp b/src/libs/ui/kptaccountseditor.cpp -index 7991faf..54e3a87 100644 ---- a/src/libs/ui/kptaccountseditor.cpp -+++ b/src/libs/ui/kptaccountseditor.cpp -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - #include - #include -diff --git a/src/libs/ui/kptdocumentspanel.h b/src/libs/ui/kptdocumentspanel.h -index 00ea3af..491cb1e 100644 ---- a/src/libs/ui/kptdocumentspanel.h -+++ b/src/libs/ui/kptdocumentspanel.h -@@ -26,6 +26,7 @@ - - #include "kptdocuments.h" - -+#include - #include - #include - -diff --git a/src/libs/ui/kptitemviewsettup.cpp b/src/libs/ui/kptitemviewsettup.cpp -index d1c3b1f..7c97a07 100644 ---- a/src/libs/ui/kptitemviewsettup.cpp -+++ b/src/libs/ui/kptitemviewsettup.cpp -@@ -25,9 +25,9 @@ - - #include "KoPageLayoutWidget.h" - -+#include - #include - -- - namespace KPlato - { - -diff --git a/src/libs/ui/kpttaskeditor.cpp b/src/libs/ui/kpttaskeditor.cpp -index 5f79abf..d08d7f2 100644 ---- a/src/libs/ui/kpttaskeditor.cpp -+++ b/src/libs/ui/kpttaskeditor.cpp -@@ -45,6 +45,7 @@ - #include - #include - #include -+#include - #include - - #include -diff --git a/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp -index 344ebc2..9146f06 100644 ---- a/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp -+++ b/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp -@@ -31,6 +31,7 @@ - #include - - #include -+#include - #include - #include - #include -diff --git a/src/libs/widgets/KoPageLayoutWidget.cpp b/src/libs/widgets/KoPageLayoutWidget.cpp -index c9e17b7..b67e984 100644 ---- a/src/libs/widgets/KoPageLayoutWidget.cpp -+++ b/src/libs/widgets/KoPageLayoutWidget.cpp -@@ -23,6 +23,8 @@ - - #include - -+#include -+ - class Q_DECL_HIDDEN KoPageLayoutWidget::Private - { - public: diff --git a/Fix-build-with-Qt-5_13.patch b/Fix-build-with-Qt-5_13.patch deleted file mode 100644 index fb75268..0000000 --- a/Fix-build-with-Qt-5_13.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit fe36bf6f0dc1f0c1e927850dd78093cfe3b7aae2 -Author: Albert Astals Cid -Date: Sun Jul 28 00:07:33 2019 +0200 - - Fix compile on CI - - src/workpackage/view.h:148:31: error: field m_scheduleActions has incomplete type QMap - -diff --git a/src/workpackage/view.h b/src/workpackage/view.h -index 6cae32b7..cd2fc4ea 100644 ---- a/src/workpackage/view.h -+++ b/src/workpackage/view.h -@@ -24,6 +24,7 @@ - - #include - -+#include - #include - - class QPrinter; diff --git a/Fix-compilation-after-recent-KCalCore-API-changes.patch b/Fix-compilation-after-recent-KCalCore-API-changes.patch deleted file mode 100644 index 304724b..0000000 --- a/Fix-compilation-after-recent-KCalCore-API-changes.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 2d484fda1b31a72659088a4bfce5c3708e923cb0 Mon Sep 17 00:00:00 2001 -From: David Faure -Date: Tue, 23 Jul 2019 12:20:29 +0200 -Subject: Fix compilation after recent KCalCore API changes - ---- - .../filters/icalendar/export/icalendarexport.cpp | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) - -diff --git a/src/plugins/filters/icalendar/export/icalendarexport.cpp b/src/plugins/filters/icalendar/export/icalendarexport.cpp -index 757d693..5eba36b 100644 ---- a/src/plugins/filters/icalendar/export/icalendarexport.cpp -+++ b/src/plugins/filters/icalendar/export/icalendarexport.cpp -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -140,9 +141,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_VERSION >= QT_VERSION_CHECK(5, 11, 80) -+ KCalCore::Person p = KCalCore::Person::fromFullName(node->leader()); -+ 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())); - a->setRole(KCalCore::Attendee::NonParticipant); -+#endif - todo->addAttendee(a); - } - DateTime st = node->startTime(id); -@@ -161,13 +168,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 - } - } - -@@ -178,7 +193,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); diff --git a/calligra-plan.changes b/calligra-plan.changes index ff70726..d3754b1 100644 --- a/calligra-plan.changes +++ b/calligra-plan.changes @@ -1,3 +1,79 @@ +------------------------------------------------------------------- +Thu Nov 14 10:48:45 UTC 2019 - Wolfgang Bauer + +- Update to 3.2.0 +- General: + * Add drag/drop and copy/paste using text/html and text/plain + mimetypes + * Landscape printing/export was not possible (kde#412063) + * Add project templates + * calligraplan didn't load translations from calligraplanlibs.mo + (kde#412325) + * Add hyper link handling to description editor + * Use project name in recent projects list instead of file name + * Collect project settings into separate Project menu + * Add view options to the View menu + * Open description from treeviews on doubleclick + * Improve edit/view Documents + * Add documents to project dialog + * Add dialog to reload assignments of shared resources + * Always save currency in case project is opened in a different + locale + * Fix crash when creating new project with separate holiday + calendar +- Help and Documentation: + * Help is provided using What's this (Shift-F1) + * Documentation has been improved (still WIP) +- Task editor: + * Add copy/paste of tasks, also possible using drag/drop + * Allow to indent/unindent multiple tasks (kde#412749) + * Add option to specify dependencies manually (kde#412341) + * Allow for entering estimates in minutes (kde#412134) + * Add priority feature, use value for levelling/scheduling + (kde#309038) + * Allow to drag/drop non-baselined tasks on a baselined project + * Fix bug "Unable to delete tasks" (kde#406127) + * TaskModules: Improve task modules handling +- Dependency Editor: + * Fix bug in Finish-Finish dependency check in dependency editor + (kde#401511) +- Scheduling: + * Add automatic scheduling mode + * Use task priority (kde#309038) + * Handle removed task/resource during scheduling + * Fix crash on close when scheduling is running +- Ganttview: + * Enable editing of completion + * Extend the "View" menu (Zoom, Scale, Timeformat, Year Format, + Grid) in Gantt view mode (kde#284361) + * Add timeline + * Add contextmenu -> Show Unscheduled Tasks + * Trigger an update of the chart when project start may have + changed + * Enable context menu from gantt chart +- Performance charts: + * Coordinate rubberband selection, drag&drop and context menus +- Reports: + * Improve report templates and generation + * Add documentation +- Filters: + * ICalExport filter: Enable user to choose what to export + * Add import filter for Gnome Planner project files +- Workpackage handling: + * Improve workpackage handling + * Fix bug in merging workpackage used effort (kde#287563) + * Fix "Can not edit a progress entry of a task" (kde#342574), + improve progress dialog in general +- PlanWork: + * Enable opening documents from gantt view + * Enable sorting gantt view + * Fix sorting by dattime + * Mark finished tasks with a checkmark +- Drop patches merged upstream: + * Fix-build-with-Qt-511.patch + * Fix-compilation-after-recent-KCalCore-API-changes.patch + * Fix-build-with-Qt-5_13.patch + ------------------------------------------------------------------- Mon Aug 12 08:51:32 UTC 2019 - Christophe Giboudeaux diff --git a/calligra-plan.spec b/calligra-plan.spec index 4da7aae..6a07b7c 100644 --- a/calligra-plan.spec +++ b/calligra-plan.spec @@ -17,30 +17,23 @@ Name: calligra-plan -Version: 3.1.0 +Version: 3.2.0 Release: 0 Summary: Project Management Application License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later Group: Productivity/Office/Suite URL: https://www.calligra.org/ Source0: https://download.kde.org/stable/calligra/%{version}/calligraplan-%{version}.tar.xz -# PATCH-FIX-UPSTREAM -- Fix-build-with-Qt-511.patch -Patch0: Fix-build-with-Qt-511.patch -# PATCH-FIX-UPSTREAM -Patch1: Fix-compilation-after-recent-KCalCore-API-changes.patch -# PATCH-FIX-UPSTREAM -Patch2: Fix-build-with-Qt-5_13.patch BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem +BuildRequires: perl-base BuildRequires: update-desktop-files +BuildRequires: zlib-devel BuildRequires: cmake(KChart) BuildRequires: cmake(KF5Activities) -BuildRequires: cmake(KF5AkonadiContact) BuildRequires: cmake(KF5Archive) -BuildRequires: cmake(KF5CalendarCore) BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5Contacts) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5DBusAddons) BuildRequires: cmake(KF5GuiAddons) @@ -50,7 +43,6 @@ BuildRequires: cmake(KF5IconThemes) BuildRequires: cmake(KF5Init) BuildRequires: cmake(KF5ItemViews) BuildRequires: cmake(KF5JobWidgets) -BuildRequires: cmake(KF5KCMUtils) BuildRequires: cmake(KF5KHtml) BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5Notifications) @@ -61,15 +53,11 @@ BuildRequires: cmake(KF5WidgetsAddons) BuildRequires: cmake(KF5WindowSystem) BuildRequires: cmake(KF5XmlGui) BuildRequires: cmake(KGantt) -BuildRequires: cmake(KPropertyWidgets) -BuildRequires: cmake(KReport) +BuildRequires: cmake(Qca-qt5) BuildRequires: cmake(Qt5Core) BuildRequires: cmake(Qt5DBus) BuildRequires: cmake(Qt5Gui) -BuildRequires: cmake(Qt5Network) -BuildRequires: cmake(Qt5OpenGL) BuildRequires: cmake(Qt5PrintSupport) -BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5X11Extras) @@ -85,7 +73,7 @@ Plan is the project management application of the Calligra Suite. %lang_package %prep -%autosetup -p1 -n calligraplan-%{version} +%setup -q -n calligraplan-%{version} %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} @@ -99,7 +87,7 @@ Plan is the project management application of the Calligra Suite. %suse_update_desktop_file -r org.kde.calligraplanwork Qt KDE Office ProjectManagement # not needed -rm %{buildroot}/%{_kf5_libdir}/libkplato*.so %{buildroot}/%{_kf5_libdir}/libplan*.so +rm %{buildroot}/%{_kf5_libdir}/libplan*.so %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -113,12 +101,12 @@ rm %{buildroot}/%{_kf5_libdir}/libkplato*.so %{buildroot}/%{_kf5_libdir}/libplan %{_kf5_appstreamdir}/org.kde.calligraplan.appdata.xml %{_kf5_bindir}/calligraplan %{_kf5_bindir}/calligraplanwork +%dir %{_kf5_configkcfgdir} %{_kf5_configkcfgdir}/calligraplan*.kcfg %{_kf5_iconsdir}/hicolor/ %{_kf5_kxmlguidir}/calligraplan/ %{_kf5_kxmlguidir}/calligraplanwork/ %{_kf5_libdir}/libkdeinit5_calligraplan*.so -%{_kf5_libdir}/libkplato*.so.* %{_kf5_libdir}/libplan*.so.* %{_kf5_plugindir}/calligraplan/ %{_kf5_plugindir}/calligraplanworkpart.so diff --git a/calligraplan-3.1.0.tar.xz b/calligraplan-3.1.0.tar.xz deleted file mode 100644 index d69e773..0000000 --- a/calligraplan-3.1.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:59f985bae0482789c13c9440af3bf5da0a1d04756c1c1ccf39f68f66cd3e7ddd -size 3617600 diff --git a/calligraplan-3.2.0.tar.xz b/calligraplan-3.2.0.tar.xz new file mode 100644 index 0000000..9e34857 --- /dev/null +++ b/calligraplan-3.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a12995a129b3c13cd8a12e8efe17a27be86bc42afefc5cb2c62d6797ed4301ce +size 3416652