Jimmy-Hu · Jimmy-Hu · Dec 18, 2024 · Dec 17, 2024 · Dec 17, 2024 · Dec 17, 2024
diff --git a/ports/curlpp/portfile.cmake b/ports/curlpp/portfile.cmake
@@ -29,8 +29,10 @@ endif()
 
 if(VCPKG_TARGET_IS_WINDOWS AND NOT (VCPKG_LIBRARY_LINKAGE STREQUAL static))
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curlpp-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/..")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/curlpp-config" "${CURRENT_INSTALLED_DIR}" "$(prefix)" IGNORE_UNCHANGED)
     if(NOT VCPKG_BUILD_TYPE)
         vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curlpp-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/curlpp-config" "${CURRENT_INSTALLED_DIR}" "$(prefix)" IGNORE_UNCHANGED)
     endif()
 endif()
 

diff --git a/ports/curlpp/vcpkg.json b/ports/curlpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "curlpp",
   "version-date": "2018-06-15",
-  "port-version": 10,
+  "port-version": 11,
   "description": "C++ wrapper around libcURL",
   "homepage": "https://github.com/jpbarrette/curlpp",
   "license": "MIT",

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/ports/gstreamer/fix-multiple-def.patch b/ports/gstreamer/fix-multiple-def.patch
@@ -0,0 +1,35 @@
+diff --git a/subprojects/gst-plugins-bad/gst/siren/common.c b/subprojects/gst-plugins-bad/gst/siren/common.c
+index 2e07748..70f58f6 100644
+--- a/subprojects/gst-plugins-bad/gst/siren/common.c
++++ b/subprojects/gst-plugins-bad/gst/siren/common.c
+@@ -44,7 +44,7 @@ int max_bin[8] = {
+   1
+ };
+
+-float step_size[8] = {
++float stp_size[8] = {
+   0.3536f,
+   0.5f,
+   0.70709997f,
+@@ -87,7 +87,7 @@ siren_init (void)
+         (float) pow (10, (i - 24 + 0.5) * STEPSIZE);
+
+   for (i = 0; i < 8; i++)
+-    step_size_inverse[i] = (float) 1.0 / step_size[i];
++    step_size_inverse[i] = (float) 1.0 / stp_size[i];
+
+   siren_dct4_init ();
+   siren_rmlt_init ();
+diff --git a/subprojects/gst-plugins-bad/gst/siren/common.h b/subprojects/gst-plugins-bad/gst/siren/common.h
+index e09e533..123b888 100644
+--- a/subprojects/gst-plugins-bad/gst/siren/common.h
++++ b/subprojects/gst-plugins-bad/gst/siren/common.h
+@@ -95,7 +95,7 @@ extern int vector_dimension[8];
+ extern int number_of_vectors[8];
+ extern float dead_zone[8];
+ extern int max_bin[8];
+-extern float step_size[8];
++extern float stp_size[8];
+ extern float step_size_inverse[8];
+
+
diff --git a/ports/gstreamer/portfile.cmake b/ports/gstreamer/portfile.cmake
@@ -23,6 +23,7 @@ vcpkg_from_gitlab(
         fix-bz2-windows-debug-dependency.patch
         no-downloads.patch
         ${PATCHES}
+		fix-multiple-def.patch
 )
 
 vcpkg_find_acquire_program(FLEX)

diff --git a/ports/gstreamer/vcpkg.json b/ports/gstreamer/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "gstreamer",
   "version": "1.24.7",
-  "port-version": 1,
+  "port-version": 2,
   "description": "GStreamer open-source multimedia framework core library",
   "homepage": "https://gstreamer.freedesktop.org/",
   "license": "LGPL-2.0-only",

diff --git a/ports/gumbo/portfile.cmake b/ports/gumbo/portfile.cmake
@@ -1,11 +1,15 @@
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-vcpkg_from_github(
-  OUT_SOURCE_PATH SOURCE_PATH
-  REPO google/gumbo-parser
-  REF v0.10.1
-  SHA512  bb1fb55cd07076ab6a9f38dc14db50397dbdca9a04ace4895dfba8b8cbc09038a96e26070c09c75fa929ada2e815affe233c1e2ecd8afe2aba6201647cf277d1
-  HEAD_REF master
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://codeberg.org/gumbo-parser/gumbo-parser/archive/${VERSION}.tar.gz"
+    FILENAME "gumbo-${VERSION}.tar.gz"
+    SHA512  258d93c0404b7dc35e1088cded02a394b2cbd0d08f3e7d0a3e32d859c2032efcc831687c7bc749e9bddb60d4f910bab741007bed1117d486a0d3fd194e22f4e7
+)
+
+vcpkg_extract_source_archive(
+    SOURCE_PATH
+    ARCHIVE "${ARCHIVE}"
+    SOURCE_BASE "${VERSION}"
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
@@ -25,4 +29,4 @@ vcpkg_fixup_pkgconfig()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/gumbo" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/doc/COPYING")
diff --git a/ports/gumbo/vcpkg.json b/ports/gumbo/vcpkg.json
@@ -1,9 +1,8 @@
 {
   "name": "gumbo",
-  "version": "0.10.1",
-  "port-version": 6,
+  "version": "0.12.2",
   "description": "An HTML5 parsing library in pure C99",
-  "homepage": "https://github.com/google/gumbo-parser",
+  "homepage": "https://codeberg.org/gumbo-parser/gumbo-parser",
   "license": "Apache-2.0",
   "dependencies": [
     {

diff --git a/ports/kdreports/fix-cmake-config.patch b/ports/kdreports/fix-cmake-config.patch
@@ -0,0 +1,19 @@
+diff --git a/src/KDReportsConfig.cmake.in b/src/KDReportsConfig.cmake.in
+index fa26517..49b9054 100644
+--- a/src/KDReportsConfig.cmake.in
++++ b/src/KDReportsConfig.cmake.in
+@@ -9,10 +9,10 @@
+
+ include(CMakeFindDependencyMacro)
+
+-find_dependency(Qt@Qt_VERSION_MAJOR@Core @QT_MIN_VERSION@)
+-find_dependency(Qt@Qt_VERSION_MAJOR@Widgets @QT_MIN_VERSION@)
+-find_dependency(Qt@Qt_VERSION_MAJOR@PrintSupport @QT_MIN_VERSION@)
+-find_dependency(Qt@Qt_VERSION_MAJOR@Xml @QT_MIN_VERSION@)
++find_dependency(Qt@QT_VERSION_MAJOR@Core @QT_MIN_VERSION@)
++find_dependency(Qt@QT_VERSION_MAJOR@Widgets @QT_MIN_VERSION@)
++find_dependency(Qt@QT_VERSION_MAJOR@PrintSupport @QT_MIN_VERSION@)
++find_dependency(Qt@QT_VERSION_MAJOR@Xml @QT_MIN_VERSION@)
+
+ if (@KDChart_FOUND@)
+     find_dependency(KDChart)
diff --git a/ports/kdreports/fix-license-text.patch b/ports/kdreports/fix-license-text.patch
@@ -0,0 +1,10 @@
+diff --git a/LICENSE.txt b/LICENSE.txt
+index 110b884..db69306 100644
+--- a/LICENSE.txt
++++ b/LICENSE.txt
+@@ -3,4 +3,4 @@ License
+ The KD Reports Software is © 2007 Klarälvdalens Datakonsult AB (KDAB),
+ and is available under the terms of the MIT license.
+
+-See the full license text in the LICENSES folder.
++See the full license text provided below in this file.
diff --git a/ports/kdreports/portfile.cmake b/ports/kdreports/portfile.cmake
@@ -0,0 +1,39 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDAB/KDReports
+    REF "kdreports-${VERSION}"
+    SHA512 f9b3785d71c68d032a0e1420ba3adae517994d257a02df69aaffcff4a8909b24d081c91b4cc9e1cc00311768f92e63b9288a99cfaac8422ebd1cae7321b3edbb
+    HEAD_REF master
+    PATCHES
+        "fix-cmake-config.patch"
+        "fix-license-text.patch"
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KDReports_STATIC)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        -DKDReports_QT6=ON
+        -DKDReports_STATIC=${KDReports_STATIC}
+        -DKDReports_TESTS=OFF
+        -DKDReports_EXAMPLES=OFF
+        -DKDReports_DOCS=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_KDChart-qt6=ON
+)
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KDReports-qt6 CONFIG_PATH lib/cmake/KDReports-qt6)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(
+    FILE_LIST
+        "${SOURCE_PATH}/LICENSE.txt"
+        "${SOURCE_PATH}/LICENSES/BSD-3-Clause.txt"
+        "${SOURCE_PATH}/LICENSES/MIT.txt"
+)
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/kdreports/usage b/ports/kdreports/usage
@@ -0,0 +1,4 @@
+kdreports provides CMake targets:
+
+  find_package(KDReports-qt6 CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE KDReports::kdreports)
diff --git a/ports/kdreports/vcpkg.json b/ports/kdreports/vcpkg.json
@@ -0,0 +1,24 @@
+{
+  "name": "kdreports",
+  "version": "2.3.0",
+  "description": "KD Reports is a Qt tool that lets you easily create printable reports by providing all of the necessary features for a variety of applications.",
+  "homepage": "https://github.com/KDAB/KDReports",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "qtbase",
+      "default-features": false,
+      "features": [
+        "widgets"
+      ]
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/ports/kdsingleapplication/fix-license-text.patch b/ports/kdsingleapplication/fix-license-text.patch
@@ -0,0 +1,12 @@
+diff --git a/LICENSE.txt b/LICENSE.txt
+index 12ee586..ac0144d 100644
+--- a/LICENSE.txt
++++ b/LICENSE.txt
+@@ -1,6 +1,6 @@
+ KDSingleApplication is (C) 2019-2023, Klarälvdalens Datakonsult AB,
+ and is available under the terms of the MIT license.
+
+-See the full license text in the LICENSES folder.
++See the full license text provided below in this file.
+
+ Contact KDAB at <info@kdab.com> to inquire about commercial licensing.
diff --git a/ports/kdsingleapplication/portfile.cmake b/ports/kdsingleapplication/portfile.cmake
@@ -4,6 +4,7 @@ vcpkg_from_github(
     REF "v${VERSION}"
     SHA512 12540e70014f04b20529d19bc41bf089580c8a82e407511979017020d3f1d96c60112b208d5abe1e6c4e90ed65d3b0ca9dc2f09f20c8b580c3b8a17ae9a84ae0
     HEAD_REF master
+    PATCHES "fix-license-text.patch"
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KDSingleApplication_STATIC)
@@ -25,13 +26,11 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
-file(
-    COPY
+vcpkg_install_copyright(
+    FILE_LIST
+        "${SOURCE_PATH}/LICENSE.txt"
         "${SOURCE_PATH}/LICENSES/BSD-3-Clause.txt"
         "${SOURCE_PATH}/LICENSES/MIT.txt"
-    DESTINATION
-        "${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSES/"
 )
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/kdsingleapplication/vcpkg.json b/ports/kdsingleapplication/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "kdsingleapplication",
   "version": "1.1.0",
+  "port-version": 1,
   "description": "KDSingleApplication is a helper class for single-instance policy applications.",
   "homepage": "https://github.com/KDAB/KDSingleApplication",
   "license": "MIT",

diff --git a/ports/kdstatemachineeditor/portfile.cmake b/ports/kdstatemachineeditor/portfile.cmake
@@ -0,0 +1,43 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDAB/KDStateMachineEditor
+    REF v${VERSION}
+    SHA512 dedd7166f434689cd5acf4ee3172169d3f77182269d3187f0a7a12966467dd5c7733e3ff64cd1fd03b0f3866c2aafa37cc3f2d7b8a3f4a5d8a7592da039de7af
+    HEAD_REF master
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" VCPKG_BUILD_SHARED_LIBS)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        -DKDSME_QT6=ON
+        -DKDSME_INTERNAL_GRAPHVIZ=OFF
+        -DKDSME_DOCS=OFF
+        -DKDSME_EXAMPLES=OFF
+        -DBUILD_TESTING=OFF
+        -DBUILD_SHARED_LIBS=${VCPKG_BUILD_SHARED_LIBS}
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KDSME-qt6 CONFIG_PATH lib/cmake/KDSME-qt6)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+vcpkg_install_copyright(
+    FILE_LIST
+        "${SOURCE_PATH}/LICENSE.txt"
+        "${SOURCE_PATH}/LICENSES/BSD-3-Clause.txt"
+        "${SOURCE_PATH}/LICENSES/GPL-3.0-or-later.txt"
+        "${SOURCE_PATH}/LICENSES/LicenseRef-CISST.txt"
+        "${SOURCE_PATH}/LICENSES/LicenseRef-Qt-Commercial.txt"
+        "${SOURCE_PATH}/LICENSES/GPL-3.0-only.txt"
+        "${SOURCE_PATH}/LICENSES/LGPL-2.1-only.txt"
+        "${SOURCE_PATH}/LICENSES/LicenseRef-KDAB-KDStateMachineEditor.txt"
+        "${SOURCE_PATH}/LICENSES/MIT.txt"
+)
+
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/kdstatemachineeditor/usage b/ports/kdstatemachineeditor/usage
@@ -0,0 +1,11 @@
+kdstatemachineeditor provides CMake targets:
+
+  find_package(KDSME-qt6 CONFIG REQUIRED)
+  # Core library
+  target_link_libraries(main PRIVATE KDSME::Core)
+  # View library
+  target_link_libraries(main PRIVATE KDSME::View)
+  # Debug interface client library
+  target_link_libraries(main PRIVATE KDSME::DebugInterfaceClient)
+  # Debug interface server library
+  target_link_libraries(main PRIVATE KDSME::DebugInterfaceSource)