Hello community, here is the log from the commit of package calligra-plan for openSUSE:Factory checked in at 2020-06-05 20:19:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calligra-plan (Old) and /work/SRC/openSUSE:Factory/.calligra-plan.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calligra-plan" Fri Jun 5 20:19:44 2020 rev:9 rq:811557 version:3.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/calligra-plan/calligra-plan.changes 2019-12-14 12:24:15.867191307 +0100 +++ /work/SRC/openSUSE:Factory/.calligra-plan.new.3606/calligra-plan.changes 2020-06-05 20:25:35.960826109 +0200 @@ -1,0 +2,6 @@ +Thu Jun 4 15:50:23 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Add patch to build with Qt 5.15: + * 0001-Fix-build-with-Qt-5.15.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-build-with-Qt-5.15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra-plan.spec ++++++ --- /var/tmp/diff_new_pack.yr22ZP/_old 2020-06-05 20:25:39.236837065 +0200 +++ /var/tmp/diff_new_pack.yr22ZP/_new 2020-06-05 20:25:39.240837078 +0200 @@ -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 @@ 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 @@ %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 ++++++ 0001-Fix-build-with-Qt-5.15.patch ++++++ >From 46f0dabb9a5b995aba7b0cef53284b23d94e4266 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Thu, 4 Jun 2020 17:49:50 +0200 Subject: [PATCH] Fix build with Qt 5.15 --- 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 --- 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> 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
