From 1ef25a03a1c5ac6f91c33ae84de7c05f69f9a56fb4832105568dbb7605d8dd3c Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Thu, 4 Jun 2020 15:51:32 +0000
Subject: [PATCH 1/2] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Extra/calligra-plan?expand=0&rev=18

---
 0001-Fix-build-with-Qt-5.15.patch | 24 ++++++++++++++++++++++++
 calligra-plan.changes             |  6 ++++++
 calligra-plan.spec                |  8 +++++---
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 0001-Fix-build-with-Qt-5.15.patch

diff --git a/0001-Fix-build-with-Qt-5.15.patch b/0001-Fix-build-with-Qt-5.15.patch
new file mode 100644
index 0000000..9135ea0
--- /dev/null
+++ b/0001-Fix-build-with-Qt-5.15.patch
@@ -0,0 +1,24 @@
+From c86388502432049103c3d961610163b653b0a875 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Thu, 4 Jun 2020 17:49:50 +0200
+Subject: [PATCH] Fix build with Qt 5.15
+
+---
+ src/libs/main/KoDocument.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libs/main/KoDocument.cpp b/src/libs/main/KoDocument.cpp
+index 76ecad05..2eeb76b1 100644
+--- a/src/libs/main/KoDocument.cpp
++++ b/src/libs/main/KoDocument.cpp
+@@ -69,6 +69,7 @@
+ #include <QDir>
+ #include <QFileInfo>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QTimer>
+ #ifndef QT_NO_DBUS
+ #include <KJobWidgets>
+-- 
+2.26.2
+
diff --git a/calligra-plan.changes b/calligra-plan.changes
index a713def..446e07f 100644
--- a/calligra-plan.changes
+++ b/calligra-plan.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun  4 15:50:23 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Add patch to build with Qt 5.15:
+  * 0001-Fix-build-with-Qt-5.15.patch
+
 -------------------------------------------------------------------
 Fri Dec 13 23:01:17 UTC 2019 - Wolfgang Bauer <wbauer@tmo.at>
 
diff --git a/calligra-plan.spec b/calligra-plan.spec
index 042d928..7daaa86 100644
--- a/calligra-plan.spec
+++ b/calligra-plan.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package calligra-plan
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -24,6 +24,8 @@ 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
+Patch0:         0001-Fix-build-with-Qt-5.15.patch
 BuildRequires:  extra-cmake-modules
 BuildRequires:  kf5-filesystem
 BuildRequires:  perl-base
@@ -72,11 +74,11 @@ Plan is the project management application of the Calligra Suite.
 %lang_package
 
 %prep
-%setup -q -n calligraplan-%{version}
+%autosetup -p1 -n calligraplan-%{version}
 
 %build
 %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
-%make_jobs
+%cmake_build
 
 %install
 %kf5_makeinstall -C build

From aed239fe9a7ed2252714c455c121bad5c6f656f85c9472262513ca209800127b Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux <christophe@krop.fr>
Date: Thu, 4 Jun 2020 15:55:59 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/KDE:Extra/calligra-plan?expand=0&rev=19

---
 0001-Fix-build-with-Qt-5.15.patch | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/0001-Fix-build-with-Qt-5.15.patch b/0001-Fix-build-with-Qt-5.15.patch
index 9135ea0..f9f3c47 100644
--- a/0001-Fix-build-with-Qt-5.15.patch
+++ b/0001-Fix-build-with-Qt-5.15.patch
@@ -1,11 +1,12 @@
-From c86388502432049103c3d961610163b653b0a875 Mon Sep 17 00:00:00 2001
+From 46f0dabb9a5b995aba7b0cef53284b23d94e4266 Mon Sep 17 00:00:00 2001
 From: Christophe Giboudeaux <christophe@krop.fr>
 Date: Thu, 4 Jun 2020 17:49:50 +0200
 Subject: [PATCH] Fix build with Qt 5.15
 
 ---
- src/libs/main/KoDocument.cpp | 1 +
- 1 file changed, 1 insertion(+)
+ src/libs/main/KoDocument.cpp         | 1 +
+ src/libs/ui/kptganttitemdelegate.cpp | 1 +
+ 2 files changed, 2 insertions(+)
 
 diff --git a/src/libs/main/KoDocument.cpp b/src/libs/main/KoDocument.cpp
 index 76ecad05..2eeb76b1 100644
@@ -19,6 +20,18 @@ index 76ecad05..2eeb76b1 100644
  #include <QTimer>
  #ifndef QT_NO_DBUS
  #include <KJobWidgets>
+diff --git a/src/libs/ui/kptganttitemdelegate.cpp b/src/libs/ui/kptganttitemdelegate.cpp
+index 04217da4..d2f3e6d8 100644
+--- a/src/libs/ui/kptganttitemdelegate.cpp
++++ b/src/libs/ui/kptganttitemdelegate.cpp
+@@ -28,6 +28,7 @@
+ #include <QModelIndex>
+ #include <QApplication>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QLocale>
+ 
+ #include <KLocalizedString>
 -- 
 2.26.2