Mercurial > hg > orthanc

changeset 5963:49d5b3382ff9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix lsb build
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 16 Jan 2025 18:29:48 +0100
parents cb76465d0245
children f82e32e67208
files OrthancFramework/Resources/Patches/dcmtk-3.6.9.patch
diffstat 1 files changed, 46 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Resources/Patches/dcmtk-3.6.9.patch	Thu Jan 16 17:58:50 2025 +0100
+++ b/OrthancFramework/Resources/Patches/dcmtk-3.6.9.patch	Thu Jan 16 18:29:48 2025 +0100
@@ -1,6 +1,6 @@
 diff -urEb dcmtk-3.6.9.orig/CMake/GenerateDCMTKConfigure.cmake dcmtk-3.6.9/CMake/GenerateDCMTKConfigure.cmake
---- dcmtk-3.6.9.orig/CMake/GenerateDCMTKConfigure.cmake	2025-01-16 16:47:32.943218949 +0100
-+++ dcmtk-3.6.9/CMake/GenerateDCMTKConfigure.cmake	2025-01-16 16:48:30.443789647 +0100
+--- dcmtk-3.6.9.orig/CMake/GenerateDCMTKConfigure.cmake	2025-01-16 18:04:46.129846366 +0100
++++ dcmtk-3.6.9/CMake/GenerateDCMTKConfigure.cmake	2025-01-16 18:05:10.500636823 +0100
 @@ -227,12 +227,15 @@
  
  # Check the sizes of various types
@@ -18,8 +18,8 @@
  # Check for include files, libraries, and functions
  include("${DCMTK_CMAKE_INCLUDE}CMake/dcmtkTryCompile.cmake")
 diff -urEb dcmtk-3.6.9.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h dcmtk-3.6.9/dcmdata/include/dcmtk/dcmdata/dcdict.h
---- dcmtk-3.6.9.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h	2025-01-16 16:47:32.933219024 +0100
-+++ dcmtk-3.6.9/dcmdata/include/dcmtk/dcmdata/dcdict.h	2025-01-16 16:48:58.866576804 +0100
+--- dcmtk-3.6.9.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h	2025-01-16 18:04:46.110846529 +0100
++++ dcmtk-3.6.9/dcmdata/include/dcmtk/dcmdata/dcdict.h	2025-01-16 18:05:10.501636814 +0100
 @@ -163,6 +163,12 @@
      /// returns an iterator to the end of the repeating groups data dictionary
      DcmDictEntryListIterator repeatingEnd() { return repDict.end(); }
@@ -34,8 +34,8 @@
  
      /** private undefined assignment operator
 diff -urEb dcmtk-3.6.9.orig/dcmdata/libsrc/dcdict.cc dcmtk-3.6.9/dcmdata/libsrc/dcdict.cc
---- dcmtk-3.6.9.orig/dcmdata/libsrc/dcdict.cc	2025-01-16 16:47:32.937218994 +0100
-+++ dcmtk-3.6.9/dcmdata/libsrc/dcdict.cc	2025-01-16 16:49:17.749435189 +0100
+--- dcmtk-3.6.9.orig/dcmdata/libsrc/dcdict.cc	2025-01-16 18:04:46.115846486 +0100
++++ dcmtk-3.6.9/dcmdata/libsrc/dcdict.cc	2025-01-16 18:05:10.501636814 +0100
 @@ -904,3 +904,5 @@
    wrlock().clear();
    wrunlock();
@@ -43,8 +43,8 @@
 +
 +#include "dcdict_orthanc.cc"
 diff -urEb dcmtk-3.6.9.orig/dcmdata/libsrc/dcpxitem.cc dcmtk-3.6.9/dcmdata/libsrc/dcpxitem.cc
---- dcmtk-3.6.9.orig/dcmdata/libsrc/dcpxitem.cc	2025-01-16 16:47:32.934219016 +0100
-+++ dcmtk-3.6.9/dcmdata/libsrc/dcpxitem.cc	2025-01-16 16:49:36.124297217 +0100
+--- dcmtk-3.6.9.orig/dcmdata/libsrc/dcpxitem.cc	2025-01-16 18:04:46.112846512 +0100
++++ dcmtk-3.6.9/dcmdata/libsrc/dcpxitem.cc	2025-01-16 18:05:10.502636806 +0100
 @@ -31,6 +31,8 @@
  #include "dcmtk/dcmdata/dcostrma.h"    /* for class DcmOutputStream */
  #include "dcmtk/dcmdata/dcwcache.h"    /* for class DcmWriteCache */
@@ -55,8 +55,8 @@
  // ********************************
  
 diff -urEb dcmtk-3.6.9.orig/dcmnet/libsrc/scu.cc dcmtk-3.6.9/dcmnet/libsrc/scu.cc
---- dcmtk-3.6.9.orig/dcmnet/libsrc/scu.cc	2025-01-16 16:47:32.962218807 +0100
-+++ dcmtk-3.6.9/dcmnet/libsrc/scu.cc	2025-01-16 16:50:06.019072435 +0100
+--- dcmtk-3.6.9.orig/dcmnet/libsrc/scu.cc	2025-01-16 18:04:46.152846168 +0100
++++ dcmtk-3.6.9/dcmnet/libsrc/scu.cc	2025-01-16 18:05:10.503636797 +0100
 @@ -19,6 +19,11 @@
   *
   */
