[liggghts] 03/03: Update patches.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository liggghts.

commit 3ca42f7ff7ffa1138eb5efcf195945b8f997a18d
Author: Anton Gladky <gladk at debian.org>
Date:   Sun Sep 7 22:53:59 2014 +0200

    Update patches.
---
 debian/patches/01_add_cmake_files.patch | 16 ++++++++--------
 debian/patches/05_vtk6_support.patch    | 12 +++++++++---
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/debian/patches/01_add_cmake_files.patch b/debian/patches/01_add_cmake_files.patch
index 577bca6..0d0bf46 100644
--- a/debian/patches/01_add_cmake_files.patch
+++ b/debian/patches/01_add_cmake_files.patch
@@ -2,8 +2,10 @@ Description: adds cmake files. Will hopefully be accepted by upstream.
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2014-03-04
 
+Index: LIGGGHTS-PUBLIC-3.0.3/CMakeLists.txt
+===================================================================
 --- /dev/null
-+++ b/CMakeLists.txt
++++ LIGGGHTS-PUBLIC-3.0.3/CMakeLists.txt
 @@ -0,0 +1,86 @@
 +# ENABLE_PACKAGE: enable PACKAGE-modules (OFF by default)
 +# ENABLE_PACKAGEUSER: enable PACKAGEUSER-modules (OFF by default)
@@ -91,9 +93,11 @@ Last-Update: 2014-03-04
 +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
 +
 +ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/src")
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,84 +1,57 @@
+Index: LIGGGHTS-PUBLIC-3.0.3/src/CMakeLists.txt
+===================================================================
+--- LIGGGHTS-PUBLIC-3.0.3.orig/src/CMakeLists.txt
++++ LIGGGHTS-PUBLIC-3.0.3/src/CMakeLists.txt
+@@ -1,80 +1,57 @@
 -# ENABLE_PACKAGE: enable PACKAGE-modules (OFF by default)
 -# ENABLE_PACKAGEUSER: enable PACKAGEUSER-modules (OFF by default)
 -# SUFFIX: add sufix to binary-name (NONE by default)
@@ -129,10 +133,6 @@ Last-Update: 2014-03-04
 -  LINK_DIRECTORIES(${VTK_LIBRARY_DIRS})
 -  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLAMMPS_VTK")
 -  MESSAGE(STATUS "Found VTK")
--  
--  FIND_PACKAGE(Eigen3 REQUIRED)
--  INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIR})
--  MESSAGE(STATUS "Found Eigen3")
 -ELSE(VTK_FOUND)
 -  MESSAGE(STATUS "VTK NOT found!")
 -ENDIF(VTK_FOUND)
diff --git a/debian/patches/05_vtk6_support.patch b/debian/patches/05_vtk6_support.patch
index a16249c..9d38f66 100644
--- a/debian/patches/05_vtk6_support.patch
+++ b/debian/patches/05_vtk6_support.patch
@@ -1,10 +1,16 @@
---- a/src/dump_atom_vtk.cpp
-+++ b/src/dump_atom_vtk.cpp
-@@ -305,7 +305,11 @@
+Index: LIGGGHTS-PUBLIC-3.0.3/src/dump_atom_vtk.cpp
+===================================================================
+--- LIGGGHTS-PUBLIC-3.0.3.orig/src/dump_atom_vtk.cpp
++++ LIGGGHTS-PUBLIC-3.0.3/src/dump_atom_vtk.cpp
+@@ -309,11 +309,11 @@ void DumpATOMVTK::vtkExportData::writeSE
  
    vtkSmartPointer<vtkXMLUnstructuredGridWriter> writer = vtkSmartPointer<vtkXMLUnstructuredGridWriter>::New();
    writer->SetDataModeToAscii();
+-#if VTK_MAJOR_VERSION < 6
 -  writer->SetInput(spheresUg);
+-#else
+-  writer->SetInputData(spheresUg);
+-#endif
 +  #ifdef LAMMPS_VTK6
 +    writer->SetInputData(spheresUg);
 +  #else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/liggghts.git