Hello community, here is the log from the commit of package calligra-plan for openSUSE:Factory checked in at 2019-08-13 13:22:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calligra-plan (Old) and /work/SRC/openSUSE:Factory/.calligra-plan.new.9556 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calligra-plan" Tue Aug 13 13:22:52 2019 rev:5 rq:722611 version:3.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/calligra-plan/calligra-plan.changes 2019-07-29 17:29:12.614239602 +0200 +++ /work/SRC/openSUSE:Factory/.calligra-plan.new.9556/calligra-plan.changes 2019-08-13 13:23:08.645388706 +0200 @@ -1,0 +2,8 @@ +Mon Aug 12 08:51:32 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- 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 + +------------------------------------------------------------------- Old: ---- 0001-Plan-fix-build-with-Qt-5.6.patch New: ---- Fix-build-with-Qt-5_13.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra-plan.spec ++++++ --- /var/tmp/diff_new_pack.35tNTn/_old 2019-08-13 13:23:09.217388555 +0200 +++ /var/tmp/diff_new_pack.35tNTn/_new 2019-08-13 13:23:09.221388554 +0200 @@ -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 @@ 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 +Patch1: Fix-compilation-after-recent-KCalCore-API-changes.patch # PATCH-FIX-UPSTREAM -Patch2: Fix-compilation-after-recent-KCalCore-API-changes.patch +Patch2: Fix-build-with-Qt-5_13.patch BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem BuildRequires: update-desktop-files @@ -85,7 +85,7 @@ %lang_package %prep -%autosetup -p2 -n calligraplan-%{version} +%autosetup -p1 -n calligraplan-%{version} %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} ++++++ Fix-build-with-Qt-511.patch ++++++ --- /var/tmp/diff_new_pack.35tNTn/_old 2019-08-13 13:23:09.233388551 +0200 +++ /var/tmp/diff_new_pack.35tNTn/_new 2019-08-13 13:23:09.233388551 +0200 @@ -14,10 +14,10 @@ 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 @@ #include <QDockWidget> #include <QMap> -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 <QStyle> #include <QBrush> @@ -38,10 +38,10 @@ #include <QMenu> #include <kmessagebox.h> -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 <QContextMenuEvent> #include <QMenu> @@ -50,10 +50,10 @@ #include <KLocalizedString> #include <kactioncollection.h> -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 @@ #include <QWidget> #include <kundo2qstack.h> -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 @@ 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 <QVBoxLayout> #include <QDragMoveEvent> @@ -89,10 +89,10 @@ #include <QMenu> #include <kactionmenu.h> -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 <KFile> @@ -101,10 +101,10 @@ #include <QTreeView> #include <QStandardItemModel> #include <QModelIndex> -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 <KoUnit.h> ++++++ Fix-build-with-Qt-5_13.patch ++++++ commit fe36bf6f0dc1f0c1e927850dd78093cfe3b7aae2 Author: Albert Astals Cid <[email protected]> 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<QAction*, KPlato::Schedule*> 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 <KoView.h> +#include <QMap> #include <QStackedWidget> class QPrinter; ++++++ Fix-compilation-after-recent-KCalCore-API-changes.patch ++++++ --- /var/tmp/diff_new_pack.35tNTn/_old 2019-08-13 13:23:09.245388548 +0200 +++ /var/tmp/diff_new_pack.35tNTn/_new 2019-08-13 13:23:09.245388548 +0200 @@ -7,10 +7,10 @@ .../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 <kcalcore/attachment.h> #include <kcalcore/icalformat.h> @@ -69,6 +69,3 @@ } if (! parent.isNull()) { todo->setRelatedTo(parent->uid(), KCalCore::Incidence::RelTypeParent); --- -cgit v1.1 -
