Hello community, here is the log from the commit of package openEMS for openSUSE:Factory checked in at 2018-01-16 09:41:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openEMS (Old) and /work/SRC/openSUSE:Factory/.openEMS.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openEMS" Tue Jan 16 09:41:58 2018 rev:7 rq:560068 version:0.0.35 Changes: -------- --- /work/SRC/openSUSE:Factory/openEMS/openEMS.changes 2017-11-03 16:25:41.454374786 +0100 +++ /work/SRC/openSUSE:Factory/.openEMS.new/openEMS.changes 2018-01-16 09:41:59.826737955 +0100 @@ -1,0 +2,17 @@ +Wed Dec 27 07:15:34 UTC 2017 - [email protected] + +- Update to 0.0.35 + * build fixes + * critical bug fix in waveguide ports + * fix for boxes defined in different coordinate systems + * other smaller fixes + +- patch rename and cleanop, now based on git format-patch + * openEMS-vtk.patch to 0001-Fix-linking-for-VTK-6.3.patch + * openEMS-octave-openEMS-load.patch to 0002-Fix-openEMS.sh-load.patch + * openEMS-octave-nf2ff-load.patch to 0003-Fix-nf2ff-load.patch + * openEMS-readme-octave-package.patch to 0004-Add-correct-instruction-about-Octave-and-MATLAB-pack.patch + * openEMS-hdf5.patch to 0005-Fix-build-with-HDF5.patch + * openEMS-no-return.patch to 0006-Add-missing-return-statement.patch + +------------------------------------------------------------------- Old: ---- openEMS-0.0.34.tar.gz openEMS-hdf5.patch openEMS-no-return.patch openEMS-octave-nf2ff-load.patch openEMS-octave-openEMS-load.patch openEMS-readme-octave-package.patch openEMS-vtk.patch New: ---- 0001-Fix-linking-for-VTK-6.3.patch 0002-Fix-openEMS.sh-load.patch 0003-Fix-nf2ff-load.patch 0004-Add-correct-instruction-about-Octave-and-MATLAB-pack.patch 0005-Fix-build-with-HDF5.patch 0006-Add-missing-return-statement.patch v0.0.35.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openEMS.spec ++++++ --- /var/tmp/diff_new_pack.x2vMMR/_old 2018-01-16 09:42:00.646699574 +0100 +++ /var/tmp/diff_new_pack.x2vMMR/_new 2018-01-16 09:42:00.650699387 +0100 @@ -18,30 +18,37 @@ Name: openEMS %define octpkg openems -Version: 0.0.34 +Version: 0.0.35 Release: 0 Summary: Electromagnetic field solver using the EC-FDTD method License: GPL-3.0 Group: Productivity/Scientific/Physics Url: http://openems.de -Source0: https://github.com/thliebig/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# source - openEMS component only, not openEMS-Project +Source0: https://github.com/thliebig/%{name}/archive/v%{version}.tar.gz # PATCH-FIX-UPSTREAM openEMS-vtk.patch -- Fix linking for VTK >= 6.3 -Patch1: openEMS-vtk.patch +Patch1: 0001-Fix-linking-for-VTK-6.3.patch # PATCH-FIX-OPENSUSE openEMS-octave-openEMS-load.patch -- Fix openEMS.sh load -Patch2: openEMS-octave-openEMS-load.patch +Patch2: 0002-Fix-openEMS.sh-load.patch # PATCH-FIX-OPENSUSE openEMS-octave-nf2ff-load.patch -- Fix nf2ff load -Patch3: openEMS-octave-nf2ff-load.patch +Patch3: 0003-Fix-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 +Patch4: 0004-Add-correct-instruction-about-Octave-and-MATLAB-pack.patch # PATCH-FIX-UPSTREAM openEMS-hdf5.patch -- Fix build with HDF5 -Patch5: openEMS-hdf5.patch +Patch5: 0005-Fix-build-with-HDF5.patch # PATCH-FIX-UPSTREAM openEMS-no-return.patch -Patch6: openEMS-no-return.patch +Patch6: 0006-Add-missing-return-statement.patch + BuildRequires: CSXCAD-devel BuildRequires: boost-devel BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: hdf5-devel +BuildRequires: libboost_chrono1_66_0-devel +BuildRequires: libboost_date_time1_66_0-devel +BuildRequires: libboost_serialization1_66_0-devel +BuildRequires: libboost_system1_66_0-devel +BuildRequires: libboost_thread1_66_0-devel BuildRequires: octave-devel BuildRequires: python3-vtk BuildRequires: sz2-devel @@ -211,6 +218,8 @@ %files devel %defattr(-,root,root,-) +%dir %{_prefix}/include/%{name} +%{_prefix}/include/%{name}/* %{_libdir}/libnf2ff.so %{_libdir}/libopenEMS.so ++++++ 0001-Fix-linking-for-VTK-6.3.patch ++++++ >From 01bdfd13af101a9cd1f6d895eefcad39f38aa6bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Wed, 27 Dec 2017 08:33:21 +0100 Subject: [PATCH 1/6] Fix linking for VTK >= 6.3 --- CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 898f28008c11..032f53fce782 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,11 +125,7 @@ find_package(Boost 1.46 COMPONENTS if (WIN32) find_package(VTK 6.1 REQUIRED) else() - # prefer >=6.1, fallback to >=5.4 - find_package(VTK 6.1 COMPONENTS vtkIOXML vtkIOGeometry vtkIOLegacy vtkIOPLY NO_MODULE) - IF (NOT ${VTK_FOUND}) - find_package(VTK REQUIRED) - endif() + find_package(VTK REQUIRED) endif() message(STATUS "Found package VTK. Using version " ${VTK_VERSION}) -- 2.15.1 ++++++ 0002-Fix-openEMS.sh-load.patch ++++++ >From f4a8c237cf695eea5601577d3135496757447f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Wed, 27 Dec 2017 08:34:02 +0100 Subject: [PATCH 2/6] Fix openEMS.sh load --- matlab/private/invoke_openEMS.m | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/matlab/private/invoke_openEMS.m b/matlab/private/invoke_openEMS.m index afb2b463eb27..53478f40437d 100644 --- a/matlab/private/invoke_openEMS.m +++ b/matlab/private/invoke_openEMS.m @@ -27,9 +27,7 @@ filename = mfilename('fullpath'); dir = fileparts( filename ); if isunix - openEMS_bin = searchBinary('openEMS.sh', ... - {[dir filesep '..' filesep '..' filesep], ... % try devel path - [dir filesep '..' filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]}); % try (default) install path + openEMS_bin = 'openEMS.sh'; else % assume windows openEMS_bin = searchBinary('openEMS.exe', [dir filesep '..' filesep '..' filesep]); end -- 2.15.1 ++++++ 0003-Fix-nf2ff-load.patch ++++++ >From 7ebbba9d7766e20786a6f0de728c60ba64cabe05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Wed, 27 Dec 2017 08:34:28 +0100 Subject: [PATCH 3/6] Fix nf2ff load --- matlab/CalcNF2FF.m | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/matlab/CalcNF2FF.m b/matlab/CalcNF2FF.m index c80b52e4a9ff..d782248821a4 100644 --- a/matlab/CalcNF2FF.m +++ b/matlab/CalcNF2FF.m @@ -99,9 +99,7 @@ m_filename = mfilename('fullpath'); dir_name = fileparts( m_filename ); if isunix - nf2ff_bin = searchBinary('nf2ff', ... - {[dir_name filesep '..' filesep 'nf2ff' filesep], ... - [dir_name filesep '..' filesep '..' filesep '..' filesep 'bin' filesep]}, 0); + nf2ff_bin = 'nf2ff'; else nf2ff_bin = searchBinary('nf2ff.exe',[dir_name filesep '..' filesep], 0); end -- 2.15.1 ++++++ 0004-Add-correct-instruction-about-Octave-and-MATLAB-pack.patch ++++++ >From 53b00c2bfe12c19b2228489c2f4b27b08dcaf53f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Wed, 27 Dec 2017 08:34:52 +0100 Subject: [PATCH 4/6] Add correct instruction about Octave and MATLAB packages --- README | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/README b/README index fdfd1372acf5..85ec5ecc6c91 100644 --- a/README +++ b/README @@ -12,8 +12,11 @@ Forum: http://openems.de/forum/ Tutorials: http://openems.de/index.php/Tutorials -To use openEMS from Matlab or Octave, you need to include the <openEMS-install-folder>/matlab folder in the respective environment: -> addpath( '<openEMS-install-folder>/matlab' ); +To use openEMS from Octave, you need to load openEMS package: +> pkg load openems; + +To use openEMS from Matlab, you need to include the </usr/share/openEMS/matlab folder in the respective environment: +> addpath( '/usr/share/openEMS/matlab' ); To verify the correct installation follow the instructions at: http://openems.de/index.php/Tutorial:_First_Steps -- 2.15.1 ++++++ 0005-Fix-build-with-HDF5.patch ++++++ >From 5122ac9c44f47c9e1642dd675113c4c14cd60ff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Wed, 27 Dec 2017 08:35:53 +0100 Subject: [PATCH 5/6] Fix build with HDF5 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 032f53fce782..7cf465e0a8d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,7 +108,7 @@ find_package(TinyXML REQUIRED) ADD_DEFINITIONS( -DTIXML_USE_STL ) # hdf5 -find_package(HDF5 1.8 COMPONENTS C HL REQUIRED) +find_package(HDF5 1.8 COMPONENTS CXX HL REQUIRED) INCLUDE_DIRECTORIES (${HDF5_INCLUDE_DIRS}) link_directories(${HDF5_LIBRARIES}) -- 2.15.1 ++++++ 0006-Add-missing-return-statement.patch ++++++ >From e7f120d9e07d9ab61545853cf52c9b7e87164c44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Wed, 27 Dec 2017 08:38:08 +0100 Subject: [PATCH 6/6] Add missing return statement --- FDTD/excitation.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/FDTD/excitation.cpp b/FDTD/excitation.cpp index 4e1ba8543a1b..69240aa8add2 100644 --- a/FDTD/excitation.cpp +++ b/FDTD/excitation.cpp @@ -60,6 +60,8 @@ bool Excitation::SetupGaussianPulse(double f0, double fc) m_fc = fc; m_f_max = f0+fc; m_SignalPeriod = 0; + + return true; } bool Excitation::SetupSinusoidal(double f0) @@ -68,6 +70,8 @@ bool Excitation::SetupSinusoidal(double f0) m_f0 = f0; m_f_max = f0; m_SignalPeriod = 1/f0; + + return true; } bool Excitation::SetupDiracPulse(double fmax) @@ -75,6 +79,8 @@ bool Excitation::SetupDiracPulse(double fmax) m_Excit_Type = Excitation::DiracPulse; m_SignalPeriod = 0; m_f_max = fmax; + + return true; } bool Excitation::SetupStepExcite(double fmax) @@ -82,6 +88,8 @@ bool Excitation::SetupStepExcite(double fmax) m_Excit_Type = Excitation::Step; m_SignalPeriod = 0; m_f_max = fmax; + + return true; } bool Excitation::SetupCustomExcite(string str, double f0, double fmax) @@ -91,6 +99,8 @@ bool Excitation::SetupCustomExcite(string str, double f0, double fmax) m_f0 = f0; m_SignalPeriod = 0; m_f_max = fmax; + + return true; } bool Excitation::buildExcitationSignal(unsigned int maxTS) -- 2.15.1
