This is an automated email from the git hooks/post-receive script. gert-guest pushed a commit to branch master in repository gdcm.
commit f9172be950817eb6b51822b4df895d6753e3253b Author: Gert Wollny <[email protected]> Date: Mon Jul 11 13:36:51 2016 +0000 update patches --- debian/patches/02_fixhurd.patch | 50 +++++----------------- debian/patches/03_linkvtkdoc.patch | 9 ---- debian/patches/07_don_t_link_vtkjava_modules.patch | 22 ---------- debian/patches/series | 16 +++---- debian/rules | 1 + 5 files changed, 19 insertions(+), 79 deletions(-) diff --git a/debian/patches/02_fixhurd.patch b/debian/patches/02_fixhurd.patch index 5df250b..ccb0e13 100644 --- a/debian/patches/02_fixhurd.patch +++ b/debian/patches/02_fixhurd.patch @@ -3,13 +3,11 @@ Description: Fix compilation on GNU/Hurd http://www.gnu.org/software/hurd/hurd/porting/guidelines.html#GNU_specific_define_tt_ Author: Mathieu Malaterre <[email protected]> -Index: gdcm-2.4.1/Source/Common/gdcmSystem.cxx -=================================================================== ---- gdcm-2.4.1.orig/Source/Common/gdcmSystem.cxx 2013-12-09 18:22:40.000000000 +0100 -+++ gdcm-2.4.1/Source/Common/gdcmSystem.cxx 2013-12-10 09:15:48.378563355 +0100 -@@ -363,6 +363,10 @@ - return Rmdir(source) == 0; - } +--- a/Source/Common/gdcmSystem.cxx ++++ b/Source/Common/gdcmSystem.cxx +@@ -365,6 +365,10 @@ + #define PATH_MAX 4096 + #endif +#ifndef PATH_MAX +#define PATH_MAX 4096 @@ -18,13 +16,11 @@ Index: gdcm-2.4.1/Source/Common/gdcmSystem.cxx // return size of file; also returns zero if no file exists size_t System::FileSize(const char* filename) { -Index: gdcm-2.4.1/Source/DataDictionary/gdcmGlobal.cxx -=================================================================== ---- gdcm-2.4.1.orig/Source/DataDictionary/gdcmGlobal.cxx 2013-12-09 18:22:40.000000000 +0100 -+++ gdcm-2.4.1/Source/DataDictionary/gdcmGlobal.cxx 2013-12-10 09:15:48.378563355 +0100 -@@ -133,6 +133,10 @@ - return true; - } +--- a/Source/DataDictionary/gdcmGlobal.cxx ++++ b/Source/DataDictionary/gdcmGlobal.cxx +@@ -137,6 +137,10 @@ + #define PATH_MAX 4096 + #endif +#ifndef PATH_MAX +#define PATH_MAX 4096 @@ -33,29 +29,3 @@ Index: gdcm-2.4.1/Source/DataDictionary/gdcmGlobal.cxx const char *Global::Locate(const char *resfile) const { #ifdef _WIN32 -Index: gdcm-2.4.1/Utilities/socketxx/socket++/sockstream.h -=================================================================== ---- gdcm-2.6.0.old/Utilities/socketxx/socket++/local.h 2015-09-03 16:42:12.000000000 +0200 -+++ gdcm-2.6.0/Utilities/socketxx/socket++/local.h 2015-10-16 14:20:06.073470902 +0200 -@@ -97,7 +97,7 @@ - // extern "C" int gethostname (char* hostname, size_t len); - // the above breaks on some old MacOSX system where prototype is: - // extern "C" int gethostname (char* hostname, int len); --#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)) -+#if !(defined(__FreeBSD__) || defined(__GNU__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__)) - extern char* SYS_SIGLIST []; - #endif - #endif -Index: gdcm-2.4.1/Utilities/socketxx/socket++/local.h -=================================================================== ---- gdcm-2.6.0.old/Utilities/socketxx/socket++/sockstream.h 2015-09-03 16:42:12.000000000 +0200 -+++ gdcm-2.6.0/Utilities/socketxx/socket++/sockstream.h 2015-10-16 14:18:20.516146044 +0200 -@@ -163,7 +163,7 @@ - msg_peek = MSG_PEEK, - msg_dontroute = MSG_DONTROUTE - --#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__EMSCRIPTEN__)) -+#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__GNU__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__) || defined(__EMSCRIPTEN__) ) - ,msg_maxiovlen = MSG_MAXIOVLEN - #endif - }; diff --git a/debian/patches/03_linkvtkdoc.patch b/debian/patches/03_linkvtkdoc.patch index f18e721..a4de40f 100644 --- a/debian/patches/03_linkvtkdoc.patch +++ b/debian/patches/03_linkvtkdoc.patch @@ -42,15 +42,6 @@ Author: Gert Wollny <[email protected]>, Mathieu Malaterre <[email protected]> if(INCLUDE_QT_DOCUMENTATION) set (TAGFILES "${TAGFILES} \"${QT_TAG_FILE}=http://doc.trolltech.com/4.2\"";) endif() -@@ -109,7 +107,7 @@ - ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh @ONLY ) - - add_custom_target(${DOXYGEN_PROJECT_NAME}DoxygenDoc -- #ALL -+ ALL - ${BASH} - ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh) - --- a/Utilities/doxygen/vtk/doc_makeall.sh.in +++ b/Utilities/doxygen/vtk/doc_makeall.sh.in @@ -169,12 +169,12 @@ diff --git a/debian/patches/07_don_t_link_vtkjava_modules.patch b/debian/patches/07_don_t_link_vtkjava_modules.patch deleted file mode 100644 index f8ba47b..0000000 --- a/debian/patches/07_don_t_link_vtkjava_modules.patch +++ /dev/null @@ -1,22 +0,0 @@ -Description: Don't link against the vtk-java modules - I could be utterly wrong, but AAFAIK Java modules are not - shared libraries in the sense that one would link against - them at compile time. Instread they are loaded dynamically - during run-time by the java run-time engine. -Author: Gert Wollny <[email protected]> - ---- a/Utilities/VTK/CMakeLists.txt -+++ b/Utilities/VTK/CMakeLists.txt -@@ -670,9 +670,9 @@ - endif() - target_link_libraries(${VTKGDCM_NAME}Java ${VTKGDCM_NAME}) - set_property(TARGET ${VTKGDCM_NAME}Java PROPERTY NO_SONAME 1) -- foreach(c ${vtkgdcm_LIBS}) -- target_link_libraries(${VTKGDCM_NAME}Java ${c}Java) -- endforeach() -+# foreach(c ${vtkgdcm_LIBS}) -+# target_link_libraries(${VTKGDCM_NAME}Java ${c}Java) -+# endforeach() - # Create the jar file: - # I am pretty sure this *.java thingy will bite me one day, when someone will try - # to recompile from an existing build tree with invalid generated *.java file... diff --git a/debian/patches/series b/debian/patches/series index e2001ea..54e2f9c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,11 +1,11 @@ 02_fixhurd.patch 03_linkvtkdoc.patch 04_multiarch.patch -05_add_global_doxydoc_target.patch -06_dcm_group2_buggyfiles_fallback.patch -07_don_t_link_vtkjava_modules.patch -08_supportvtk6.3.patch -09_set_java_15.patch -10_gdcm_openjpeg2_git4f793f.patch -11_gdcm_openjpeg2_git0511b1.patch -12_gdcm_system_charls_includes.patch +#05_add_global_doxydoc_target.patch +#06_dcm_group2_buggyfiles_fallback.patch +#07_don_t_link_vtkjava_modules.patch +#08_supportvtk6.3.patch +#09_set_java_15.patch +#10_gdcm_openjpeg2_git4f793f.patch +#11_gdcm_openjpeg2_git0511b1.patch +#12_gdcm_system_charls_includes.patch diff --git a/debian/rules b/debian/rules index 5277d78..dbdcc81 100755 --- a/debian/rules +++ b/debian/rules @@ -75,6 +75,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \ -DGDCM_INSTALL_PYTHONMODULE_DIR:STRING=lib/python/dist-packages \ -DGDCM_INSTALL_JAVAMODULE_DIR:STRING=lib/$(DEB_HOST_MULTIARCH)/jni \ -DGDCM_NO_PYTHON_LIBS_LINKING:BOOL=ON \ + -DGDCM_NO_VTKJAVA_LIBS_LINKING:BOOL=ON \ -DGDCM_INSTALL_LIB_DIR:STRING=lib/$(DEB_HOST_MULTIARCH) \ -DGDCM_USE_VTK:BOOL=ON \ -DVTK_JAVA_JAR=/usr/share/java/vtk6.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/gdcm.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
