[dcmtk] remove ICU (microsoft#42742)

ParvusLacertus · Dec 17, 2024 · ab4e7d5 · ab4e7d5
1 parent 1373739
commit ab4e7d5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/ports/dcmtk/dependencies.diff b/ports/dcmtk/dependencies.diff
@@ -1,10 +1,9 @@
 diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake
-index 510027c..9f3a5da 100644
+index 510027c..eb8fe90 100644
 --- a/CMake/3rdparty.cmake
 +++ b/CMake/3rdparty.cmake
-@@ -1,3 +1,11 @@
+@@ -1,3 +1,10 @@
 +set(CMAKE_REQUIRE_FIND_PACKAGE_Iconv "${DCMTK_WITH_ICONV}")
-+set(CMAKE_REQUIRE_FIND_PACKAGE_ICU "${DCMTK_WITH_ICU}")
 +set(CMAKE_REQUIRE_FIND_PACKAGE_LibXml2 "${DCMTK_WITH_XML}")
 +set(CMAKE_REQUIRE_FIND_PACKAGE_OpenSSL "${DCMTK_WITH_OPENSSL}")
 +set(CMAKE_REQUIRE_FIND_PACKAGE_PNG "${DCMTK_WITH_PNG}")
@@ -14,7 +13,7 @@ index 510027c..9f3a5da 100644
  set(USE_FIND_PACKAGE_DOCS "Control whether libraries are searched via CMake's find_package() mechanism or a Windows specific fallback")
  # Advanced user (eg. vcpkg) may want to override this:
  if(NOT DEFINED DCMTK_USE_FIND_PACKAGE_WIN_DEFAULT)
-@@ -42,7 +50,7 @@ if(DCMTK_USE_FIND_PACKAGE)
+@@ -42,7 +49,7 @@ if(DCMTK_USE_FIND_PACKAGE)
        else()
          message(STATUS "Info: DCMTK TIFF support will be enabled")
          include_directories(${TIFF_INCLUDE_DIR} ${JPEG_INCLUDE_DIR})
@@ -23,7 +22,7 @@ index 510027c..9f3a5da 100644
        endif()
      endif()
    endif()
-@@ -58,7 +66,7 @@ if(DCMTK_USE_FIND_PACKAGE)
+@@ -58,7 +65,7 @@ if(DCMTK_USE_FIND_PACKAGE)
        message(STATUS "Info: DCMTK PNG support will be enabled")
        set(WITH_LIBPNG 1)
        include_directories(${PNG_INCLUDE_DIR})
@@ -32,7 +31,7 @@ index 510027c..9f3a5da 100644
      endif()
    endif()
 
-@@ -103,7 +111,7 @@ if(DCMTK_USE_FIND_PACKAGE)
+@@ -103,7 +110,7 @@ if(DCMTK_USE_FIND_PACKAGE)
      else()
        message(STATUS "Info: DCMTK XML support will be enabled")
        set(WITH_LIBXML 1)
@@ -41,7 +40,7 @@ index 510027c..9f3a5da 100644
        set(LIBXML_LIBS ${LIBXML2_LIBRARIES} ${LIBXML2_EXTRA_LIBS_STATIC})
      endif()
    endif()
-@@ -141,7 +149,10 @@ if(DCMTK_USE_FIND_PACKAGE)
+@@ -141,7 +148,10 @@ if(DCMTK_USE_FIND_PACKAGE)
    # Find libiconv
    if(DCMTK_WITH_ICONV)
      find_package(Iconv QUIET)

diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake
@@ -14,7 +14,6 @@ vcpkg_from_github(
 )
 file(REMOVE
     "${SOURCE_PATH}/CMake/FindICONV.cmake"
-    "${SOURCE_PATH}/CMake/FindICU.cmake"
     "${SOURCE_PATH}/CMake/FindJPEG.cmake"
 )
 

diff --git a/ports/dcmtk/vcpkg.json b/ports/dcmtk/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "dcmtk",
   "version": "3.6.9",
+  "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
@@ -2266,7 +2266,7 @@
     },
     "dcmtk": {
       "baseline": "3.6.9",
-      "port-version": 0
+      "port-version": 1
     },
     "debug-assert": {
       "baseline": "1.3.4",

diff --git a/versions/d-/dcmtk.json b/versions/d-/dcmtk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6445ef976bd199730e54bd775a4a4d111aac84c6",
+      "version": "3.6.9",
+      "port-version": 1
+    },
     {
       "git-tree": "7ebfbdae104c5b87bbb6280f8304be4bf7e87ebb",
       "version": "3.6.9",