Mercurial > hg > orthanc

changeset 3289:afc38fd21c78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade to e2fsprogs 1.44.5
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 21 Feb 2019 20:32:33 +0100
parents 8d1ea00a990a
children 544905c73c7e
files NEWS Resources/CMake/UuidConfiguration.cmake Resources/Patches/e2fsprogs-1.44.5-apple.patch
diffstat 3 files changed, 30 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Thu Feb 21 19:17:03 2019 +0100
+++ b/NEWS	Thu Feb 21 20:32:33 2019 +0100
@@ -22,9 +22,10 @@
 * Support of SOP classes: BreastProjectionXRayImageStorageForProcessing/Presentation
 * More tolerance wrt. missing DICOM tags that must be returned by Orthanc C-FIND SCP
 * New CMake option: "-DMSVC_MULTIPLE_PROCESSES=ON" for parallel build with Visual Studio
-* Upgraded dependencies for static builds (notably Windows):
+* Upgraded dependencies for static builds (notably on Windows):
   - boost 1.69.0
   - dcmtk 3.6.4
+  - e2fsprogs 1.44.5 (libuuid)
   - googletest 1.8.1
   - libjpeg 9c
   - libpng 1.6.36
--- a/Resources/CMake/UuidConfiguration.cmake	Thu Feb 21 19:17:03 2019 +0100
+++ b/Resources/CMake/UuidConfiguration.cmake	Thu Feb 21 20:32:33 2019 +0100
@@ -1,9 +1,9 @@
 if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 
   if (STATIC_BUILD OR NOT USE_SYSTEM_UUID)
-    SET(E2FSPROGS_SOURCES_DIR ${CMAKE_BINARY_DIR}/e2fsprogs-1.43.8)
-    SET(E2FSPROGS_URL "http://orthanc.osimis.io/ThirdPartyDownloads/e2fsprogs-1.43.8.tar.gz")
-    SET(E2FSPROGS_MD5 "670b7a74a8ead5333acf21b9afc92b3c")
+    SET(E2FSPROGS_SOURCES_DIR ${CMAKE_BINARY_DIR}/e2fsprogs-1.44.5)
+    SET(E2FSPROGS_URL "http://orthanc.osimis.io/ThirdPartyDownloads/e2fsprogs-1.44.5.tar.gz")
+    SET(E2FSPROGS_MD5 "8d78b11d04d26c0b2dd149529441fa80")
 
     if (IS_DIRECTORY "${E2FSPROGS_SOURCES_DIR}")
       set(FirstRun OFF)
@@ -20,7 +20,7 @@
 
     execute_process(
       COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
-      ${ORTHANC_ROOT}/Resources/Patches/e2fsprogs-1.43.8-apple.patch
+      ${ORTHANC_ROOT}/Resources/Patches/e2fsprogs-1.44.5-apple.patch
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       RESULT_VARIABLE Failure
       )
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/Patches/e2fsprogs-1.44.5-apple.patch	Thu Feb 21 20:32:33 2019 +0100
@@ -0,0 +1,24 @@
+diff -urEb e2fsprogs-1.44.5.orig/lib/uuid/uuid.h.in e2fsprogs-1.44.5/lib/uuid/uuid.h.in
+--- e2fsprogs-1.44.5.orig/lib/uuid/uuid.h.in	2019-02-21 20:17:23.461402522 +0100
++++ e2fsprogs-1.44.5/lib/uuid/uuid.h.in	2019-02-21 20:25:05.664540445 +0100
+@@ -35,6 +35,20 @@
+ #ifndef _UUID_UUID_H
+ #define _UUID_UUID_H
+ 
++
++#if defined(__APPLE__)
++// This patch defines the "uuid_string_t" type on OS X, which is
++// required if linking against Cocoa (this occurs in Stone of Orthanc)
++#include <sys/_types.h>
++#include <sys/_types/_uuid_t.h>
++
++#ifndef _UUID_STRING_T
++#define _UUID_STRING_T
++typedef __darwin_uuid_string_t  uuid_string_t;
++#endif /* _UUID_STRING_T */
++#endif
++
++
+ #include <sys/types.h>
+ #ifndef _WIN32
+ #include <sys/time.h>