[vtk6] 04/07: Update patches.
Anton Gladky
gladk at moszumanska.debian.org
Sun May 18 12:27:05 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to annotated tag debian/6.1.0+dfsg-1
in repository vtk6.
commit 2ccdfa6d496a2a3992cc1c292c02e7011c8f9b2c
Author: Anton Gladky <gladk at debian.org>
Date: Sat May 17 20:36:11 2014 +0200
Update patches.
---
debian/patches/10_Java_Target.patch | 14 ++++++------
debian/patches/docs.patch | 6 ++---
debian/patches/matplotlib.patch | 6 ++---
debian/patches/series | 2 --
debian/patches/soversion-sharedlib.patch | 16 +++++---------
debian/patches/use_system_json.patch | 38 --------------------------------
debian/patches/vtkTclWrapper.patch | 6 ++---
debian/patches/vtkWrapJava.patch | 12 ++++------
8 files changed, 23 insertions(+), 77 deletions(-)
diff --git a/debian/patches/10_Java_Target.patch b/debian/patches/10_Java_Target.patch
index b70d373..5d0fee1 100644
--- a/debian/patches/10_Java_Target.patch
+++ b/debian/patches/10_Java_Target.patch
@@ -3,18 +3,18 @@ Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>, Anton Gladky <gla
Bug-Debian: http://bugs.debian.org/747108
Last-Update: 2014-05-09
---- vtk6-6.0.0.orig/Wrapping/Java/CMakeLists.txt
-+++ vtk6-6.0.0/Wrapping/Java/CMakeLists.txt
-@@ -237,7 +237,7 @@ add_custom_command(
+--- a/Wrapping/Java/CMakeLists.txt
++++ b/Wrapping/Java/CMakeLists.txt
+@@ -309,7 +309,7 @@
OUTPUT ${VTK_BINARY_DIR}/java/javac_stamp.txt
DEPENDS ${VTK_JAVA_SOURCE_FILES}
COMMAND ${JAVA_COMPILE} ${JAVAC_OPTIONS}
-- -source 1.5 -classpath ${VTK_JAVA_HOME}/..${SEPARATOR}${ECLIPSE_SWT_LIBRARIES} -sourcepath ${VTK_SOURCE_DIR}/Wrapping/Java/ -d ${VTK_BINARY_DIR}/java
-+ -source 1.5 -target 1.5 -classpath ${VTK_JAVA_HOME}/..${SEPARATOR}${ECLIPSE_SWT_LIBRARIES} -sourcepath ${VTK_SOURCE_DIR}/Wrapping/Java/ -d ${VTK_BINARY_DIR}/java
- ${VTK_BINARY_DIR}/java/vtk/*.java ${VTK_BINARY_DIR}/java/vtk/rendering/*.java ${VTK_BINARY_DIR}/java/vtk/rendering/awt/*.java ${SWT_FILES}
+- -source 1.5 -classpath ${JAVA_COMPILATION_CLASSPATH} -sourcepath ${VTK_SOURCE_DIR}/Wrapping/Java/ -d ${VTK_BINARY_DIR}/java
++ -source 1.5 -target 1.5 -classpath ${JAVA_COMPILATION_CLASSPATH} -sourcepath ${VTK_SOURCE_DIR}/Wrapping/Java/ -d ${VTK_BINARY_DIR}/java
+ ${VTK_BINARY_DIR}/java/vtk/*.java ${VTK_BINARY_DIR}/java/vtk/rendering/*.java ${VTK_BINARY_DIR}/java/vtk/rendering/awt/*.java ${VTK_BINARY_DIR}/java/vtk/sample/*.java ${SWT_FILES} ${JOGL_FILES}
COMMAND ${CMAKE_COMMAND} -E touch ${VTK_BINARY_DIR}/java/javac_stamp.txt
COMMENT "Compiling Java Classes"
-@@ -269,7 +269,7 @@ if(BUILD_TESTING)
+@@ -341,7 +341,7 @@
add_custom_command(
OUTPUT ${VTK_BINARY_DIR}/java/javac_tests_stamp.txt
COMMAND ${JAVA_COMPILE} ${JAVAC_OPTIONS} -classpath ${VTK_JAR_PATH}/vtk.jar${SEPARATOR}${VTK_BINARY_DIR}/Wrapping/Java
diff --git a/debian/patches/docs.patch b/debian/patches/docs.patch
index ba04b5d..351c6d4 100644
--- a/debian/patches/docs.patch
+++ b/debian/patches/docs.patch
@@ -1,7 +1,5 @@
-Index: vtk6/Utilities/Doxygen/doxyfile.in
-===================================================================
---- vtk6.orig/Utilities/Doxygen/doxyfile.in 2013-11-04 11:39:57.054144719 +0100
-+++ vtk6/Utilities/Doxygen/doxyfile.in 2013-11-04 11:42:40.814137832 +0100
+--- a/Utilities/Doxygen/doxyfile.in
++++ b/Utilities/Doxygen/doxyfile.in
@@ -12,7 +12,7 @@
GENERATE_TODOLIST = YES
GENERATE_BUGLIST = YES
diff --git a/debian/patches/matplotlib.patch b/debian/patches/matplotlib.patch
index 776fbd0..ab9e071 100644
--- a/debian/patches/matplotlib.patch
+++ b/debian/patches/matplotlib.patch
@@ -1,7 +1,5 @@
-Index: vtk-6.0.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
-===================================================================
---- vtk-6.0.0.orig/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h 2013-10-28 14:28:13.000000000 +0100
-+++ vtk-6.0.0/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h 2013-10-28 14:30:17.000000000 +0100
+--- a/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
++++ b/Rendering/Matplotlib/vtkMatplotlibMathTextUtilities.h
@@ -117,6 +117,10 @@
// Function used to check MPL availability and update MPLMathTextAvailable.
// This will do tests only the first time this method is called.
diff --git a/debian/patches/series b/debian/patches/series
index c77ff6a..5647aca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
allpatches.patch
-use_system_json.patch
soversion-sharedlib.patch
-examples-add-shebang.patch
vtkTclWrapper.patch
vtkWrapJava.patch
matplotlib.patch
diff --git a/debian/patches/soversion-sharedlib.patch b/debian/patches/soversion-sharedlib.patch
index ddc315f..a6e95c0 100644
--- a/debian/patches/soversion-sharedlib.patch
+++ b/debian/patches/soversion-sharedlib.patch
@@ -1,11 +1,9 @@
-Index: vtk-6.0.0/CMake/vtkModuleMacros.cmake
-===================================================================
---- vtk-6.0.0.orig/CMake/vtkModuleMacros.cmake 2013-10-18 12:01:15.000000000 +0200
-+++ vtk-6.0.0/CMake/vtkModuleMacros.cmake 2013-10-18 12:01:25.000000000 +0200
-@@ -289,8 +289,8 @@
+--- a/CMake/vtkModuleMacros.cmake
++++ b/CMake/vtkModuleMacros.cmake
+@@ -341,8 +341,8 @@
macro(vtk_target_name _name)
get_property(_type TARGET ${_name} PROPERTY TYPE)
- if(NOT "${_type}" STREQUAL EXECUTABLE)
+ if(NOT "${_type}" STREQUAL EXECUTABLE AND NOT VTK_JAVA_INSTALL)
- set_property(TARGET ${_name} PROPERTY VERSION 1)
- set_property(TARGET ${_name} PROPERTY SOVERSION 1)
+ set_property(TARGET ${_name} PROPERTY VERSION ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}.${VTK_BUILD_VERSION})
@@ -13,10 +11,8 @@ Index: vtk-6.0.0/CMake/vtkModuleMacros.cmake
endif()
if("${_name}" MATCHES "^[Vv][Tt][Kk]")
set(_vtk "")
-Index: vtk-6.0.0/Rendering/Tk/CMakeLists.txt
-===================================================================
---- vtk-6.0.0.orig/Rendering/Tk/CMakeLists.txt 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Rendering/Tk/CMakeLists.txt 2013-10-18 14:58:14.000000000 +0200
+--- a/Rendering/Tk/CMakeLists.txt
++++ b/Rendering/Tk/CMakeLists.txt
@@ -122,7 +122,7 @@
vtk_target_install(vtkRenderingPythonTkWidgets)
diff --git a/debian/patches/use_system_json.patch b/debian/patches/use_system_json.patch
deleted file mode 100644
index 77a2081..0000000
--- a/debian/patches/use_system_json.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Use packaged version of json instead of embedded one.
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2013-06-13
-
-Index: vtk-6.0.0/IO/Geometry/module.cmake
-===================================================================
---- vtk-6.0.0.orig/IO/Geometry/module.cmake 2013-10-16 14:47:46.000000000 +0200
-+++ vtk-6.0.0/IO/Geometry/module.cmake 2013-10-16 14:47:46.000000000 +0200
-@@ -7,7 +7,6 @@
- vtkCommonMisc
- vtkIOCore
- vtkzlib
-- vtkjsoncpp
- TEST_DEPENDS
- vtkIOAMR
- vtkIOLegacy
-Index: vtk-6.0.0/IO/Geometry/CMakeLists.txt
-===================================================================
---- vtk-6.0.0.orig/IO/Geometry/CMakeLists.txt 2013-10-16 14:47:46.000000000 +0200
-+++ vtk-6.0.0/IO/Geometry/CMakeLists.txt 2013-10-16 14:47:46.000000000 +0200
-@@ -41,3 +41,4 @@
- )
-
- vtk_module_library(vtkIOGeometry ${Module_SRCS})
-+target_link_libraries(vtkIOGeometry jsoncpp)
-Index: vtk-6.0.0/IO/Geometry/vtkPlot3DMetaReader.cxx
-===================================================================
---- vtk-6.0.0.orig/IO/Geometry/vtkPlot3DMetaReader.cxx 2013-10-16 14:47:46.000000000 +0200
-+++ vtk-6.0.0/IO/Geometry/vtkPlot3DMetaReader.cxx 2013-10-16 14:47:46.000000000 +0200
-@@ -32,7 +32,7 @@
- #if defined(WIN32) && defined(VTK_BUILD_SHARED_LIBS)
- # define JSON_DLL
- #endif
--#include <json/json.h>
-+#include <jsoncpp/json/json.h>
-
- #define CALL_MEMBER_FN(object,ptrToMember) ((object).*(ptrToMember))
-
diff --git a/debian/patches/vtkTclWrapper.patch b/debian/patches/vtkTclWrapper.patch
index 101b735..14516ee 100644
--- a/debian/patches/vtkTclWrapper.patch
+++ b/debian/patches/vtkTclWrapper.patch
@@ -1,7 +1,5 @@
-Index: vtk-6.0.0/CMake/vtkTclWrapping.cmake
-===================================================================
---- vtk-6.0.0.orig/CMake/vtkTclWrapping.cmake 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/CMake/vtkTclWrapping.cmake 2013-10-24 11:30:33.000000000 +0200
+--- a/CMake/vtkTclWrapping.cmake
++++ b/CMake/vtkTclWrapping.cmake
@@ -46,6 +46,11 @@
foreach(dep ${${vtk-module}_LINK_DEPENDS})
if(NOT "${vtk-module}" STREQUAL "${dep}")
diff --git a/debian/patches/vtkWrapJava.patch b/debian/patches/vtkWrapJava.patch
index ff1e553..77292c9 100644
--- a/debian/patches/vtkWrapJava.patch
+++ b/debian/patches/vtkWrapJava.patch
@@ -1,7 +1,5 @@
-Index: vtk-6.0.0/Wrapping/Tools/vtkWrapJava.c
-===================================================================
---- vtk-6.0.0.orig/Wrapping/Tools/vtkWrapJava.c 2013-10-25 08:46:57.000000000 +0200
-+++ vtk-6.0.0/Wrapping/Tools/vtkWrapJava.c 2013-10-25 08:46:57.000000000 +0200
+--- a/Wrapping/Tools/vtkWrapJava.c
++++ b/Wrapping/Tools/vtkWrapJava.c
@@ -1251,8 +1251,31 @@
for (i = 0; i < data->NumberOfSuperClasses; i++)
@@ -59,10 +57,8 @@ Index: vtk-6.0.0/Wrapping/Tools/vtkWrapJava.c
fprintf(fp," { return res; }\n");
}
fprintf(fp," return NULL;\n");
-Index: vtk-6.0.0/Wrapping/Tools/vtkWrapTcl.c
-===================================================================
---- vtk-6.0.0.orig/Wrapping/Tools/vtkWrapTcl.c 2013-06-12 21:47:10.000000000 +0200
-+++ vtk-6.0.0/Wrapping/Tools/vtkWrapTcl.c 2013-10-25 08:54:19.000000000 +0200
+--- a/Wrapping/Tools/vtkWrapTcl.c
++++ b/Wrapping/Tools/vtkWrapTcl.c
@@ -1115,7 +1115,30 @@
for (i = 0; i < data->NumberOfSuperClasses; i++)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk6.git
More information about the debian-science-commits
mailing list