Hello community,
here is the log from the commit of package calligra for openSUSE:Factory checked in at 2018-06-04 13:22:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/calligra (Old)
and /work/SRC/openSUSE:Factory/.calligra.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calligra"
Mon Jun 4 13:22:22 2018 rev:70 rq:613797 version:3.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/calligra/calligra.changes 2018-03-22 12:10:19.890459403 +0100
+++ /work/SRC/openSUSE:Factory/.calligra.new/calligra.changes 2018-06-04 13:23:15.155033094 +0200
@@ -1,0 +2,6 @@
+Sun Jun 3 16:56:13 UTC 2018 - christophe@krop.fr
+
+- Add Fix-build-with-Qt-511.patch
+- Run spec-cleaner
+
+-------------------------------------------------------------------
New:
----
Fix-build-with-Qt-511.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ calligra.spec ++++++
--- /var/tmp/diff_new_pack.zcRucq/_old 2018-06-04 13:23:16.474984760 +0200
+++ /var/tmp/diff_new_pack.zcRucq/_new 2018-06-04 13:23:16.474984760 +0200
@@ -20,21 +20,18 @@
Version: 3.1.0
Release: 0
Summary: Libraries and Base Files for the KDE Office Suite
-License: GPL-2.0+ and LGPL-2.1+ and GFDL-1.2
+License: GPL-2.0-or-later AND LGPL-2.1-or-later AND GFDL-1.2-only
Group: Productivity/Office/Suite
-Url: http://www.calligra.org/
+URL: http://www.calligra.org/
Source0: http://download.kde.org/stable/%{name}/%{version}/%{name}-%{version}.tar.xz
+# PATCH-FIX-UPSTREAM Fix-build-with-Qt-511.patch
+Patch0: Fix-build-with-Qt-511.patch
BuildRequires: Mesa-devel
BuildRequires: OpenColorIO-devel
BuildRequires: OpenEXR-devel
BuildRequires: Vc-devel-static
BuildRequires: akonadi-contact-devel
BuildRequires: akonadi-server-devel
-%if 0%{?suse_version} > 1325
-BuildRequires: libboost_system-devel
-%else
-BuildRequires: boost-devel
-%endif
BuildRequires: extra-cmake-modules
BuildRequires: fdupes
BuildRequires: fftw3-devel
@@ -123,7 +120,11 @@
Suggests: calligra-sheets
Suggests: calligra-stage
Suggests: calligra-words
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} > 1325
+BuildRequires: libboost_system-devel
+%else
+BuildRequires: boost-devel
+%endif
%description
The Calligra Suite is a set of applications that allows you to easily complete
@@ -135,7 +136,7 @@
%package gemini
Summary: Touched-based optimized Calligra Suite
-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
%description gemini
@@ -143,7 +144,7 @@
%package devel
Summary: The Build Enviroment from Calligra
-License: GPL-2.0+ and LGPL-2.1+
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: Development/Libraries/KDE
Requires: %{name} = %{version}
@@ -153,7 +154,7 @@
%package doc
Summary: Documentation of the Calligra Suite
-License: GFDL-1.2
+License: GFDL-1.2-only
Group: Documentation/HTML
Requires: %{name} = %{version}
Obsoletes: calligra5-doc
@@ -164,7 +165,7 @@
%package flow
Summary: Flow Chart Drawing Application
-License: GPL-2.0+ and LGPL-2.1+
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
Obsoletes: calligra5-flow
@@ -174,7 +175,7 @@
%package karbon
Summary: Vector Drawing Application
-License: GPL-2.0+ and LGPL-2.1+
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
Requires: pstoedit
@@ -185,7 +186,7 @@
%package sheets
Summary: Spreadsheet Application
-License: GPL-2.0+ and LGPL-2.1+
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
Obsoletes: calligra5-sheets
@@ -195,7 +196,7 @@
%package stage
Summary: Application for Creating Presentations
-License: GPL-2.0+ and LGPL-2.1+
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
Obsoletes: calligra5-stage
@@ -205,7 +206,7 @@
%package tools
Summary: Various tools for the Calligra Suite
-License: GPL-2.0+ and LGPL-2.1+
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
Group: Productivity/Office/Suite
Requires: %{name} = %{version}
Obsoletes: calligra5-tools
@@ -215,7 +216,7 @@
%package words
Summary: Word Processor
-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
Requires: %{name} = %{version}
Obsoletes: %{name}-words-common < %{version}
@@ -227,7 +228,7 @@
%package extras-converter
Summary: Commandline tool for conversion
-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
%description extras-converter
@@ -236,7 +237,7 @@
%package extras-okular
Summary: Plugin for Okular
-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
Requires: %{name} = %{version}
Requires: okular
@@ -247,7 +248,7 @@
%package extras-dolphin
Summary: Diverse plugins for Dolphin
-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
Supplements: packageand(%{name}:dolphin)
@@ -259,7 +260,7 @@
%package lang
Summary: Translations for the Calligra Suite Applications
-License: LGPL-2.1+
+License: LGPL-2.1-or-later
Group: System/Localization
Requires: calligra = %{version}
Obsoletes: calligra-l10n-bs < %{version}
@@ -325,7 +326,7 @@
This package contains application translations for the Calligra Suite
%prep
-%setup -q
+%autosetup -p1
%build
%cmake_kf5 -d build -- -DAPP_ACTIVE=FALSE
@@ -388,16 +389,12 @@
%post karbon -p /sbin/ldconfig
%postun karbon -p /sbin/ldconfig
-
%post sheets -p /sbin/ldconfig
%postun sheets -p /sbin/ldconfig
-
%post stage -p /sbin/ldconfig
%postun stage -p /sbin/ldconfig
-
%post tools -p /sbin/ldconfig
%postun tools -p /sbin/ldconfig
-
%post words -p /sbin/ldconfig
%postun words -p /sbin/ldconfig
@@ -407,8 +404,8 @@
%endif
%files -f filelists/main
-%defattr(-,root,root,-)
-%doc COPYING COPYING.LIB README
+%license COPYING COPYING.LIB
+%doc README
%{_kf5_qmldir}/org/kde/calligra/
%{_kf5_servicesdir}/flow*.desktop
%{_datadir}/calligra/
@@ -438,31 +435,26 @@
%exclude %{_datadir}/calligra_shape_music/fonts/Emmentaler-14.ttf
%files extras-converter -f filelists/converter
-%defattr(-,root,root,-)
%files extras-dolphin -f filelists/dolphin
-%defattr(-,root,root,-)
%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120300
%files extras-okular -f filelists/okular
-%defattr(-,root,root,-)
%{_kf5_plugindir}/okular/
%endif
%files devel -f filelists/devel
-%defattr(-,root,root,-)
%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120300
%{_libdir}/libkookularGenerator_odt.so
%endif
%files doc
-%defattr(-,root,root,-)
-%doc COPYING.DOC
+%license COPYING.DOC
%doc %lang(en) %{_kf5_htmldir}/en/calligra/
%files karbon -f filelists/karbon
-%defattr(-,root,root,-)
-%doc karbon/AUTHORS karbon/CHANGES karbon/COPYING.LIB karbon/IDEAS karbon/README karbon/TODO
+%license karbon/COPYING.LIB
+%doc karbon/AUTHORS karbon/CHANGES karbon/IDEAS karbon/README karbon/TODO
%exclude %{_kf5_iconsdir}
%{_datadir}/karbon/
%dir %{_kf5_kxmlguidir}/karbon
@@ -470,7 +462,6 @@
%{_kf5_plugindir}/karbon/
%files gemini -f filelists/gemini
-%defattr(-,root,root,-)
%{_kf5_sharedir}/calligragemini/
%exclude %{_kf5_iconsdir}/hicolor
%dir %{_kf5_qmldir}/Calligra
@@ -479,18 +470,16 @@
%dir %{_kf5_qmldir}/org
%files sheets -f filelists/sheets
-%defattr(-,root,root,-)
%doc sheets/AUTHORS sheets/CHANGES sheets/README sheets/TODO
%exclude %{_datadir}/calligra
%exclude %{_kf5_iconsdir}
%{_kf5_plugindir}/calligrasheets/
%dir %{_kf5_plugindir}/calligra/deferred
%{_kf5_htmldir}/en/calligrasheets/
-%_datadir/calligrasheets/
-%_kf5_kxmlguidir/calligrasheets/
+%{_datadir}/calligrasheets/
+%{_kf5_kxmlguidir}/calligrasheets/
%files stage -f filelists/stage
-%defattr(-,root,root,-)
%doc stage/AUTHORS stage/CHANGES stage/TODO
%exclude %{_datadir}/calligra
%exclude %{_kf5_iconsdir}
@@ -498,26 +487,23 @@
%dir %{_kf5_plugindir}/calligra/presentationeventactions
%{_kf5_htmldir}/en/calligrastage/
%exclude %{_kf5_plugindir}/okular/
-%_datadir/calligra_shape_music/
-%_datadir/calligrastage/
-%_kf5_kxmlguidir/calligrastage/
+%{_datadir}/calligra_shape_music/
+%{_datadir}/calligrastage/
+%{_kf5_kxmlguidir}/calligrastage/
%files tools -f filelists/tools
-%defattr(-,root,root,-)
%files words -f filelists/words
-%defattr(-,root,root,-)
%{_kf5_applicationsdir}/org.kde.calligrawords.desktop
%{_kf5_bindir}/calligrawords
%{_kf5_libdir}/libkdeinit5_calligrawords.so
%exclude %{_kf5_iconsdir}/hicolor
-%_datadir/calligrawords/
-%_kf5_kxmlguidir/calligrawords/
+%{_datadir}/calligrawords/
+%{_kf5_kxmlguidir}/calligrawords/
%exclude %{_kf5_plugindir}/okular/
%dir %{_kf5_plugindir}/calligra/parts
%files lang
-%defattr(-,root,root,-)
%{_datadir}/locale/
%changelog
++++++ Fix-build-with-Qt-511.patch ++++++
commit a7ebecb9fbee2190e649c44ed53f1299013baa30
Author: Andreas Sturmlechner
From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001 From: David Faure
Date: Tue, 3 Apr 2018 00:31:19 +0200 Subject: [PATCH 03/10] Fix compilation with Qt 5.11 (missing include)
---
stage/part/KPrPresentationTool.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp
index ae743da8fe0..3007f9101e4 100644
--- a/stage/part/KPrPresentationTool.cpp
+++ b/stage/part/KPrPresentationTool.cpp
@@ -32,6 +32,7 @@
#include <QDesktopServices>
#include <QUrl>
#include <QDBusConnection>
+#include <QFrame>
#include