[liggghts] 03/06: Update patches.

[Anton Gladky]

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

gladk pushed a commit to branch experimental
in repository liggghts.

commit ea63dabccc9e608f083a248058155a78cf99456a
Author: Anton Gladky <gladk at debian.org>
Date:   Tue Mar 17 21:15:00 2015 +0100

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

diff --git a/debian/patches/01_add_cmake_files.patch b/debian/patches/01_add_cmake_files.patch
index 371e757..30a6f29 100644
--- a/debian/patches/01_add_cmake_files.patch
+++ b/debian/patches/01_add_cmake_files.patch
@@ -1,12 +1,12 @@
 Description: adds cmake files. Will hopefully be accepted by upstream.
 Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-03-04
+Last-Update: 2015-03-17
 
-Index: LIGGGHTS-PUBLIC-3.0.3/CMakeLists.txt
+Index: LIGGGHTS-PUBLIC-3.1.0/CMakeLists.txt
 ===================================================================
 --- /dev/null
-+++ LIGGGHTS-PUBLIC-3.0.3/CMakeLists.txt
-@@ -0,0 +1,86 @@
++++ LIGGGHTS-PUBLIC-3.1.0/CMakeLists.txt
+@@ -0,0 +1,87 @@
 +# 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)
@@ -30,7 +30,8 @@ Index: LIGGGHTS-PUBLIC-3.0.3/CMakeLists.txt
 +INCLUDE(FindVTK)
 +INCLUDE(GNUInstallDirs)
 +INCLUDE(FindPythonLibs)
-+FIND_PACKAGE(VTK COMPONENTS vtkCommonCore vtkIOImage vtkIOXML )
++FIND_PACKAGE(VTK COMPONENTS vtkChartsCore vtkViewsContext2D vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL  vtkIOLegacy)
++INCLUDE(${VTK_USE_FILE})
 +IF(VTK_FOUND)
 +  IF(${VTK_MAJOR_VERSION} EQUAL 6)
 +    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLAMMPS_VTK6 -DLAMMPS_VTK")
@@ -93,10 +94,10 @@ Index: LIGGGHTS-PUBLIC-3.0.3/CMakeLists.txt
 +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
 +
 +ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/src")
-Index: LIGGGHTS-PUBLIC-3.0.3/src/CMakeLists.txt
+Index: LIGGGHTS-PUBLIC-3.1.0/src/CMakeLists.txt
 ===================================================================
---- LIGGGHTS-PUBLIC-3.0.3.orig/src/CMakeLists.txt
-+++ LIGGGHTS-PUBLIC-3.0.3/src/CMakeLists.txt
+--- LIGGGHTS-PUBLIC-3.1.0.orig/src/CMakeLists.txt
++++ LIGGGHTS-PUBLIC-3.1.0/src/CMakeLists.txt
 @@ -1,80 +1,57 @@
 -# ENABLE_PACKAGE: enable PACKAGE-modules (OFF by default)
 -# ENABLE_PACKAGEUSER: enable PACKAGEUSER-modules (OFF by default)
diff --git a/debian/patches/05_vtk6_support.patch b/debian/patches/05_vtk6_support.patch
index 9d38f66..615c6bb 100644
--- a/debian/patches/05_vtk6_support.patch
+++ b/debian/patches/05_vtk6_support.patch
@@ -1,8 +1,12 @@
-Index: LIGGGHTS-PUBLIC-3.0.3/src/dump_atom_vtk.cpp
+Description: Fixes compilation against VTK6
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2015-03-17
+
+Index: LIGGGHTS-PUBLIC-3.0.7/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
+--- LIGGGHTS-PUBLIC-3.0.7.orig/src/dump_atom_vtk.cpp
++++ LIGGGHTS-PUBLIC-3.0.7/src/dump_atom_vtk.cpp
+@@ -313,11 +313,11 @@ void DumpATOMVTK::vtkExportData::writeSE
  
    vtkSmartPointer<vtkXMLUnstructuredGridWriter> writer = vtkSmartPointer<vtkXMLUnstructuredGridWriter>::New();
    writer->SetDataModeToAscii();

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