This is an automated email from the git hooks/post-receive script. gewo pushed a commit to branch master in repository orthanc-wsi.
commit 8e43555be38f4c40ac2a57a12285a7f16c7ee085 Author: Gert Wollny <[email protected]> Date: Sun Jun 25 07:56:02 2017 +0000 Correct cmake and dcmtk patch --- debian/patches/cmake | 18 ------------------ .../patches/{cmake => dcmtk-3.6.1~20170228.patch} | 22 ++-------------------- debian/patches/series | 1 + 3 files changed, 3 insertions(+), 38 deletions(-) diff --git a/debian/patches/cmake b/debian/patches/cmake index d811c36..ee40c27 100644 --- a/debian/patches/cmake +++ b/debian/patches/cmake @@ -18,21 +18,3 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ install( TARGETS OrthancWSI ---- a/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake -+++ b/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake -@@ -266,6 +266,7 @@ - -DHAVE_CONFIG_H=1 - ) - -+ SET(DCMTK_config_INCLUDE_DIR ${DCMTK_INCLUDE_DIR}/dcmtk/config) - if (EXISTS "${DCMTK_config_INCLUDE_DIR}/cfunix.h") - set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/cfunix.h") - elseif (EXISTS "${DCMTK_config_INCLUDE_DIR}/osconfig.h") # This is for Arch Linux -@@ -300,6 +301,7 @@ - if (DCMTK_DICTIONARY_DIR STREQUAL "") - find_path(DCMTK_DICTIONARY_DIR_AUTO dicom.dic - /usr/share/dcmtk -+ /usr/share/libdcmtk11 - /usr/share/libdcmtk1 - /usr/share/libdcmtk2 - /usr/share/libdcmtk3 diff --git a/debian/patches/cmake b/debian/patches/dcmtk-3.6.1~20170228.patch similarity index 53% copy from debian/patches/cmake copy to debian/patches/dcmtk-3.6.1~20170228.patch index d811c36..8d70001 100644 --- a/debian/patches/cmake +++ b/debian/patches/dcmtk-3.6.1~20170228.patch @@ -1,23 +1,5 @@ -Description: Fix the version of the shared library -Author: Sebastien Jodogne <[email protected]> ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/ViewerPlugin/CMakeLists.txt -+++ b/ViewerPlugin/CMakeLists.txt -@@ -234,9 +234,10 @@ - ) - - message("Setting the version of the library to ${ORTHANC_WSI_VERSION}") --set_target_properties(OrthancWSI PROPERTIES -- VERSION ${ORTHANC_WSI_VERSION} -- SOVERSION ${ORTHANC_WSI_VERSION}) -+set_target_properties(OrthancWSI PROPERTIES -+ NO_SONAME ON -+ LINK_FLAGS "-Wl,-soname,libOrthancWSI.so.${ORTHANC_WSI_VERSION}" -+ ) - - install( - TARGETS OrthancWSI +Description: Fix finding and compiling against dcmtk-201702028 +Author: Gert Wollny <[email protected]> --- a/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake +++ b/Resources/Orthanc/Resources/CMake/DcmtkConfiguration.cmake @@ -266,6 +266,7 @@ diff --git a/debian/patches/series b/debian/patches/series index a3ea3e4..de0be01 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ cmake +dcmtk-3.6.1~20170228.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/orthanc-wsi.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
