Merge pull request #11 from trice-imaging/DEV-3448/fix-msys2-expired-…

…links

DEV-3448 Fix `msys2` expired links

ports/aws-sdk-cpp/TRICE.fix-msvc-deprecations.patch

@@ -0,0 +1,13 @@
+diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake
+index cae5b92248..e820025991 100644
+--- a/cmake/compiler_settings.cmake
++++ b/cmake/compiler_settings.cmake
+@@ -159,5 +159,8 @@ macro(set_msvc_warnings)
+         else()
+             set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+         endif()
++
++        # Avoid msvc deprecation warning that breaks build until we upgrade aws-sdk-cpp
++        add_compile_definitions(_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING)
+     endif(MSVC)
+ endmacro()

ports/aws-sdk-cpp/portfile.cmake

@@ -9,6 +9,7 @@ vcpkg_from_github(
         fix-openssl3.patch
 		TRICE.fix-curl-redirect.patch
 		TRICE.patch-string.patch
+        TRICE.fix-msvc-deprecations.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)

ports/dcmtk/fix-pc-format.patch

@@ -0,0 +1,32 @@
+diff --git a/CMake/dcmtk.pc.in b/CMake/dcmtk.pc.in
+index 13c79c0..46fc98a 100644
+--- a/CMake/dcmtk.pc.in
++++ b/CMake/dcmtk.pc.in
+@@ -1,14 +1,14 @@
+- prefix="@CMAKE_INSTALL_PREFIX@"
+- exec_prefix="${prefix}"
+- libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@"
+- includedir="${prefix}/include/"
++prefix="@CMAKE_INSTALL_PREFIX@"
++exec_prefix="${prefix}"
++libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@"
++includedir="${prefix}/include/"
+
+- Name: DCMTK
+- Description: DICOM Toolkit (DCMTK)
+- URL: https://dcmtk.org
+- Version: @DCMTK_MAJOR_VERSION@.@DCMTK_MINOR_VERSION@.@DCMTK_BUILD_VERSION@
+- Requires: @PKGCONF_REQ_PUB@
+- Requires.private: @PKGCONF_REQ_PRIV@
+- Cflags: -I"${includedir}"
+- Libs: -L"${libdir}" @PKGCONF_LIBS@
+- Libs.private: -L"${libdir}" @PKGCONF_LIBS_PRIV@
++Name: DCMTK
++Description: DICOM Toolkit (DCMTK)
++URL: https://dcmtk.org
++Version: @DCMTK_MAJOR_VERSION@.@DCMTK_MINOR_VERSION@.@DCMTK_BUILD_VERSION@
++Requires: @PKGCONF_REQ_PUB@
++Requires.private: @PKGCONF_REQ_PRIV@
++Cflags: -I"${includedir}"
++Libs: -L"${libdir}" @PKGCONF_LIBS@
++Libs.private: -L"${libdir}" @PKGCONF_LIBS_PRIV@

ports/dcmtk/portfile.cmake

@@ -7,7 +7,7 @@ vcpkg_from_github(
     PATCHES
         dcmtk.patch
         windows-patch.patch
-        TRICE.ios.patch
+        fix-pc-format.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -32,9 +32,10 @@ vcpkg_cmake_configure(
         -DDCMTK_ENABLE_PRIVATE_TAGS=ON
         -DCMAKE_CXX_STANDARD=17
 		-DDCMTK_DEFAULT_DICT=builtin	# TRICE enable builtin dictionary
-		-DDCMTK_WIDE_CHAR_FILE_IO_FUNCTIONS=ON
+        -DDCMTK_WIDE_CHAR_FILE_IO_FUNCTIONS=ON
         -DDCMTK_WIDE_CHAR_MAIN_FUNCTION=ON
         -DDCMTK_ENABLE_STL=ON
+        -DCMAKE_DEBUG_POSTFIX=d
     OPTIONS_DEBUG
         -DINSTALL_HEADERS=OFF
         -DINSTALL_OTHER=OFF
@@ -132,8 +133,9 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DCM_DICT_DEFAULT_PATH \"${CURRENT_PACKAGES_DIR}/share/dcmtk/dicom.dic:${CURRENT_PACKAGES_DIR}/share/dcmtk/private.dic\"" "")
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DEFAULT_CONFIGURATION_DIR \"${CURRENT_PACKAGES_DIR}/etc/dcmtk/\"" "")
 vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DEFAULT_SUPPORT_DATA_DIR \"${CURRENT_PACKAGES_DIR}/share/dcmtk/\"" "")
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "#define DEFAULT_SUPPORT_DATA_DIR \"${CURRENT_PACKAGES_DIR}/share/dcmtk/\"" "")
 
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYRIGHT")
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

ports/dcmtk/usage

@@ -1,8 +1,15 @@
 The package dcmtk provides CMake targets:
 
     find_package(DCMTK CONFIG REQUIRED)
-    # Note: 23 target(s) were omitted.
-    target_link_libraries(main PRIVATE DCMTK::cmr DCMTK::i2d DCMTK::ijg8 DCMTK::dcmfg)
+    target_link_libraries(main PRIVATE DCMTK::DCMTK)
+    # You may also need one or more of the following targets:
+    # DCMTK::cmr DCMTK::i2d DCMTK::ijg8 DCMTK::config DCMTK::ofstd
+    # DCMTK::oflog DCMTK::dcmdata DCMTK::dcmimgle DCMTK::dcmimage
+    # DCMTK::dcmjpeg DCMTK::ijg12 DCMTK::ijg16 DCMTK::dcmjpls
+    # DCMTK::dcmtkcharls DCMTK::dcmtls DCMTK::dcmnet DCMTK::dcmsr
+    # DCMTK::dcmdsig DCMTK::dcmwlm DCMTK::dcmqrdb DCMTK::dcmpstat
+    # DCMTK::dcmrt DCMTK::dcmiod DCMTK::dcmfg DCMTK::dcmseg
+    # DCMTK::dcmtract DCMTK::dcmpmap DCMTK::dcmect
 
 Add the following cmake code to your CMakeLists.txt to create definitions for DCMTK
     if ("${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" STREQUAL "/")

ports/dcmtk/vcpkg.json

@@ -1,10 +1,11 @@
 {
   "name": "dcmtk",
   "version": "3.6.7",
-  "port-version": 2,
+  "port-version": 5,
   "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",
+  "supports": "!(windows & arm)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",