diff --git a/ports/dcmtk/emscripten-ofwhere.diff b/ports/dcmtk/emscripten-ofwhere.diff new file mode 100644 index 0000000000..bc12af94e6 --- /dev/null +++ b/ports/dcmtk/emscripten-ofwhere.diff @@ -0,0 +1,16 @@ +--- a/ofstd/libsrc/ofwhere.c ++++ b/ofstd/libsrc/ofwhere.c +@@ -33,5 +33,5 @@ + +-#if defined(__linux__) || defined(__CYGWIN__) ++#if defined(__linux__) || defined(__CYGWIN__) || defined(__EMSCRIPTEN__) + #undef _DEFAULT_SOURCE + #define _DEFAULT_SOURCE + #elif defined(__APPLE__) +@@ -166,5 +166,5 @@ + } + +-#elif defined(__linux__) || defined(__CYGWIN__) || defined(__sun) || defined(WAI_USE_PROC_SELF_EXE) ++#elif defined(__linux__) || defined(__CYGWIN__) || defined(__sun) || defined(WAI_USE_PROC_SELF_EXE) || defined(__EMSCRIPTEN__) + + #include diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake index 56b3513deb..9391293c07 100644 --- a/ports/dcmtk/portfile.cmake +++ b/ports/dcmtk/portfile.cmake @@ -11,7 +11,9 @@ vcpkg_from_github( disable-test-setup.diff pkgconfig-lib-order.diff msvc.diff + emscripten-ofwhere.diff ) + file(REMOVE "${SOURCE_PATH}/CMake/FindICONV.cmake" "${SOURCE_PATH}/CMake/FindJPEG.cmake" diff --git a/ports/dcmtk/vcpkg.json b/ports/dcmtk/vcpkg.json index 3683e5a142..715d068853 100644 --- a/ports/dcmtk/vcpkg.json +++ b/ports/dcmtk/vcpkg.json @@ -1,6 +1,7 @@ { "name": "dcmtk", "version": "3.7.0", + "port-version": 1, "description": "This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.", "homepage": "https://github.com/DCMTK/dcmtk", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 0e8a1bc37c..0a29dad8a8 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2458,7 +2458,7 @@ }, "dcmtk": { "baseline": "3.7.0", - "port-version": 0 + "port-version": 1 }, "ddtdanilo-lmdb-wrapper": { "baseline": "1.0.1", diff --git a/versions/d-/dcmtk.json b/versions/d-/dcmtk.json index 6b5d474fd7..d6890541bf 100644 --- a/versions/d-/dcmtk.json +++ b/versions/d-/dcmtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd083279adef30a6018c8a82e09009c4bf64e214", + "version": "3.7.0", + "port-version": 1 + }, { "git-tree": "288bd880194f8ef326245cace498d59017b5a2ec", "version": "3.7.0",