Hello community, here is the log from the commit of package kst for openSUSE:Factory checked in at 2018-06-13 15:35:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kst (Old) and /work/SRC/openSUSE:Factory/.kst.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kst" Wed Jun 13 15:35:06 2018 rev:46 rq:613817 version:2.0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/kst/kst.changes 2018-02-23 15:31:32.686736060 +0100 +++ /work/SRC/openSUSE:Factory/.kst.new/kst.changes 2018-06-13 15:35:11.057848191 +0200 @@ -1,0 +2,6 @@ +Sun Jun 3 17:44:42 UTC 2018 - [email protected] + +- Add Fix-build-with-Qt-511.patch. +- Run spec-cleaner + +------------------------------------------------------------------- New: ---- Fix-build-with-Qt-511.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kst.spec ++++++ --- /var/tmp/diff_new_pack.qGpjsz/_old 2018-06-13 15:35:13.457759855 +0200 +++ /var/tmp/diff_new_pack.qGpjsz/_new 2018-06-13 15:35:13.461759709 +0200 @@ -21,13 +21,14 @@ Version: 2.0.8 Release: 0 Summary: Real-Time Data Viewing and Plotting Tool with Basic Data Analysis Functionality -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Graphics/Visualization/Graph -Url: http://kst-plot.kde.org/ +URL: http://kst-plot.kde.org/ Source: Kst-%{version}.tar.gz # PATCH-FIX-UPSTREAM gsl2-support.patch -- fixes build with GSL-2.0 -Patch: gsl2-support.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Patch0: gsl2-support.patch +# PATCH-FIX-UPSTREAM -- Fix-build-with-Qt-511.patch -- Fixes build with Qt 5.11 +Patch1: Fix-build-with-Qt-511.patch BuildRequires: Mesa-devel BuildRequires: cmake BuildRequires: fdupes @@ -89,11 +90,10 @@ making use of %{name} %prep -%setup -q -n=Kst-2.0.8 -%patch -p1 +%autosetup -p1 -n Kst-2.0.8 %build -EXTRA_FLAGS="-Dkst_install_prefix=/usr \ +EXTRA_FLAGS="-Dkst_install_prefix=%{_prefix} \ -Dkst_rpath=0 \ -Dkst_install_libdir=%{_lib} \ -Dkst_release=1 \ @@ -116,28 +116,26 @@ %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%clean -rm -rf %{buildroot} - %files -%defattr(-,root,root) -%{_datadir}/applications/%{name}2.desktop -%{_bindir}/%{name}2 -%{_datadir}/applnk/ -%{_datadir}/mimelink/ +%license COPYING* +%doc AUTHORS NEWS README %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/* %dir %{_datadir}/icons/hicolor/*/apps -%{_datadir}/icons/hicolor/*/apps/*%{name}.* -%{_libdir}/lib%{name}*.so.* -%{_libdir}/%{name}2/ -%{_mandir}/man1/%{name}2.1.gz %dir %{_datadir}/kst %dir %{_datadir}/kst/locale +%{_bindir}/%{name}2 +%{_datadir}/applications/%{name}2.desktop +%{_datadir}/applnk/ +%{_datadir}/icons/hicolor/*/apps/*%{name}.* %{_datadir}/kst/locale/kst_common_*.qm +%{_datadir}/mimelink/ +%{_libdir}/%{name}2/ +%{_libdir}/lib%{name}*.so.* +%{_mandir}/man1/%{name}2.1%{?ext_man} %files devel -%defattr(-,root,root) +%license COPYING* %{_libdir}/*.so %{_libdir}/lib%{name}2app.a ++++++ Fix-build-with-Qt-511.patch ++++++ commit b438fb0d1c831cb8c024eb4dc644aeb5114074e6 Author: Christophe Giboudeaux <[email protected]> Date: Sun Jun 3 19:43:34 2018 +0200 Fix build with Qt 5.11 qt5_use_modules was removed in Qt 5.11. use target_link_libraries instead. diff --git a/cmake/modules/KstMacros.cmake b/cmake/modules/KstMacros.cmake index 4ff9c151..bc3d8a6c 100644 --- a/cmake/modules/KstMacros.cmake +++ b/cmake/modules/KstMacros.cmake @@ -240,7 +240,7 @@ endmacro() macro(kst_link) target_link_libraries(${kst_name} ${ARGV}) if(kst_qt5) - qt5_use_modules(${kst_name} Widgets Xml Network PrintSupport) + target_link_libraries(${kst_name} Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport) else() target_link_libraries(${kst_name} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTNETWORK_LIBRARY}) diff --git a/src/libkstapp/view.h b/src/libkstapp/view.h index 95c8c6a5..2af53938 100644 --- a/src/libkstapp/view.h +++ b/src/libkstapp/view.h @@ -14,6 +14,7 @@ #define VIEW_H #include <QGraphicsView> +#include <QMenu> #include "kst_export.h"
