From 9757cf5586da9d9075fdf41dbc569e9fe552a5c4 Mon Sep 17 00:00:00 2001
From: PaulXu <40262910+xb284524239@users.noreply.github.com>
Date: Wed, 31 Jul 2024 08:36:13 +0800
Subject: [PATCH] [dcmtk] builtin oficonv data (#40145)

---
 ports/dcmtk/portfile.cmake | 3 +++
 ports/dcmtk/vcpkg.json     | 2 +-
 versions/baseline.json     | 2 +-
 versions/d-/dcmtk.json     | 5 +++++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake
index 2f83a89ee6..10207b5b3a 100644
--- a/ports/dcmtk/portfile.cmake
+++ b/ports/dcmtk/portfile.cmake
@@ -33,8 +33,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 
 if("external-dict" IN_LIST FEATURES)
     set(DCMTK_DEFAULT_DICT "external")
+	set(DCMTK_ENABLE_BUILTIN_OFICONV_DATA OFF)
 else()
     set(DCMTK_DEFAULT_DICT "builtin")
+	set(DCMTK_ENABLE_BUILTIN_OFICONV_DATA ON)
 endif()
 
 vcpkg_cmake_configure(
@@ -42,6 +44,7 @@ vcpkg_cmake_configure(
     OPTIONS
         ${FEATURE_OPTIONS}
         "-DDCMTK_DEFAULT_DICT=${DCMTK_DEFAULT_DICT}" 
+		-DDCMTK_ENABLE_BUILTIN_OFICONV_DATA=${DCMTK_ENABLE_BUILTIN_OFICONV_DATA}
         -DDCMTK_WITH_DOXYGEN=OFF
         -DDCMTK_FORCE_FPIC_ON_UNIX=ON
         -DDCMTK_OVERWRITE_WIN32_COMPILER_FLAGS=OFF
diff --git a/ports/dcmtk/vcpkg.json b/ports/dcmtk/vcpkg.json
index b5d34ca7cc..97d14ea8ee 100644
--- a/ports/dcmtk/vcpkg.json
+++ b/ports/dcmtk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "dcmtk",
   "version": "3.6.8",
-  "port-version": 7,
+  "port-version": 8,
   "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": "BSD-3-Clause OR BSD-2-Clause OR libtiff OR MIT OR Zlib OR Libpng",
diff --git a/versions/baseline.json b/versions/baseline.json
index 30b0af096d..934317acfe 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2226,7 +2226,7 @@
     },
     "dcmtk": {
       "baseline": "3.6.8",
-      "port-version": 7
+      "port-version": 8
     },
     "debug-assert": {
       "baseline": "1.3.3",
diff --git a/versions/d-/dcmtk.json b/versions/d-/dcmtk.json
index 0db9752e36..392b7ee0a1 100644
--- a/versions/d-/dcmtk.json
+++ b/versions/d-/dcmtk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "fa61ef50b6065815a6e5d6b123fef77f744307b9",
+      "version": "3.6.8",
+      "port-version": 8
+    },
     {
       "git-tree": "a92035c141126e94d949535ce0e65efbfa1189c3",
       "version": "3.6.8",