From fdea3a36b4f1dbbb9de4a8ab405630bfd1b8c90ccda978f6ee9b34ae7f5f2fe3 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sun, 3 Jun 2018 17:31:06 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/calligra-plan?expand=0&rev=6 --- Fix-build-with-Qt-511.patch | 116 ++++++++++++++++++++++++++++++++++++ calligra-plan.changes | 6 ++ calligra-plan.spec | 40 ++++++------- 3 files changed, 142 insertions(+), 20 deletions(-) create mode 100644 Fix-build-with-Qt-511.patch diff --git a/Fix-build-with-Qt-511.patch b/Fix-build-with-Qt-511.patch new file mode 100644 index 0000000..6d0562c --- /dev/null +++ b/Fix-build-with-Qt-511.patch @@ -0,0 +1,116 @@ +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/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: diff --git a/calligra-plan.changes b/calligra-plan.changes index f855277..550ec0e 100644 --- a/calligra-plan.changes +++ b/calligra-plan.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jun 3 17:26:40 UTC 2018 - christophe@krop.fr + +- Add Fix-build-with-Qt-511.patch. +- Run spec-cleaner. + ------------------------------------------------------------------- Wed Mar 28 10:48:14 UTC 2018 - wbauer@tmo.at diff --git a/calligra-plan.spec b/calligra-plan.spec index 2085d30..a40f28a 100644 --- a/calligra-plan.spec +++ b/calligra-plan.spec @@ -20,14 +20,17 @@ Name: calligra-plan 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(KF5GuiAddons) 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(Qt5Test) 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 @@ Plan is the project management application of the Calligra Suite. %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 @@ Plan is the project management application of the Calligra Suite. %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