@@ -69,9 +69,25 @@
  #include "dcmtk/config/osconfig.h" /* make sure OS specific configuration is included first */
  
  #include "dcmtk/dcmdata/dcostrmf.h" /* for class DcmOutputFileStream */
+diff -urEb dcmtk-3.6.9.orig/oficonv/include/dcmtk/oficonv/iconv.h dcmtk-3.6.9/oficonv/include/dcmtk/oficonv/iconv.h
+--- dcmtk-3.6.9.orig/oficonv/include/dcmtk/oficonv/iconv.h	2025-01-16 18:04:46.135846314 +0100
++++ dcmtk-3.6.9/oficonv/include/dcmtk/oficonv/iconv.h	2025-01-16 18:28:16.150932503 +0100
+@@ -55,7 +55,12 @@
+ #endif
+ 
+ struct __tag_iconv_t;
++
++#if defined(__LSB_VERSION__)
++typedef void *iconv_t;
++#else
+ typedef struct __tag_iconv_t *iconv_t;
++#endif
+ 
+ #ifndef OFICONV_CITRUS_WC_T_DEFINED
+ #define OFICONV_CITRUS_WC_T_DEFINED
 diff -urEb dcmtk-3.6.9.orig/oflog/include/dcmtk/oflog/thread/syncpub.h dcmtk-3.6.9/oflog/include/dcmtk/oflog/thread/syncpub.h
---- dcmtk-3.6.9.orig/oflog/include/dcmtk/oflog/thread/syncpub.h	2025-01-16 16:47:32.914219165 +0100
-+++ dcmtk-3.6.9/oflog/include/dcmtk/oflog/thread/syncpub.h	2025-01-16 16:50:41.571804630 +0100
+--- dcmtk-3.6.9.orig/oflog/include/dcmtk/oflog/thread/syncpub.h	2025-01-16 18:04:46.042847114 +0100
++++ dcmtk-3.6.9/oflog/include/dcmtk/oflog/thread/syncpub.h	2025-01-16 18:05:10.503636797 +0100
 @@ -63,7 +63,7 @@
  
  DCMTK_LOG4CPLUS_INLINE_EXPORT
@@ -109,8 +125,8 @@
  
  
 diff -urEb dcmtk-3.6.9.orig/oflog/libsrc/oflog.cc dcmtk-3.6.9/oflog/libsrc/oflog.cc
---- dcmtk-3.6.9.orig/oflog/libsrc/oflog.cc	2025-01-16 16:47:32.915219158 +0100
-+++ dcmtk-3.6.9/oflog/libsrc/oflog.cc	2025-01-16 16:50:59.297670927 +0100
+--- dcmtk-3.6.9.orig/oflog/libsrc/oflog.cc	2025-01-16 18:04:46.043847105 +0100
++++ dcmtk-3.6.9/oflog/libsrc/oflog.cc	2025-01-16 18:05:10.504636789 +0100
 @@ -19,6 +19,11 @@
   *
   */
@@ -124,8 +140,8 @@
  #include "dcmtk/oflog/oflog.h"
  
 diff -urEb dcmtk-3.6.9.orig/ofstd/include/dcmtk/ofstd/offile.h dcmtk-3.6.9/ofstd/include/dcmtk/ofstd/offile.h
---- dcmtk-3.6.9.orig/ofstd/include/dcmtk/ofstd/offile.h	2025-01-16 16:47:32.961218815 +0100
-+++ dcmtk-3.6.9/ofstd/include/dcmtk/ofstd/offile.h	2025-01-16 16:51:21.873500479 +0100
+--- dcmtk-3.6.9.orig/ofstd/include/dcmtk/ofstd/offile.h	2025-01-16 18:04:46.148846202 +0100
++++ dcmtk-3.6.9/ofstd/include/dcmtk/ofstd/offile.h	2025-01-16 18:05:10.504636789 +0100
 @@ -569,7 +569,7 @@
     */
    void setlinebuf()
@@ -135,3 +151,17 @@
      this->setvbuf(NULL, _IOLBF, 0);
  #else
      :: setlinebuf(file_);
+diff -urEb dcmtk-3.6.9.orig/ofstd/libsrc/ofstub.cc dcmtk-3.6.9/ofstd/libsrc/ofstub.cc
+--- dcmtk-3.6.9.orig/ofstd/libsrc/ofstub.cc	2025-01-16 18:04:46.148846202 +0100
++++ dcmtk-3.6.9/ofstd/libsrc/ofstub.cc	2025-01-16 18:06:15.963074668 +0100
+@@ -35,6 +35,10 @@
+ #include <windows.h>
+ #endif /* HAVE_WINDOWS_H */
+ 
++#if defined(__LSB_VERSION__)
++#include <errno.h>
++#endif
++
+ #define EXITCODE_CANNOT_DETERMINE_DIR        90
+ #define EXITCODE_EXEC_FAILED                 91
+ #define EXITCODE_ILLEGAL_PARAMS              92