Hello community,
here is the log from the commit of package openEMS for openSUSE:Factory checked
in at 2016-06-14 23:07:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openEMS (Old)
and /work/SRC/openSUSE:Factory/.openEMS.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openEMS"
Changes:
--------
--- /work/SRC/openSUSE:Factory/openEMS/openEMS.changes 2015-11-26
17:01:11.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.openEMS.new/openEMS.changes 2016-06-14
23:08:00.000000000 +0200
@@ -1,0 +2,11 @@
+Sat Jun 11 21:01:12 UTC 2016 - dmitr...@opensuse.org
+
+- Fix build due to missing libraries
+
+-------------------------------------------------------------------
+Mon Mar 21 08:18:27 UTC 2016 - dmitr...@opensuse.org
+
+- Fix build with VTK 7
+ * openEMS-vtk7-support.patch
+
+-------------------------------------------------------------------
New:
----
openEMS-vtk7-support.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openEMS.spec ++++++
--- /var/tmp/diff_new_pack.74MB1l/_old 2016-06-14 23:08:01.000000000 +0200
+++ /var/tmp/diff_new_pack.74MB1l/_new 2016-06-14 23:08:01.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package openEMS
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -33,6 +33,8 @@
Patch3: openEMS-octave-nf2ff-load.patch
# PATCH-FIX-OPENSUSE openEMS-readme-octave-package.patch -- Add correct
instruction about Octave and MATLAB packages
Patch4: openEMS-readme-octave-package.patch
+# PATCH-FIX-UPSTREAM openEMS-vtk7-support.patch -- Fix build with VTK 7
+Patch5: openEMS-vtk7-support.patch
BuildRequires: CSXCAD-devel
BuildRequires: boost-devel
BuildRequires: cmake
@@ -42,6 +44,9 @@
BuildRequires: tinyxml-devel
BuildRequires: vtk-devel
BuildRequires: pkgconfig(fparser)
+BuildRequires: pkgconfig(python3)
+BuildRequires: pkgconfig(sm)
+BuildRequires: pkgconfig(xt)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -78,6 +83,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
cat > DESCRIPTION << 'EOF'
Name: %{octpkg}
++++++ openEMS-vtk7-support.patch ++++++
Index: openEMS-0.0.33/tools/vtk_file_writer.cpp
===================================================================
--- openEMS-0.0.33.orig/tools/vtk_file_writer.cpp
+++ openEMS-0.0.33/tools/vtk_file_writer.cpp
@@ -285,7 +285,7 @@ bool VTK_File_Writer::WriteASCII()
}
writer->SetHeader(m_header.c_str());
-#if VTK_MAJOR_VERSION==6
+#if VTK_MAJOR_VERSION>=6
writer->SetInputData(m_GridData);
#else
writer->SetInput(m_GridData);
@@ -316,7 +316,7 @@ bool VTK_File_Writer::WriteXML()
return false;
}
-#if VTK_MAJOR_VERSION==6
+#if VTK_MAJOR_VERSION>=6
writer->SetInputData(m_GridData);
#else
writer->SetInput(m_GridData);
Index: openEMS-0.0.33/FDTD/operator.cpp
===================================================================
--- openEMS-0.0.33.orig/FDTD/operator.cpp
+++ openEMS-0.0.33/FDTD/operator.cpp
@@ -721,7 +721,7 @@ void Operator::DumpPEC2File(string filen
filename += ".vtp";
writer->SetFileName(filename.c_str());
-#if VTK_MAJOR_VERSION==6
+#if VTK_MAJOR_VERSION>=6
writer->SetInputData(polydata);
#else
writer->SetInput(polydata);
Index: openEMS-0.0.33/CMakeLists.txt
===================================================================
--- openEMS-0.0.33.orig/CMakeLists.txt
+++ openEMS-0.0.33/CMakeLists.txt
@@ -118,7 +118,7 @@ else()
endif()
message(STATUS "Found package VTK. Using version " ${VTK_VERSION})
-if("${VTK_MAJOR_VERSION}" EQUAL 6)
+if("${VTK_MAJOR_VERSION}" GREATER 5)
set( vtk_LIBS ${VTK_LIBRARIES} )
else()
set( vtk_LIBS
