Hello community, here is the log from the commit of package labplot-kf5 for openSUSE:Factory checked in at 2018-06-08 23:14:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/labplot-kf5 (Old) and /work/SRC/openSUSE:Factory/.labplot-kf5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "labplot-kf5" Fri Jun 8 23:14:35 2018 rev:7 rq:614281 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/labplot-kf5/labplot-kf5.changes 2017-05-10 20:50:29.011135291 +0200 +++ /work/SRC/openSUSE:Factory/.labplot-kf5.new/labplot-kf5.changes 2018-06-08 23:14:37.749876325 +0200 @@ -1,0 +2,5 @@ +Tue Jun 5 11:36:46 UTC 2018 - wba...@tmo.at + +- Add Fix-compilation-on-Qt5.11.patch to fix build with Qt 5.11 + +------------------------------------------------------------------- New: ---- Fix-compilation-on-Qt5.11.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ labplot-kf5.spec ++++++ --- /var/tmp/diff_new_pack.ycFsS4/_old 2018-06-08 23:14:38.453850901 +0200 +++ /var/tmp/diff_new_pack.ycFsS4/_new 2018-06-08 23:14:38.457850757 +0200 @@ -29,6 +29,8 @@ Group: Productivity/Scientific/Other Url: https://edu.kde.org/applications/science/labplot/ Source: http://download.kde.org/stable/labplot/%{version}/labplot-%{version}-kf5.tar.xz +# PATCH-FIX-UPSTREAM +Patch: Fix-compilation-on-Qt5.11.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cantor-devel BuildRequires: extra-cmake-modules @@ -69,6 +71,7 @@ %prep %setup -q -n labplot-%{version}-kf5 +%patch -p1 %build %cmake_kf5 -d build ++++++ Fix-compilation-on-Qt5.11.patch ++++++ >From 58da3837ed730bf2f5ab363ae1bbcf95f2a72bee Mon Sep 17 00:00:00 2001 From: Garvit Khatri <garvitde...@gmail.com> Date: Sat, 2 Jun 2018 13:51:11 +0530 Subject: Fix compilation on Qt5.11 --- src/commonfrontend/matrix/MatrixView.cpp | 1 + src/kdefrontend/dockwidgets/CantorWorksheetDock.cpp | 1 + src/kdefrontend/spreadsheet/FunctionValuesDialog.h | 1 + src/kdefrontend/widgets/FITSHeaderEditNewKeywordDialog.h | 1 + 4 files changed, 4 insertions(+) diff --git a/src/commonfrontend/matrix/MatrixView.cpp b/src/commonfrontend/matrix/MatrixView.cpp index fd9b898..e1ba785 100644 --- a/src/commonfrontend/matrix/MatrixView.cpp +++ b/src/commonfrontend/matrix/MatrixView.cpp @@ -54,6 +54,7 @@ #include <QThreadPool> #include <QMutex> #include <QProcess> +#include <QHeaderView> // #include <QElapsedTimer> #include <KLocale> diff --git a/src/kdefrontend/dockwidgets/CantorWorksheetDock.cpp b/src/kdefrontend/dockwidgets/CantorWorksheetDock.cpp index fb62ba0..0e447f2 100644 --- a/src/kdefrontend/dockwidgets/CantorWorksheetDock.cpp +++ b/src/kdefrontend/dockwidgets/CantorWorksheetDock.cpp @@ -30,6 +30,7 @@ #include "backend/cantorWorksheet/CantorWorksheet.h" #include <cantor/session.h> #include <KParts/ReadWritePart> +#include <QAction> CantorWorksheetDock::CantorWorksheetDock(QWidget* parent): QWidget(parent), m_initializing(false) { ui.setupUi(this); diff --git a/src/kdefrontend/spreadsheet/FunctionValuesDialog.h b/src/kdefrontend/spreadsheet/FunctionValuesDialog.h index e58281a..75706cc 100644 --- a/src/kdefrontend/spreadsheet/FunctionValuesDialog.h +++ b/src/kdefrontend/spreadsheet/FunctionValuesDialog.h @@ -37,6 +37,7 @@ class Spreadsheet; class Spreadsheet; class TreeViewComboBox; class AspectTreeModel; +class QLineEdit; class FunctionValuesDialog : public KDialog { Q_OBJECT diff --git a/src/kdefrontend/widgets/FITSHeaderEditNewKeywordDialog.h b/src/kdefrontend/widgets/FITSHeaderEditNewKeywordDialog.h index 5aba33d..163d413 100644 --- a/src/kdefrontend/widgets/FITSHeaderEditNewKeywordDialog.h +++ b/src/kdefrontend/widgets/FITSHeaderEditNewKeywordDialog.h @@ -32,6 +32,7 @@ Copyright : (C) 2016 by Fabian Kristof (fkristofszabo...@gmail.com) #include <KDialog> +class QAbstractButton; class FITSHeaderEditNewKeywordDialog : public KDialog { Q_OBJECT -- cgit v0.11.2
