From 8ff736edf06651586e6cf1d8751d52495281aea3258300197d9cbaf6e26e34ca Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 12 Aug 2019 09:00:37 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/calligra-plan?expand=0&rev=10 --- 0001-Plan-fix-build-with-Qt-5.6.patch | 33 ---------- Fix-build-with-Qt-511.patch | 64 +++++++++---------- Fix-build-with-Qt-5_13.patch | 20 ++++++ ...on-after-recent-KCalCore-API-changes.patch | 11 ++-- calligra-plan.changes | 8 +++ calligra-plan.spec | 18 +++--- 6 files changed, 73 insertions(+), 81 deletions(-) delete mode 100644 0001-Plan-fix-build-with-Qt-5.6.patch create mode 100644 Fix-build-with-Qt-5_13.patch diff --git a/0001-Plan-fix-build-with-Qt-5.6.patch b/0001-Plan-fix-build-with-Qt-5.6.patch deleted file mode 100644 index 5c65db8..0000000 --- a/0001-Plan-fix-build-with-Qt-5.6.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 44b9a00de3d484bd469fa3a5ca7b666406908940 Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer -Date: Tue, 20 Mar 2018 10:29:23 +0100 -Subject: [PATCH] Plan: fix build with Qt 5.6 - -The QAction constructor takes two arguments, text and parent. - The parent argument is optional since Qt 5.7 only, it needs to be -specified with earlier versions. - -Also, text should actually be a QString, so use QStringLiteral() to -"convert" it. - -Differential Revision: https://phabricator.kde.org/D11505 ---- - plan/src/libs/ui/kpttaskeditor.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plan/src/libs/ui/kpttaskeditor.cpp b/plan/src/libs/ui/kpttaskeditor.cpp -index 5f79abfd917..f2da3ab3349 100644 ---- a/plan/src/libs/ui/kpttaskeditor.cpp -+++ b/plan/src/libs/ui/kpttaskeditor.cpp -@@ -622,7 +622,7 @@ void TaskEditor::slotContextMenuRequested( const QModelIndex& index, const QPoin - void TaskEditor::editTasks(const QList &tasks, const QPoint &pos) - { - QList lst; -- QAction tasksEdit("Edit..."); -+ QAction tasksEdit(QStringLiteral("Edit..."), nullptr); - if (!tasks.isEmpty()) { - TasksEditController *ted = new TasksEditController(*project(), tasks, this); - connect(&tasksEdit, SIGNAL(triggered(bool)), ted, SLOT(activate())); --- -2.13.6 - diff --git a/Fix-build-with-Qt-511.patch b/Fix-build-with-Qt-511.patch index 6d0562c..358f294 100644 --- a/Fix-build-with-Qt-511.patch +++ b/Fix-build-with-Qt-511.patch @@ -14,10 +14,10 @@ Date: Sun Mar 18 11:56:57 2018 +0100 Differential Revision: https://phabricator.kde.org/D11454 -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 +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" @@ -26,10 +26,10 @@ index 44d11935e71..a98e55342db 100644 #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 +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 @@ -38,10 +38,10 @@ index f34e702e055..0e6db7b2ffe 100644 #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 +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 @@ -50,10 +50,10 @@ index 7991fafd779..54e3a87c94f 100644 #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 +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" @@ -62,10 +62,10 @@ index 00ea3af80b2..491cb1ebb86 100644 #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 +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" @@ -77,10 +77,10 @@ index d1c3b1fc157..7c97a070b9a 100644 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 +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 @@ -89,10 +89,10 @@ index 21546118d33..91db5acbb18 100644 #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 +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 @@ -101,10 +101,10 @@ index 344ebc2b599..9146f06ab8c 100644 #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 +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 diff --git a/Fix-build-with-Qt-5_13.patch b/Fix-build-with-Qt-5_13.patch new file mode 100644 index 0000000..fb75268 --- /dev/null +++ b/Fix-build-with-Qt-5_13.patch @@ -0,0 +1,20 @@ +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 index 87cf8a2..304724b 100644 --- a/Fix-compilation-after-recent-KCalCore-API-changes.patch +++ b/Fix-compilation-after-recent-KCalCore-API-changes.patch @@ -7,10 +7,10 @@ Subject: Fix compilation after recent KCalCore API changes .../filters/icalendar/export/icalendarexport.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) -diff --git a/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp b/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp -index 757d693..daf1c2d 100644 ---- a/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp -+++ b/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp +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 @@ -69,6 +69,3 @@ index 757d693..daf1c2d 100644 } if (! parent.isNull()) { todo->setRelatedTo(parent->uid(), KCalCore::Incidence::RelTypeParent); --- -cgit v1.1 - diff --git a/calligra-plan.changes b/calligra-plan.changes index faace26..ff70726 100644 --- a/calligra-plan.changes +++ b/calligra-plan.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Aug 12 08:51:32 UTC 2019 - Christophe Giboudeaux + +- Add Fix-build-with-Qt-5_13.patch +- Drop 0001-Plan-fix-build-with-Qt-5.6.patch. Fixed upstream +- Refresh Fix-build-with-Qt-511.patch +- Refresh Fix-compilation-after-recent-KCalCore-API-changes.patch + ------------------------------------------------------------------- Sat Jul 27 11:37:57 UTC 2019 - wbauer@tmo.at diff --git a/calligra-plan.spec b/calligra-plan.spec index 4a0ab54..4da7aae 100644 --- a/calligra-plan.spec +++ b/calligra-plan.spec @@ -1,7 +1,7 @@ # # spec file for package calligra-plan # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -22,14 +22,14 @@ 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: http://www.calligra.org/ -Source0: http://download.kde.org/stable/calligra/%{version}/calligraplan-%{version}.tar.xz -# PATCH-FIX-UPSTREAM -Patch0: 0001-Plan-fix-build-with-Qt-5.6.patch +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 -Patch1: Fix-build-with-Qt-511.patch +Patch0: Fix-build-with-Qt-511.patch # PATCH-FIX-UPSTREAM -Patch2: Fix-compilation-after-recent-KCalCore-API-changes.patch +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: update-desktop-files @@ -85,7 +85,7 @@ Plan is the project management application of the Calligra Suite. %lang_package %prep -%autosetup -p2 -n calligraplan-%{version} +%autosetup -p1 -n calligraplan-%{version} %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}