Hello community, here is the log from the commit of package AppCSXCAD for openSUSE:Factory checked in at 2018-06-27 10:23:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/AppCSXCAD (Old) and /work/SRC/openSUSE:Factory/.AppCSXCAD.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "AppCSXCAD" Wed Jun 27 10:23:02 2018 rev:4 rq:619215 version:0.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/AppCSXCAD/AppCSXCAD.changes 2017-12-14 11:00:49.801920960 +0100 +++ /work/SRC/openSUSE:Factory/.AppCSXCAD.new/AppCSXCAD.changes 2018-06-27 10:23:08.880259724 +0200 @@ -1,0 +2,7 @@ +Mon Jun 25 21:43:33 UTC 2018 - stefan.bru...@rwth-aachen.de + +- Fix build with Qt5.11, qt5_use_modules has been deprecated and + removed, add qt5_use_modules.diff +- Always use Qt5, as all current VTK builds use Qt5 as well + +------------------------------------------------------------------- New: ---- qt5_use_modules.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ AppCSXCAD.spec ++++++ --- /var/tmp/diff_new_pack.cMHylh/_old 2018-06-27 10:23:09.536235804 +0200 +++ /var/tmp/diff_new_pack.cMHylh/_new 2018-06-27 10:23:09.536235804 +0200 @@ -1,7 +1,7 @@ # # spec file for package AppCSXCAD # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,22 +24,16 @@ Group: Productivity/Scientific/Other Url: http://openems.de Source0: https://github.com/thliebig/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Patch0: qt5_use_modules.diff BuildRequires: CSXCAD-devel BuildRequires: QCSXCAD-devel BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: tinyxml-devel BuildRequires: vtk-devel -%if 0%{?suse_version} > 1320 BuildRequires: cmake(Qt5Sql) BuildRequires: cmake(Qt5Widgets) -BuildRequires: pkgconfig(Qt5Core) -BuildRequires: pkgconfig(Qt5Gui) -BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5Xml) -%else -BuildRequires: libqt4-devel -%endif +BuildRequires: cmake(Qt5Xml) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(xt) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,6 +43,7 @@ %prep %setup -q +%patch0 -p1 %build if [ -f %{_libdir}/mpi/gcc/openmpi/bin/mpivars.sh ]; then ++++++ qt5_use_modules.diff ++++++ diff --git a/CMakeLists.txt b/CMakeLists.txt index d5b6e5a..148ec66 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -143,7 +143,7 @@ SET(SOURCES ADD_EXECUTABLE( AppCSXCAD ${SOURCES} ) if(Qt5Widgets_FOUND) - qt5_use_modules(AppCSXCAD Widgets Xml) + set(QT_LIBRARIES Qt5::Widgets Qt5::Xml) endif() TARGET_LINK_LIBRARIES( AppCSXCAD
