Hello community, here is the log from the commit of package calligra-plan for openSUSE:Factory checked in at 2018-06-04 13:22:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calligra-plan (Old) and /work/SRC/openSUSE:Factory/.calligra-plan.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calligra-plan" Mon Jun 4 13:22:20 2018 rev:3 rq:613795 version:3.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/calligra-plan/calligra-plan.changes 2018-04-19 15:31:32.593997224 +0200 +++ /work/SRC/openSUSE:Factory/.calligra-plan.new/calligra-plan.changes 2018-06-04 13:23:12.615126101 +0200 @@ -1,0 +2,6 @@ +Sun Jun 3 17:26:40 UTC 2018 - [email protected] + +- Add Fix-build-with-Qt-511.patch. +- Run spec-cleaner. + +------------------------------------------------------------------- New: ---- Fix-build-with-Qt-511.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra-plan.spec ++++++ --- /var/tmp/diff_new_pack.rM6WCx/_old 2018-06-04 13:23:13.531092560 +0200 +++ /var/tmp/diff_new_pack.rM6WCx/_new 2018-06-04 13:23:13.535092413 +0200 @@ -20,14 +20,17 @@ Version: 3.1.0 Release: 0 Summary: Project Management Application -License: GPL-2.0 and GPL-2.0+ and LGPL-2.1+ +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/ +URL: http://www.calligra.org/ Source0: http://download.kde.org/stable/calligra/%{version}/calligraplan-%{version}.tar.xz # PATCH-FIX-UPSTREAM -Patch: 0001-Plan-fix-build-with-Qt-5.6.patch +Patch0: 0001-Plan-fix-build-with-Qt-5.6.patch +# PATCH-FIX-UPSTREAM -- Fix-build-with-Qt-511.patch +Patch1: Fix-build-with-Qt-511.patch BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem +BuildRequires: update-desktop-files BuildRequires: cmake(KChart) BuildRequires: cmake(KF5Activities) BuildRequires: cmake(KF5AkonadiContact) @@ -42,8 +45,8 @@ BuildRequires: cmake(KF5Holidays) BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5IconThemes) -BuildRequires: cmake(KF5ItemViews) BuildRequires: cmake(KF5Init) +BuildRequires: cmake(KF5ItemViews) BuildRequires: cmake(KF5JobWidgets) BuildRequires: cmake(KF5KCMUtils) BuildRequires: cmake(KF5KHtml) @@ -69,12 +72,10 @@ BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5X11Extras) BuildRequires: cmake(Qt5Xml) -BuildRequires: update-desktop-files Recommends: %{name}-lang = %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Obsoletes: calligra5-plan # some icons were part of the main calligra package before 3.1.0 Conflicts: calligra < 3.1.0 +Obsoletes: calligra5-plan %description Plan is the project management application of the Calligra Suite. @@ -82,8 +83,7 @@ %lang_package %prep -%setup -q -n calligraplan-%{version} -%patch -p2 +%autosetup -p2 -n calligraplan-%{version} %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} @@ -91,38 +91,38 @@ %install %kf5_makeinstall -C build -%kf5_find_lang %{name} +%{kf5_find_lang} %{name} %suse_update_desktop_file -r org.kde.calligraplan Qt KDE Office ProjectManagement %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}/libkplato*.so %{buildroot}/%{_kf5_libdir}/libplan*.so %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) +%license COPYING* +%doc CHANGELOG %config %{_kf5_configdir}/calligra*rc +%{_kf5_applicationsdir}/org.kde.calligraplan.desktop +%{_kf5_applicationsdir}/org.kde.calligraplanwork.desktop +%{_kf5_appstreamdir}/org.kde.calligraplan.appdata.xml %{_kf5_bindir}/calligraplan %{_kf5_bindir}/calligraplanwork +%{_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_appstreamdir}/org.kde.calligraplan.appdata.xml -%{_kf5_applicationsdir}/org.kde.calligraplan.desktop -%{_kf5_applicationsdir}/org.kde.calligraplanwork.desktop -%{_kf5_iconsdir}/hicolor/ -%{_kf5_configkcfgdir}/calligraplan*.kcfg %{_kf5_plugindir}/calligraplan/ %{_kf5_plugindir}/calligraplanworkpart.so %{_kf5_sharedir}/calligraplan/ %{_kf5_sharedir}/calligraplanwork/ -%{_kf5_kxmlguidir}/calligraplan/ -%{_kf5_kxmlguidir}/calligraplanwork/ %files lang -f %{name}.lang -%defattr(-,root,root,-) %changelog ++++++ Fix-build-with-Qt-511.patch ++++++ commit a7ebecb9fbee2190e649c44ed53f1299013baa30 Author: Andreas Sturmlechner <[email protected]> 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/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 <QActionGroup> #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 @@ -25,6 +25,7 @@ #include <QStyle> #include <QBrush> #include <QContextMenuEvent> +#include <QHeaderView> #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 @@ -40,6 +40,7 @@ #include <QContextMenuEvent> #include <QMenu> #include <QAction> +#include <QHeaderView> #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 @@ -26,6 +26,7 @@ #include "kptdocuments.h" +#include <QModelIndexList> #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 @@ -25,9 +25,9 @@ #include "KoPageLayoutWidget.h" +#include <QHeaderView> #include <QPushButton> - 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 <QVBoxLayout> #include <QDragMoveEvent> #include <QAction> +#include <QHeaderView> #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 @@ -31,6 +31,7 @@ #include <KFile> #include <QAction> +#include <QHeaderView> #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 @@ -23,6 +23,8 @@ #include <KoUnit.h> +#include <QButtonGroup> + class Q_DECL_HIDDEN KoPageLayoutWidget::Private { public:
