Mercurial > hg > orthanc

changeset 5981:a9c9952aa113

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix windows build
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 21 Jan 2025 16:10:01 +0100
parents f9ed33728c28
children f3dbc9a58195
files OrthancFramework/Resources/Patches/dcmtk-3.6.9.patch
diffstat 1 files changed, 32 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Resources/Patches/dcmtk-3.6.9.patch	Tue Jan 21 15:32:12 2025 +0100
+++ b/OrthancFramework/Resources/Patches/dcmtk-3.6.9.patch	Tue Jan 21 16:10:01 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 18:04:46.129846366 +0100
-+++ dcmtk-3.6.9/CMake/GenerateDCMTKConfigure.cmake	2025-01-16 18:05:10.500636823 +0100
+--- dcmtk-3.6.9.orig/CMake/GenerateDCMTKConfigure.cmake	2025-01-21 15:53:12.632715225 +0100
++++ dcmtk-3.6.9/CMake/GenerateDCMTKConfigure.cmake	2025-01-21 15:53:27.614627545 +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 18:04:46.110846529 +0100
-+++ dcmtk-3.6.9/dcmdata/include/dcmtk/dcmdata/dcdict.h	2025-01-16 18:05:10.501636814 +0100
+--- dcmtk-3.6.9.orig/dcmdata/include/dcmtk/dcmdata/dcdict.h	2025-01-21 15:53:12.622715283 +0100
++++ dcmtk-3.6.9/dcmdata/include/dcmtk/dcmdata/dcdict.h	2025-01-21 15:53:27.614627545 +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 18:04:46.115846486 +0100
-+++ dcmtk-3.6.9/dcmdata/libsrc/dcdict.cc	2025-01-16 18:05:10.501636814 +0100
+--- dcmtk-3.6.9.orig/dcmdata/libsrc/dcdict.cc	2025-01-21 15:53:12.625715265 +0100
++++ dcmtk-3.6.9/dcmdata/libsrc/dcdict.cc	2025-01-21 15:53:27.615627539 +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 18:04:46.112846512 +0100
-+++ dcmtk-3.6.9/dcmdata/libsrc/dcpxitem.cc	2025-01-16 18:05:10.502636806 +0100
+--- dcmtk-3.6.9.orig/dcmdata/libsrc/dcpxitem.cc	2025-01-21 15:53:12.623715277 +0100
++++ dcmtk-3.6.9/dcmdata/libsrc/dcpxitem.cc	2025-01-21 15:53:27.615627539 +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 18:04:46.152846168 +0100
-+++ dcmtk-3.6.9/dcmnet/libsrc/scu.cc	2025-01-16 18:05:10.503636797 +0100
+--- dcmtk-3.6.9.orig/dcmnet/libsrc/scu.cc	2025-01-21 15:53:12.655715091 +0100
++++ dcmtk-3.6.9/dcmnet/libsrc/scu.cc	2025-01-21 15:53:27.616627533 +0100
 @@ -19,6 +19,11 @@
   *
   */
@@ -70,8 +70,8 @@
  
  #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
+--- dcmtk-3.6.9.orig/oficonv/include/dcmtk/oficonv/iconv.h	2025-01-21 15:53:12.637715196 +0100
++++ dcmtk-3.6.9/oficonv/include/dcmtk/oficonv/iconv.h	2025-01-21 15:53:27.617627527 +0100
 @@ -55,7 +55,12 @@
  #endif
  
@@ -85,9 +85,21 @@
  
  #ifndef OFICONV_CITRUS_WC_T_DEFINED
  #define OFICONV_CITRUS_WC_T_DEFINED
+diff -urEb dcmtk-3.6.9.orig/oficonv/libsrc/citrus_lock.h dcmtk-3.6.9/oficonv/libsrc/citrus_lock.h
+--- dcmtk-3.6.9.orig/oficonv/libsrc/citrus_lock.h	2025-01-21 15:53:12.646715143 +0100
++++ dcmtk-3.6.9/oficonv/libsrc/citrus_lock.h	2025-01-21 16:03:17.310652376 +0100
+@@ -31,7 +31,7 @@
+ 
+ #ifdef WITH_THREADS
+ 
+-#ifdef HAVE_WINDOWS_H
++#if defined(HAVE_WINDOWS_H) && defined(HAVE_PROTOTYPE_TRYACQUIRESRWLOCKSHARE)
+ 
+ #include <windows.h>
+ #define WLOCK(lock)  AcquireSRWLockExclusive(lock);
 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 18:04:46.042847114 +0100
-+++ dcmtk-3.6.9/oflog/include/dcmtk/oflog/thread/syncpub.h	2025-01-16 18:05:10.503636797 +0100
+--- dcmtk-3.6.9.orig/oflog/include/dcmtk/oflog/thread/syncpub.h	2025-01-21 15:53:12.605715381 +0100
++++ dcmtk-3.6.9/oflog/include/dcmtk/oflog/thread/syncpub.h	2025-01-21 15:53:27.617627527 +0100
 @@ -63,7 +63,7 @@
  
  DCMTK_LOG4CPLUS_INLINE_EXPORT
@@ -125,8 +137,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 18:04:46.043847105 +0100
-+++ dcmtk-3.6.9/oflog/libsrc/oflog.cc	2025-01-16 18:05:10.504636789 +0100
+--- dcmtk-3.6.9.orig/oflog/libsrc/oflog.cc	2025-01-21 15:53:12.606715376 +0100
++++ dcmtk-3.6.9/oflog/libsrc/oflog.cc	2025-01-21 15:53:27.617627527 +0100
 @@ -19,6 +19,11 @@
   *
   */
@@ -140,8 +152,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 18:04:46.148846202 +0100
-+++ dcmtk-3.6.9/ofstd/include/dcmtk/ofstd/offile.h	2025-01-16 18:05:10.504636789 +0100
+--- dcmtk-3.6.9.orig/ofstd/include/dcmtk/ofstd/offile.h	2025-01-21 15:53:12.651715114 +0100
++++ dcmtk-3.6.9/ofstd/include/dcmtk/ofstd/offile.h	2025-01-21 15:53:27.618627521 +0100
 @@ -569,7 +569,7 @@
     */
    void setlinebuf()
@@ -152,8 +164,8 @@
  #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
+--- dcmtk-3.6.9.orig/ofstd/libsrc/ofstub.cc	2025-01-21 15:53:12.652715108 +0100
++++ dcmtk-3.6.9/ofstd/libsrc/ofstub.cc	2025-01-21 15:53:27.618627521 +0100
 @@ -35,6 +35,10 @@
  #include <windows.h>
  #endif /* HAVE_WINDOWS_H */