# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1550760373 -3600
# Node ID fddf3ceed7e57fd422ad6e14dbbc3afd89bfbc9c
# Parent  dd10fe965870f04ff98197e85a774eef29db0ded
fixing lsb and msvc builds

diff -r dd10fe965870 -r fddf3ceed7e5 Resources/CMake/DcmtkConfigurationStatic-3.6.4.cmake
--- a/Resources/CMake/DcmtkConfigurationStatic-3.6.4.cmake	Thu Feb 21 15:13:49 2019 +0100
+++ b/Resources/CMake/DcmtkConfigurationStatic-3.6.4.cmake	Thu Feb 21 15:46:13 2019 +0100
@@ -25,6 +25,19 @@
 DownloadPackage(${DCMTK_MD5} ${DCMTK_URL} "${DCMTK_SOURCES_DIR}")
 
 
+# Apply the patches
+execute_process(
+  COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
+  ${ORTHANC_ROOT}/Resources/Patches/dcmtk-3.6.4.patch
+  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+  RESULT_VARIABLE Failure
+  )
+
+if (FirstRun AND Failure)
+  message(FATAL_ERROR "Error while patching files")
+endif()
+
+
 include_directories(
   ${DCMTK_SOURCES_DIR}/dcmiod/include
   )
diff -r dd10fe965870 -r fddf3ceed7e5 Resources/Patches/dcmtk-3.6.4.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/Patches/dcmtk-3.6.4.patch	Thu Feb 21 15:46:13 2019 +0100
@@ -0,0 +1,24 @@
+diff -urEb dcmtk-3.6.4.orig/dcmdata/libsrc/dcpxitem.cc dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc
+--- dcmtk-3.6.4.orig/dcmdata/libsrc/dcpxitem.cc	2019-02-21 15:30:21.657110805 +0100
++++ dcmtk-3.6.4/dcmdata/libsrc/dcpxitem.cc	2019-02-21 15:41:01.565099612 +0100
+@@ -28,6 +28,7 @@
+ #include "dcmtk/ofstd/ofstdinc.h"
+ 
+ #include "dcmtk/ofstd/ofstream.h"
++#include "dcmtk/ofstd/oflimits.h"
+ #include "dcmtk/dcmdata/dcpxitem.h"
+ #include "dcmtk/dcmdata/dcswap.h"
+ #include "dcmtk/ofstd/ofstring.h"
+diff -urEb dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h
+--- dcmtk-3.6.4.orig/ofstd/include/dcmtk/ofstd/offile.h	2019-02-21 15:30:21.645110805 +0100
++++ dcmtk-3.6.4/ofstd/include/dcmtk/ofstd/offile.h	2019-02-21 15:30:48.273110339 +0100
+@@ -575,7 +575,7 @@
+    */
+   void setlinebuf()
+   {
+-#if defined(_WIN32) || defined(__hpux)
++#if defined(_WIN32) || defined(__hpux) || defined(__LSB_VERSION__)
+     this->setvbuf(NULL, _IOLBF, 0);
+ #else
+     :: setlinebuf(file_);
+Only in dcmtk-3.6.4/ofstd/include/dcmtk/ofstd: offile.h~
diff -r dd10fe965870 -r fddf3ceed7e5 Resources/Patches/dcmtk.txt
--- a/Resources/Patches/dcmtk.txt	Thu Feb 21 15:13:49 2019 +0100
+++ b/Resources/Patches/dcmtk.txt	Thu Feb 21 15:46:13 2019 +0100
@@ -3,6 +3,7 @@
 
 diff -urEb dcmtk-3.6.0.orig/ dcmtk-3.6.0
 diff -urEb dcmtk-3.6.2.orig/ dcmtk-3.6.2
+diff -urEb dcmtk-3.6.4.orig/ dcmtk-3.6.4
 
 For "dcmtk-3.6.2-private.dic"
 =============================