Hello community, here is the log from the commit of package AppCSXCAD for openSUSE:Factory checked in at 2020-10-16 16:14:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/AppCSXCAD (Old) and /work/SRC/openSUSE:Factory/.AppCSXCAD.new.3486 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "AppCSXCAD" Fri Oct 16 16:14:11 2020 rev:6 rq:841936 version:0.2.2 Changes: -------- --- /work/SRC/openSUSE:Factory/AppCSXCAD/AppCSXCAD.changes 2019-01-15 09:15:36.654278163 +0100 +++ /work/SRC/openSUSE:Factory/.AppCSXCAD.new.3486/AppCSXCAD.changes 2020-10-16 16:14:29.792694689 +0200 @@ -1,0 +2,5 @@ +Thu Oct 15 13:02:01 UTC 2020 - Stefan Brüns <[email protected]> + +- Fix build with VTK 9.x, add AppCSXCAD-vtk.patch + +------------------------------------------------------------------- New: ---- AppCSXCAD-vtk.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ AppCSXCAD.spec ++++++ --- /var/tmp/diff_new_pack.KkNlpq/_old 2020-10-16 16:14:32.288695454 +0200 +++ /var/tmp/diff_new_pack.KkNlpq/_new 2020-10-16 16:14:32.292695456 +0200 @@ -1,7 +1,7 @@ # # spec file for package AppCSXCAD # -# Copyright (c) 2018 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 @@ -22,33 +22,35 @@ Summary: Minimal GUI Application using the QCSXCAD library License: GPL-3.0-only Group: Productivity/Scientific/Other -Url: http://openems.de +URL: https://openems.de Source0: https://github.com/thliebig/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Patch0: qt5_use_modules.diff +# PATCH-FIX-OPENSUSE +Patch1: AppCSXCAD-vtk.patch BuildRequires: CSXCAD-devel BuildRequires: QCSXCAD-devel BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: glew-devel BuildRequires: tinyxml-devel BuildRequires: vtk-devel +BuildRequires: vtk-qt BuildRequires: cmake(Qt5Sql) BuildRequires: cmake(Qt5Widgets) BuildRequires: cmake(Qt5Xml) BuildRequires: pkgconfig(sm) BuildRequires: pkgconfig(xt) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Minimal GUI Application using the QCSXCAD library. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build %cmake -make %{?_smp_mflags} +%cmake_build %install %cmake_install ++++++ AppCSXCAD-vtk.patch ++++++ --- a/CMakeLists.txt 2018-12-14 23:45:50.112002905 +0100 +++ b/CMakeLists.txt 2018-12-15 00:01:35.322874327 +0100 @@ -117,15 +117,14 @@ if("${VTK_MAJOR_VERSION}" EQUAL 5) set( vtk_LIBS QVTK ) -elseif("${VTK_MAJOR_VERSION}" EQUAL 6) - set( vtk_LIBS - vtkGUISupportQt) +else() + set( vtk_LIBS ${VTK_LIBRARIES} ) endif() message(STATUS "vtk libraries " ${vtk_LIBS}) # Qt set(CMAKE_AUTOMOC ON) -if(${VTK_VERSION} VERSION_GREATER "6" AND VTK_QT_VERSION VERSION_GREATER "4") +if(${VTK_VERSION} VERSION_GREATER "6" AND ((NOT DEFINED VTK_QT_VERSION) OR ("${VTK_QT_VERSION}" VERSION_GREATER "4"))) find_package(Qt5Widgets REQUIRED) include_directories(${Qt5Widgets_INCLUDE_DIRS}) find_package(Qt5Xml REQUIRED)
