Author: malat Date: 2014-09-24 12:23:27 +0000 (Wed, 24 Sep 2014) New Revision: 18118
Added: trunk/packages/vtk-dicom/trunk/debian/patches/86c8bba332eb35cce6f877819614d7af91168fd8.patch trunk/packages/vtk-dicom/trunk/debian/patches/9e77f65c45b8ead158545b1542abccc30e9592f9.patch trunk/packages/vtk-dicom/trunk/debian/patches/series Modified: trunk/packages/vtk-dicom/trunk/debian/changelog Log: cherry pick patch upstream Modified: trunk/packages/vtk-dicom/trunk/debian/changelog =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/changelog 2014-09-24 12:20:24 UTC (rev 18117) +++ trunk/packages/vtk-dicom/trunk/debian/changelog 2014-09-24 12:23:27 UTC (rev 18118) @@ -1,3 +1,10 @@ +vtk-dicom (0.5.5-2) unstable; urgency=low + + * Do not link explicitly to libpython. Closes: #762102 + * Do not clutter jar file with java source code. Closes: #762112 + + -- Mathieu Malaterre <[email protected]> Wed, 24 Sep 2014 14:17:38 +0200 + vtk-dicom (0.5.5-1) unstable; urgency=low * New upstream Added: trunk/packages/vtk-dicom/trunk/debian/patches/86c8bba332eb35cce6f877819614d7af91168fd8.patch =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/patches/86c8bba332eb35cce6f877819614d7af91168fd8.patch (rev 0) +++ trunk/packages/vtk-dicom/trunk/debian/patches/86c8bba332eb35cce6f877819614d7af91168fd8.patch 2014-09-24 12:23:27 UTC (rev 18118) @@ -0,0 +1,41 @@ +From 86c8bba332eb35cce6f877819614d7af91168fd8 Mon Sep 17 00:00:00 2001 +From: David Gobbi <[email protected]> +Date: Mon, 22 Sep 2014 09:22:20 -0600 +Subject: [PATCH] Put java classes in their own directory. + +This makes it easy to put only the java classes into the jar +(previously lots of java build files were put into the jar, as well). +--- + CMakeLists.txt | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 63dfa33..d5436d2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -438,6 +438,7 @@ if(BUILD_JAVA_WRAPPERS) + set(VTK_JAVA_HOME ${CMAKE_CURRENT_BINARY_DIR}/java/vtk) + set(VTK_JAVA_MANIFEST ${CMAKE_CURRENT_BINARY_DIR}/java/manifest.txt) + make_directory(${VTK_JAVA_HOME}) ++ make_directory(${CMAKE_CURRENT_BINARY_DIR}/javajar/vtk) + set(LIB_JAVA_NAME ${LIB_NAME}Java) + set(LIB_JAVA_LIBS) + foreach(TMP_LIB ${VTK_LIBS}) +@@ -496,7 +497,7 @@ if(BUILD_JAVA_WRAPPERS) + -target ${VTK_JAVA_TARGET_VERSION} + -classpath ${VTK_JAVA_JAR}${_sep}${VTK_DIR}/java + -sourcepath ${VTK_DIR}/java/vtk/ +- -d ${CMAKE_CURRENT_BINARY_DIR}/java ++ -d ${CMAKE_CURRENT_BINARY_DIR}/javajar + ${CMAKE_CURRENT_BINARY_DIR}/java/vtk/*.java + COMMAND ${CMAKE_COMMAND} + -E touch ${CMAKE_CURRENT_BINARY_DIR}/java/javac_stamp.txt +@@ -507,7 +508,7 @@ if(BUILD_JAVA_WRAPPERS) + COMMAND ${JAVA_ARCHIVE} -cvfm + "${VTK_JAR_PATH}/vtkdicom.jar" + ${VTK_JAVA_MANIFEST} +- -C ${CMAKE_CURRENT_BINARY_DIR}/java ++ -C ${CMAKE_CURRENT_BINARY_DIR}/javajar + vtk + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/java/javac_stamp.txt ${JAVA_LIBRARIES} + OUTPUT ${VTK_JAR_PATH}/vtkdicom.jar Added: trunk/packages/vtk-dicom/trunk/debian/patches/9e77f65c45b8ead158545b1542abccc30e9592f9.patch =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/patches/9e77f65c45b8ead158545b1542abccc30e9592f9.patch (rev 0) +++ trunk/packages/vtk-dicom/trunk/debian/patches/9e77f65c45b8ead158545b1542abccc30e9592f9.patch 2014-09-24 12:23:27 UTC (rev 18118) @@ -0,0 +1,45 @@ +From 9e77f65c45b8ead158545b1542abccc30e9592f9 Mon Sep 17 00:00:00 2001 +From: David Gobbi <[email protected]> +Date: Mon, 22 Sep 2014 07:19:35 -0600 +Subject: [PATCH] On linux, use private libpython linkage. + +CMake was transitively linking libpython to vtkDICOMPython.so +via libvtkDICOMPythonD. Use private linkage on linux. +--- + CMakeLists.txt | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 25c3a74..63dfa33 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -396,8 +396,16 @@ if(BUILD_PYTHON_WRAPPERS) + set_target_properties(${LIB_PYTHON_NAME} PROPERTIES + VERSION "${DICOM_VERSION}" SOVERSION "${DICOM_SHORT_VERSION}" + OUTPUT_NAME "${LIB_PYTHON_OUTPUT_NAME}") +- target_link_libraries(${LIB_PYTHON_NAME} +- ${LIB_NAME} ${LIB_PYTHON_LIBS} ${VTK_PYTHON_LIBRARIES}) ++ target_link_libraries(${LIB_PYTHON_NAME} LINK_PUBLIC ++ ${LIB_NAME} ${LIB_PYTHON_LIBS}) ++ # On Win32 and Mac, link python library non-private ++ if(WIN32 OR APPLE) ++ target_link_libraries(${LIB_PYTHON_NAME} LINK_PUBLIC ++ ${VTK_PYTHON_LIBRARIES}) ++ else() ++ target_link_libraries(${LIB_PYTHON_NAME} LINK_PRIVATE ++ ${VTK_PYTHON_LIBRARIES}) ++ endif() + if(USE_DCMTK AND DCMTK_charls_LIBRARY) + target_link_libraries(${LIB_PYTHON_NAME} ${DCMTK_charls_LIBRARY}) + endif() +@@ -413,10 +421,6 @@ if(BUILD_PYTHON_WRAPPERS) + set_target_properties(${MODULE_PYTHON_NAME} PROPERTIES NO_SONAME 1) + endif() + target_link_libraries(${MODULE_PYTHON_NAME} ${LIB_PYTHON_NAME}) +- # On Win32 and Mac, link python library now, on UNIX, don't +- if(WIN32 OR APPLE) +- target_link_libraries(${MODULE_PYTHON_NAME} ${VTK_PYTHON_LIBRARIES}) +- endif() + set(DICOM_PYTHON_LIBRARIES ${LIB_PYTHON_NAME}) + endif() + Added: trunk/packages/vtk-dicom/trunk/debian/patches/series =================================================================== --- trunk/packages/vtk-dicom/trunk/debian/patches/series (rev 0) +++ trunk/packages/vtk-dicom/trunk/debian/patches/series 2014-09-24 12:23:27 UTC (rev 18118) @@ -0,0 +1,2 @@ +9e77f65c45b8ead158545b1542abccc30e9592f9.patch +86c8bba332eb35cce6f877819614d7af91168fd8.patch _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
