[med-svn] [orthanc] 01/03: fix issue #865606

[Sebastien Jodogne]

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

jodogne-guest pushed a commit to branch master
in repository orthanc.

commit dcf27da2d2ae0251297db71bfe75590c37c79ff7
Author: jodogne-guest <s.jodogne at gmail.com>
Date:   Fri Jun 23 10:31:24 2017 +0200

    fix issue #865606
---
 debian/changelog               |  6 ++++++
 debian/patches/fix-dcmtk-3.6.1 | 30 ++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 3 files changed, 37 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index af55538..ae2c939 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+orthanc (1.2.0+dfsg-2) UNRELEASED; urgency=medium
+
+  * Fix FTBFS with libdcmtk-dev 3.6.1~20170228-2. Closes: #865606
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Fri, 23 Jun 2017 10:25:41 +0200
+
 orthanc (1.2.0+dfsg-1) unstable; urgency=medium
 
   [ Sebastien Jodogne ]
diff --git a/debian/patches/fix-dcmtk-3.6.1 b/debian/patches/fix-dcmtk-3.6.1
new file mode 100644
index 0000000..2c63a09
--- /dev/null
+++ b/debian/patches/fix-dcmtk-3.6.1
@@ -0,0 +1,30 @@
+Description: Fix FTBFS with libdcmtk-dev 3.6.1~20170228-2
+Author: Sebastien Jodogne <s.jodogne at gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: Orthanc-1.2.0/OrthancServer/FromDcmtkBridge.cpp
+===================================================================
+--- Orthanc-1.2.0.orig/OrthancServer/FromDcmtkBridge.cpp
++++ Orthanc-1.2.0/OrthancServer/FromDcmtkBridge.cpp
+@@ -1680,7 +1680,7 @@ namespace Orthanc
+           throw OrthancException(ErrorCode_BadParameterType);
+         }
+ 
+-        DcmSequenceOfItems* sequence = new DcmSequenceOfItems(key, value.size());
++        DcmSequenceOfItems* sequence = new DcmSequenceOfItems(key);
+         element.reset(sequence);
+         
+         for (Json::Value::ArrayIndex i = 0; i < value.size(); i++)
+Index: Orthanc-1.2.0/Resources/CMake/DcmtkConfiguration.cmake
+===================================================================
+--- Orthanc-1.2.0.orig/Resources/CMake/DcmtkConfiguration.cmake
++++ Orthanc-1.2.0/Resources/CMake/DcmtkConfiguration.cmake
+@@ -270,6 +270,8 @@ else()
+     set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
+   elseif (EXISTS "${DCMTK_config_INCLUDE_DIR}/osconfig.h")  # This is for Arch Linux
+     set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/osconfig.h")
++  elseif (EXISTS "${DCMTK_INCLUDE_DIRS}/dcmtk/config/osconfig.h")  # This is for Debian Buster
++    set(DCMTK_CONFIGURATION_FILE "${DCMTK_INCLUDE_DIRS}/dcmtk/config/osconfig.h")
+   else()
+     message(FATAL_ERROR "Please install libdcmtk*-dev")
+   endif()
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..fad379f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-dcmtk-3.6.1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/orthanc.git