From 8add833a4341182cecd0a96d836d977ba029cf76 Mon Sep 17 00:00:00 2001
From: jiayuehua <3423893+jiayuehua@users.noreply.github.com>
Date: Tue, 14 Dec 2021 15:50:19 +0800
Subject: [PATCH 01/48] [abseil] Upgrade to 2021.1102

---
 ports/abseil/fix-cxx-standard.patch |  26 +++----
 ports/abseil/portfile.cmake         | 111 ++++++++++++++--------------
 ports/abseil/vcpkg.json             |   3 +-
 versions/a-/abseil.json             |   5 ++
 versions/baseline.json              |   4 +-
 5 files changed, 75 insertions(+), 74 deletions(-)

diff --git a/ports/abseil/fix-cxx-standard.patch b/ports/abseil/fix-cxx-standard.patch
index 19e1f54db3f100..83cdcbcc531422 100644
--- a/ports/abseil/fix-cxx-standard.patch
+++ b/ports/abseil/fix-cxx-standard.patch
@@ -1,5 +1,5 @@
 diff --git a/CMake/abslConfig.cmake.in b/CMake/abslConfig.cmake.in
-index 62d246d..00947cf 100644
+index 62d246d..afcec1f 100644
 --- a/CMake/abslConfig.cmake.in
 +++ b/CMake/abslConfig.cmake.in
 @@ -6,3 +6,5 @@ find_dependency(Threads)
@@ -8,12 +8,11 @@ index 62d246d..00947cf 100644
  include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
 +
 +set(ABSL_USE_CXX17 @ABSL_USE_CXX17@)
-\ No newline at end of file
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f0af6f6..927f4ed 100644
+index 750a475..239977f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -57,6 +57,23 @@ else()
+@@ -67,6 +67,23 @@ else()
    option(ABSL_ENABLE_INSTALL "Enable install rule" ON)
  endif()
  
@@ -34,28 +33,27 @@ index f0af6f6..927f4ed 100644
 +    set(STD_VARIANT 0)
 +endif()
 +
- list(APPEND CMAKE_MODULE_PATH
-   ${CMAKE_CURRENT_LIST_DIR}/CMake
-   ${CMAKE_CURRENT_LIST_DIR}/absl/copts
+ option(ABSL_PROPAGATE_CXX_STD
+   "Use CMake C++ standard meta features (e.g. cxx_std_11) that propagate to targets that link to Abseil"
+   OFF)  # TODO: Default to ON for CMake 3.8 and greater.
 diff --git a/absl/base/CMakeLists.txt b/absl/base/CMakeLists.txt
-index 9ff5aa2..315bee4 100644
+index c7233cb..65a9076 100644
 --- a/absl/base/CMakeLists.txt
 +++ b/absl/base/CMakeLists.txt
-@@ -87,6 +87,12 @@ absl_cc_library(
-     absl::errno_saver
+@@ -38,6 +38,11 @@ absl_cc_library(
+   COPTS
+     ${ABSL_DEFAULT_COPTS}
  )
- 
 +if (NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/options.h.in)
 +    file(RENAME ${CMAKE_CURRENT_LIST_DIR}/options.h ${CMAKE_CURRENT_LIST_DIR}/options.h.in)
 +endif()
 +file(REMOVE ${CMAKE_CURRENT_LIST_DIR}/options.h)
 +configure_file(${CMAKE_CURRENT_LIST_DIR}/options.h.in ${CMAKE_CURRENT_LIST_DIR}/options.h @ONLY)
-+
+ 
  absl_cc_library(
    NAME
-     config
 diff --git a/absl/base/options.h b/absl/base/options.h
-index 6a0fb07..54a9780 100644
+index 56b4e36..0b098ed 100644
 --- a/absl/base/options.h
 +++ b/absl/base/options.h
 @@ -100,7 +100,7 @@
diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake
index 6539cd271627d6..2c1fb4ef3402d9 100644
--- a/ports/abseil/portfile.cmake
+++ b/ports/abseil/portfile.cmake
@@ -1,56 +1,55 @@
-if (NOT VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-endif()
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO abseil/abseil-cpp
-    REF 278e0a071885a22dcd2fd1b5576cc44757299343 #LTS 20210324, Patch 2
-    SHA512 a9e8e9169ebcfb8bc2eca28152ad2f655f48e6281ea932eb712333f3d0aa0b6fa1a9b184f3e2ddd75d932a54b501cc5c7bb29a1c9de5d2146f82fc5754653895
-    HEAD_REF master
-    PATCHES
-        # in C++17 mode, use std::any, std::optional, std::string_view, std::variant
-        # instead of the library replacement types
-        # in C++11 mode, force use of library replacement types, otherwise the automatic
-        # detection can cause ABI issues depending on which compiler options
-        # are enabled for consuming user code
-        fix-cxx-standard.patch
-        fix-32-bit-arm.patch
-)
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        cxx17 ABSL_USE_CXX17
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    DISABLE_PARALLEL_CONFIGURE
-    OPTIONS ${FEATURE_OPTIONS}
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME absl CONFIG_PATH lib/cmake/absl)
-vcpkg_fixup_pkgconfig()
-
-vcpkg_copy_pdbs()
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share"
-                    "${CURRENT_PACKAGES_DIR}/debug/include"
-                    "${CURRENT_PACKAGES_DIR}/include/absl/copts"
-                    "${CURRENT_PACKAGES_DIR}/include/absl/strings/testdata"
-                    "${CURRENT_PACKAGES_DIR}/include/absl/time/internal/cctz/testdata"
-)
-
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/config.h"
-        "#elif defined(ABSL_CONSUME_DLL)" "#elif 1"
-    )
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/internal/thread_identity.h"
-        "&& !defined(ABSL_CONSUME_DLL)" "&& 0"
-    )
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/container/internal/hashtablez_sampler.h"
-        "!defined(ABSL_CONSUME_DLL)" "0"
-    )
-endif()
-
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
+if (NOT VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO abseil/abseil-cpp
+    REF 215105818dfde3174fe799600bb0f3cae233d0bf #LTS 20211102, Patch 1
+    SHA512 75d234eac76be8790cf09e3e1144e4b4cf5cacb61e46961a9e4a35b37d0fa85243afdd5de5f47a006ef96af6fc91ecc0c233297c4c32258c08d46304b3361330
+    HEAD_REF master
+        PATCHES
+        # in C++17 mode, use std::any, std::optional, std::string_view, std::variant
+        # instead of the library replacement types
+        # in C++11 mode, force use of library replacement types, otherwise the automatic
+        # detection can cause ABI issues depending on which compiler options
+        # are enabled for consuming user code
+	    fix-cxx-standard.patch
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        cxx17 ABSL_USE_CXX17
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
+    OPTIONS ${FEATURE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME absl CONFIG_PATH lib/cmake/absl)
+vcpkg_fixup_pkgconfig()
+
+vcpkg_copy_pdbs()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share"
+                    "${CURRENT_PACKAGES_DIR}/debug/include"
+                    "${CURRENT_PACKAGES_DIR}/include/absl/copts"
+                    "${CURRENT_PACKAGES_DIR}/include/absl/strings/testdata"
+                    "${CURRENT_PACKAGES_DIR}/include/absl/time/internal/cctz/testdata"
+)
+
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/config.h"
+        "#elif defined(ABSL_CONSUME_DLL)" "#elif 1"
+    )
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/internal/thread_identity.h"
+        "&& !defined(ABSL_CONSUME_DLL)" "&& 0"
+    )
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/container/internal/hashtablez_sampler.h"
+        "!defined(ABSL_CONSUME_DLL)" "0"
+    )
+endif()
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/abseil/vcpkg.json b/ports/abseil/vcpkg.json
index 9d6159b210726e..3c9dc5eef209cf 100644
--- a/ports/abseil/vcpkg.json
+++ b/ports/abseil/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "abseil",
-  "version-string": "20210324.2",
-  "port-version": 1,
+  "version-string": "20211102.1",
   "description": [
     "an open-source collection designed to augment the C++ standard library.",
     "Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.",
diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json
index 78a07547d7dd6d..f8c0f0e7864752 100644
--- a/versions/a-/abseil.json
+++ b/versions/a-/abseil.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f755c22b315c9e38115c28093e51b787f69fa838",
+      "version-string": "20211102.1",
+      "port-version": 0
+    },
     {
       "git-tree": "10d137aa21adc696f8469d49f67b90ce0d50e1a1",
       "version-string": "20210324.2",
diff --git a/versions/baseline.json b/versions/baseline.json
index 2bc9ae4cbb405c..89df3a5c0c6cf5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -9,8 +9,8 @@
       "port-version": 3
     },
     "abseil": {
-      "baseline": "20210324.2",
-      "port-version": 1
+      "baseline": "20211102.1",
+      "port-version": 0
     },
     "absent": {
       "baseline": "0.3.1",

From d7902b9e17a6b4c8f5a810b3e6d2a8505ad139fc Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Thu, 16 Dec 2021 09:47:34 +0800
Subject: [PATCH 02/48] revert portfile.cmake

---
 ports/abseil/portfile.cmake | 110 ++++++++++++++++++------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake
index 2c1fb4ef3402d9..96581442885207 100644
--- a/ports/abseil/portfile.cmake
+++ b/ports/abseil/portfile.cmake
@@ -1,55 +1,55 @@
-if (NOT VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-endif()
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO abseil/abseil-cpp
-    REF 215105818dfde3174fe799600bb0f3cae233d0bf #LTS 20211102, Patch 1
-    SHA512 75d234eac76be8790cf09e3e1144e4b4cf5cacb61e46961a9e4a35b37d0fa85243afdd5de5f47a006ef96af6fc91ecc0c233297c4c32258c08d46304b3361330
-    HEAD_REF master
-        PATCHES
-        # in C++17 mode, use std::any, std::optional, std::string_view, std::variant
-        # instead of the library replacement types
-        # in C++11 mode, force use of library replacement types, otherwise the automatic
-        # detection can cause ABI issues depending on which compiler options
-        # are enabled for consuming user code
-	    fix-cxx-standard.patch
-)
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        cxx17 ABSL_USE_CXX17
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    DISABLE_PARALLEL_CONFIGURE
-    OPTIONS ${FEATURE_OPTIONS}
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME absl CONFIG_PATH lib/cmake/absl)
-vcpkg_fixup_pkgconfig()
-
-vcpkg_copy_pdbs()
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share"
-                    "${CURRENT_PACKAGES_DIR}/debug/include"
-                    "${CURRENT_PACKAGES_DIR}/include/absl/copts"
-                    "${CURRENT_PACKAGES_DIR}/include/absl/strings/testdata"
-                    "${CURRENT_PACKAGES_DIR}/include/absl/time/internal/cctz/testdata"
-)
-
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/config.h"
-        "#elif defined(ABSL_CONSUME_DLL)" "#elif 1"
-    )
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/internal/thread_identity.h"
-        "&& !defined(ABSL_CONSUME_DLL)" "&& 0"
-    )
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/container/internal/hashtablez_sampler.h"
-        "!defined(ABSL_CONSUME_DLL)" "0"
-    )
-endif()
-
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+if (NOT VCPKG_TARGET_IS_WINDOWS)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO abseil/abseil-cpp
+    REF 215105818dfde3174fe799600bb0f3cae233d0bf #LTS 20211102, Patch 1
+    SHA512 75d234eac76be8790cf09e3e1144e4b4cf5cacb61e46961a9e4a35b37d0fa85243afdd5de5f47a006ef96af6fc91ecc0c233297c4c32258c08d46304b3361330
+    HEAD_REF master
+        PATCHES
+        # in C++17 mode, use std::any, std::optional, std::string_view, std::variant
+        # instead of the library replacement types
+        # in C++11 mode, force use of library replacement types, otherwise the automatic
+        # detection can cause ABI issues depending on which compiler options
+        # are enabled for consuming user code
+	    fix-cxx-standard.patch
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        cxx17 ABSL_USE_CXX17
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
+    OPTIONS ${FEATURE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME absl CONFIG_PATH lib/cmake/absl)
+vcpkg_fixup_pkgconfig()
+
+vcpkg_copy_pdbs()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share"
+                    "${CURRENT_PACKAGES_DIR}/debug/include"
+                    "${CURRENT_PACKAGES_DIR}/include/absl/copts"
+                    "${CURRENT_PACKAGES_DIR}/include/absl/strings/testdata"
+                    "${CURRENT_PACKAGES_DIR}/include/absl/time/internal/cctz/testdata"
+)
+
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/config.h"
+        "#elif defined(ABSL_CONSUME_DLL)" "#elif 1"
+    )
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/base/internal/thread_identity.h"
+        "&& !defined(ABSL_CONSUME_DLL)" "&& 0"
+    )
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/absl/container/internal/hashtablez_sampler.h"
+        "!defined(ABSL_CONSUME_DLL)" "0"
+    )
+endif()
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

From b8c364a59ae82965424d57dbc2b192c2ab8d8dec Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Thu, 16 Dec 2021 09:48:32 +0800
Subject: [PATCH 03/48] update version

---
 versions/a-/abseil.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json
index f8c0f0e7864752..20db19d65e291f 100644
--- a/versions/a-/abseil.json
+++ b/versions/a-/abseil.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "f755c22b315c9e38115c28093e51b787f69fa838",
+      "git-tree": "f886f25a6d11bf8db0101b9da311bdd72272625e",
       "version-string": "20211102.1",
       "port-version": 0
     },

From f27bc3cbdd9d85a1c56c168de16293ffd51507c5 Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Thu, 16 Dec 2021 09:51:23 +0800
Subject: [PATCH 04/48] update portfile.cmake

---
 ports/abseil/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake
index 96581442885207..1289eed36a9c53 100644
--- a/ports/abseil/portfile.cmake
+++ b/ports/abseil/portfile.cmake
@@ -8,7 +8,7 @@ vcpkg_from_github(
     REF 215105818dfde3174fe799600bb0f3cae233d0bf #LTS 20211102, Patch 1
     SHA512 75d234eac76be8790cf09e3e1144e4b4cf5cacb61e46961a9e4a35b37d0fa85243afdd5de5f47a006ef96af6fc91ecc0c233297c4c32258c08d46304b3361330
     HEAD_REF master
-        PATCHES
+    PATCHES
         # in C++17 mode, use std::any, std::optional, std::string_view, std::variant
         # instead of the library replacement types
         # in C++11 mode, force use of library replacement types, otherwise the automatic

From 1ac8147f6762e03f2df9bcdaf63091cae0e3796a Mon Sep 17 00:00:00 2001
From: Jonliu1993 <13720414433@163.com>
Date: Thu, 16 Dec 2021 09:51:46 +0800
Subject: [PATCH 05/48] update version

---
 versions/a-/abseil.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/a-/abseil.json b/versions/a-/abseil.json
index 20db19d65e291f..5b24f90a969bff 100644
--- a/versions/a-/abseil.json
+++ b/versions/a-/abseil.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "f886f25a6d11bf8db0101b9da311bdd72272625e",
+      "git-tree": "962a81319706d17c9e90bd0b873659ec7c75178a",
       "version-string": "20211102.1",
       "port-version": 0
     },

From fc96e70e4cc32d8f38df188982f90a7ef1cf7d21 Mon Sep 17 00:00:00 2001
From: jiayuehua <3423893+jiayuehua@users.noreply.github.com>
Date: Tue, 14 Dec 2021 17:33:43 +0800
Subject: [PATCH 06/48] [s2geometry] google s2 for for manipulating geometric
 shapes

---
 ports/s2geometry/config.patch   | 63 +++++++++++++++++++++++++++++++++
 ports/s2geometry/portfile.cmake | 30 ++++++++++++++++
 ports/s2geometry/vcpkg.json     |  7 ++++
 versions/baseline.json          |  4 +++
 versions/s-/s2geometry.json     |  9 +++++
 5 files changed, 113 insertions(+)
 create mode 100644 ports/s2geometry/config.patch
 create mode 100644 ports/s2geometry/portfile.cmake
 create mode 100644 ports/s2geometry/vcpkg.json
 create mode 100644 versions/s-/s2geometry.json

diff --git a/ports/s2geometry/config.patch b/ports/s2geometry/config.patch
new file mode 100644
index 00000000000000..cf62250845972d
--- /dev/null
+++ b/ports/s2geometry/config.patch
@@ -0,0 +1,63 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5ecd280..1a8367f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -211,7 +211,11 @@ target_link_libraries(
+ # list(APPEND CMAKE_MODULE_PATH "<path_to_s2geometry_dir>/third_party/cmake")
+ # add_subdirectory(<path_to_s2geometry_dir> s2geometry)
+ # target_link_libraries(<target_name> s2)
+-target_include_directories(s2 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
++target_include_directories(s2 PUBLIC 
++  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
++$<INSTALL_INTERFACE:include>
++)
++
+ 
+ # We don't need to install all headers, only those
+ # transitively included by s2 headers we are exporting.
+@@ -407,7 +411,17 @@ install(FILES src/s2/util/math/mathutil.h
+ install(FILES src/s2/util/units/length-units.h
+               src/s2/util/units/physical-units.h
+         DESTINATION include/s2/util/units)
+-install(TARGETS s2 s2testing DESTINATION lib)
++ install(TARGETS s2 s2testing
++         RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++         ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++         LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
++install(TARGETS s2 
++        EXPORT s2Targets
++        )
++install(EXPORT s2Targets
++  FILE s2Targets.cmake
++  DESTINATION share/s2/
++)
+ 
+ message("GTEST_ROOT: ${GTEST_ROOT}")
+ if (GTEST_ROOT)
+@@ -534,3 +548,17 @@ endif()
+ if (${SWIG_FOUND} AND ${PYTHONLIBS_FOUND})
+   add_subdirectory("src/python" python)
+ endif()
++
++
++include(CMakePackageConfigHelpers)
++# generate the config file that is includes the exports
++configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
++  "${CMAKE_CURRENT_BINARY_DIR}/s2Config.cmake"
++  INSTALL_DESTINATION "share/s2/"
++  NO_SET_AND_CHECK_MACRO
++  NO_CHECK_REQUIRED_COMPONENTS_MACRO
++  )
++  install(FILES
++  ${CMAKE_CURRENT_BINARY_DIR}/s2Config.cmake
++  DESTINATION "share/s2/"
++  )
+diff --git a/Config.cmake.in b/Config.cmake.in
+new file mode 100644
+index 0000000..ac09b2d
+--- /dev/null
++++ b/Config.cmake.in
+@@ -0,0 +1,3 @@
++@PACKAGE_INIT@
++
++include ( "${CMAKE_CURRENT_LIST_DIR}/s2Targets.cmake" )
diff --git a/ports/s2geometry/portfile.cmake b/ports/s2geometry/portfile.cmake
new file mode 100644
index 00000000000000..bd41a47dc7e780
--- /dev/null
+++ b/ports/s2geometry/portfile.cmake
@@ -0,0 +1,30 @@
+vcpkg_fail_port_install(ON_TARGET "Windows")
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO google/s2geometry
+    REF v0.9.0
+    SHA512 854ec84a54aff036b3092a6233be0f5fc0e4846ac5f882326bbb3f2b9ce88bd5c866a80ae352d8e7d5ae00b9c9a8ab1cff6a95412f990b7bc1fdc5ca3d632b9c
+
+    HEAD_REF main
+      PATCHES
+       config.patch
+)
+
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBUILD_EXAMPLES=OFF
+        -DBUILD_TESTING=OFF
+    MAYBE_UNUSED_VARIABLES BUILD_TESTING
+)
+
+vcpkg_install_cmake()
+  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
diff --git a/ports/s2geometry/vcpkg.json b/ports/s2geometry/vcpkg.json
new file mode 100644
index 00000000000000..453b45217da7df
--- /dev/null
+++ b/ports/s2geometry/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "s2geometry",
+  "version-string": "0.9.0",
+  "description": "S2 is a library for spherical geometry that aims to have the same robustness, flexibility, and performance as the very best planar geometry libraries.",
+  "homepage": "https://s2geometry.io",
+  "supports": "!windows"
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 89df3a5c0c6cf5..5a8afaa4ad42b4 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6120,6 +6120,10 @@
       "baseline": "2.0",
       "port-version": 5
     },
+    "s2geometry": {
+      "baseline": "0.9.0",
+      "port-version": 0
+    },
     "s2n": {
       "baseline": "1.1.1",
       "port-version": 0
diff --git a/versions/s-/s2geometry.json b/versions/s-/s2geometry.json
new file mode 100644
index 00000000000000..f57546602712e2
--- /dev/null
+++ b/versions/s-/s2geometry.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "3a20b84530470d3051776b36b86fd8fe4cf8a682",
+      "version-string": "0.9.0",
+      "port-version": 0
+    }
+  ]
+}

From 757a3750e81c9108cd4be47243336c929ea75b91 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Tue, 14 Dec 2021 19:46:37 +0100
Subject: [PATCH 07/48] [libevent] no absolute paths (#21179)

---
 ports/libevent/portfile.cmake | 1 +
 ports/libevent/vcpkg.json     | 2 +-
 versions/baseline.json        | 2 +-
 versions/l-/libevent.json     | 5 +++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ports/libevent/portfile.cmake b/ports/libevent/portfile.cmake
index 0a6844c9ac16d8..d89df926c3da30 100644
--- a/ports/libevent/portfile.cmake
+++ b/ports/libevent/portfile.cmake
@@ -63,6 +63,7 @@ vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/libevent/LibeventTargets-${_t
     "${CURRENT_PACKAGES_DIR}"
     "${CURRENT_INSTALLED_DIR}"
 )
+vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/libevent/LibeventConfig.cmake "${SOURCE_PATH}/include;${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/include" "")
 vcpkg_fixup_pkgconfig()
 vcpkg_copy_pdbs()
 
diff --git a/ports/libevent/vcpkg.json b/ports/libevent/vcpkg.json
index 52dd90b20b7238..70e05c8cc20d3f 100644
--- a/ports/libevent/vcpkg.json
+++ b/ports/libevent/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libevent",
   "version": "2.1.12",
-  "port-version": 4,
+  "port-version": 5,
   "description": "An event notification library",
   "homepage": "https://github.com/libevent/libevent",
   "supports": "!uwp",
diff --git a/versions/baseline.json b/versions/baseline.json
index 5a8afaa4ad42b4..047c6e26019f28 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3434,7 +3434,7 @@
     },
     "libevent": {
       "baseline": "2.1.12",
-      "port-version": 4
+      "port-version": 5
     },
     "libevhtp": {
       "baseline": "1.2.18",
diff --git a/versions/l-/libevent.json b/versions/l-/libevent.json
index 308325b018202a..e3f6e6a1e86176 100644
--- a/versions/l-/libevent.json
+++ b/versions/l-/libevent.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4c3a73b8448f16fa69e497ef6f1df41a261a9b54",
+      "version": "2.1.12",
+      "port-version": 5
+    },
     {
       "git-tree": "0405b56180d4920314ae69183ed5184a6017f7a9",
       "version": "2.1.12",

From b54d60186176372c168961ac22f841f414e6c450 Mon Sep 17 00:00:00 2001
From: Lars Glud <larshg@gmail.com>
Date: Tue, 14 Dec 2021 19:46:50 +0100
Subject: [PATCH 08/48] [Pcre2] Check if files exists before call
 vcpkg_replace_string. (#22003)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Check if files exists before call vcpkg_replace_string.

* Update per comments.

Only guard debug.

* Update ports/pcre2/portfile.cmake

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* Bump port-version.

Co-authored-by: GLUD Lars <lars.glud@leica-geosystems.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
---
 ports/pcre2/portfile.cmake | 4 +++-
 ports/pcre2/vcpkg.json     | 2 +-
 versions/baseline.json     | 2 +-
 versions/p-/pcre2.json     | 5 +++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ports/pcre2/portfile.cmake b/ports/pcre2/portfile.cmake
index a1db80085ad084..0568f07a35b999 100644
--- a/ports/pcre2/portfile.cmake
+++ b/ports/pcre2/portfile.cmake
@@ -56,7 +56,9 @@ if(BUILD_STATIC)
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 elseif(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/pcre2-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/..")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/pcre2-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..")
+    if(EXISTS "${CURRENT_PACKAGES_DIR}/debug/bin/pcre2-config")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/pcre2-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..")
+    endif()
 endif()
 
 file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/pcre2/vcpkg.json b/ports/pcre2/vcpkg.json
index 16fe74caccc894..b6a59e074e28a1 100644
--- a/ports/pcre2/vcpkg.json
+++ b/ports/pcre2/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "pcre2",
   "version": "10.39",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Regular Expression pattern matching using the same syntax and semantics as Perl 5.",
   "homepage": "https://github.com/PhilipHazel/pcre2",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 047c6e26019f28..bb176d5430f267 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5190,7 +5190,7 @@
     },
     "pcre2": {
       "baseline": "10.39",
-      "port-version": 1
+      "port-version": 2
     },
     "pdal": {
       "baseline": "1.7.1",
diff --git a/versions/p-/pcre2.json b/versions/p-/pcre2.json
index fe12a838d228e6..bba977373475ab 100644
--- a/versions/p-/pcre2.json
+++ b/versions/p-/pcre2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9a15903858198c8a3b890972b5e8c0d2aa3f89f8",
+      "version": "10.39",
+      "port-version": 2
+    },
     {
       "git-tree": "b25437749e0bcdd96807c66a8fc8764382c55203",
       "version": "10.39",

From 8b8eb17de0c8593cda0e59cef62c66643c924db9 Mon Sep 17 00:00:00 2001
From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>
Date: Wed, 15 Dec 2021 02:47:00 +0800
Subject: [PATCH 09/48] [lodepng] Fix cannot open include file "lodepng.h"
 (#22007)

* [lodepng] Fix cannot open include file "lodepng.h"

* update version

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
---
 ports/lodepng/CMakeLists.txt | 4 ++--
 ports/lodepng/vcpkg.json     | 1 +
 versions/baseline.json       | 2 +-
 versions/l-/lodepng.json     | 5 +++++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ports/lodepng/CMakeLists.txt b/ports/lodepng/CMakeLists.txt
index f5064828894c89..6c80b126cf1f36 100644
--- a/ports/lodepng/CMakeLists.txt
+++ b/ports/lodepng/CMakeLists.txt
@@ -3,7 +3,7 @@ project(lodepng)
 
 add_library(lodepng lodepng.cpp)
 target_include_directories(lodepng PUBLIC
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+  $<INSTALL_INTERFACE:include>
 )
 
 file(WRITE "${CMAKE_BINARY_DIR}/lodepng-config.cmake" "include(\"\${CMAKE_CURRENT_LIST_DIR}/lodepng-targets.cmake\")")
@@ -15,7 +15,7 @@ install(EXPORT lodepng-targets DESTINATION share/lodepng/)
 
 add_library(lodepng-c lodepng.c)
 target_include_directories(lodepng-c PUBLIC
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+  $<INSTALL_INTERFACE:include>
 )
 
 file(WRITE "${CMAKE_BINARY_DIR}/lodepng-c-config.cmake" "include(\"\${CMAKE_CURRENT_LIST_DIR}/lodepng-c-targets.cmake\")")
diff --git a/ports/lodepng/vcpkg.json b/ports/lodepng/vcpkg.json
index 70e00a27db4c2d..651f85f8722b2e 100644
--- a/ports/lodepng/vcpkg.json
+++ b/ports/lodepng/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "lodepng",
   "version-date": "2021-12-04",
+  "port-version": 1,
   "description": "PNG encoder and decoder in C++",
   "homepage": "https://github.com/lvandeve/lodepng",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index bb176d5430f267..331b43cf8c3f18 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4154,7 +4154,7 @@
     },
     "lodepng": {
       "baseline": "2021-12-04",
-      "port-version": 0
+      "port-version": 1
     },
     "lodepng-c": {
       "baseline": "deprecated",
diff --git a/versions/l-/lodepng.json b/versions/l-/lodepng.json
index 1060dd944f117e..897a5f3be4adf1 100644
--- a/versions/l-/lodepng.json
+++ b/versions/l-/lodepng.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "744376b1eace2fdab47d24858d7d1e79f32eefa3",
+      "version-date": "2021-12-04",
+      "port-version": 1
+    },
     {
       "git-tree": "454b1276a4855fba7699cbb07ca783d32d1baf7c",
       "version-date": "2021-12-04",

From ef56f7dc626233a7c4e03d2f793599c0b57b5827 Mon Sep 17 00:00:00 2001
From: Frank <65999885+FrankXie05@users.noreply.github.com>
Date: Wed, 15 Dec 2021 02:47:59 +0800
Subject: [PATCH 10/48] [MyGUI] update to 3.4.1 (#22015)

* [MyGUI] update to 3.4.1

* update version
---
 ports/mygui/fix-generation.patch | 31 +++----------------------------
 ports/mygui/portfile.cmake       | 17 ++++++++---------
 ports/mygui/vcpkg.json           | 13 ++++++++++---
 versions/baseline.json           |  4 ++--
 versions/m-/mygui.json           |  5 +++++
 5 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/ports/mygui/fix-generation.patch b/ports/mygui/fix-generation.patch
index 9e517318a45ec9..80d69009ed351f 100644
--- a/ports/mygui/fix-generation.patch
+++ b/ports/mygui/fix-generation.patch
@@ -1,5 +1,5 @@
 diff --git a/CMake/CMakeLists.txt b/CMake/CMakeLists.txt
-index b0fc12a82..6e545edea 100644
+index a0ef573..b77566e 100644
 --- a/CMake/CMakeLists.txt
 +++ b/CMake/CMakeLists.txt
 @@ -5,7 +5,7 @@
@@ -12,10 +12,10 @@ index b0fc12a82..6e545edea 100644
  	set(MYGUI_CMAKE_DIR "lib/MYGUI/cmake")
  endif(WIN32)
 diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake
-index d1dbd016d..25c8bbac6 100644
+index 8fb1ce4..6483339 100644
 --- a/CMake/Utils/MyGUIConfigTargets.cmake
 +++ b/CMake/Utils/MyGUIConfigTargets.cmake
-@@ -6,10 +6,10 @@ if (WIN32)
+@@ -7,10 +7,10 @@ if (WIN32)
  	set(MYGUI_RELWDBG_PATH "/RelWithDebInfo")
  	set(MYGUI_MINSIZE_PATH "/MinSizeRel")
  	set(MYGUI_DEBUG_PATH "/Debug")
@@ -28,28 +28,3 @@ index d1dbd016d..25c8bbac6 100644
  	set(MYGUI_PLUGIN_PATH "/opt")
  elseif (UNIX)
  	set(MYGUI_RELEASE_PATH "")
-diff --git a/CMake/Utils/PrecompiledHeader.cmake b/CMake/Utils/PrecompiledHeader.cmake
-index a8bf3ce49..104703282 100644
---- a/CMake/Utils/PrecompiledHeader.cmake
-+++ b/CMake/Utils/PrecompiledHeader.cmake
-@@ -16,7 +16,7 @@
- macro(use_precompiled_header TARGET HEADER_FILE SRC_FILE)
-   get_filename_component(HEADER ${HEADER_FILE} NAME)
- 
--  if (MSVC AND NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-+  if (FALSE)
-     add_definitions(/Yu"${HEADER}")
-     set_source_files_properties(${SRC_FILE}
-       PROPERTIES COMPILE_FLAGS /Yc"${HEADER}"
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fea0bff8b..5831dfa8a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,6 +9,7 @@ cmake_minimum_required(VERSION 2.6)
- set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
- cmake_policy(SET CMP0003 NEW)
- cmake_policy(SET CMP0011 NEW)
-+cmake_policy(SET CMP0021 OLD)
- 
- project(MYGUI)
- 
diff --git a/ports/mygui/portfile.cmake b/ports/mygui/portfile.cmake
index 3f3bd9016f3139..9bcfbb465b684b 100644
--- a/ports/mygui/portfile.cmake
+++ b/ports/mygui/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO MyGUI/mygui
-    REF 26109822f36a4f7d72d5d8ecd41659897f085a40
-    SHA512 4d1f001e8c04d08ad911bc0345a2287b5e17e21284728cf23d7a930e8befb2f85902053e3c90283444bf9e32c7dada2f37c498e735d6314732b297d97ed339e4
+    REF 81e5c67e92920607d16bc2aee1ac32f6fd7d446b #v3.4.1
+    SHA512 b13e0a08559b3ddfe42ffcc6cf017fb20d50168785fb551e16f613c60b9ea28a65056a9bc42bdab876368f40dcba1772bc704ad0928c45d8b32e909abc0f1916 
     HEAD_REF master
     PATCHES
         fix-generation.patch
@@ -18,9 +18,8 @@ else()
     set(MYGUI_RENDERSYSTEM 1)
 endif()
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DMYGUI_STATIC=TRUE
         -DMYGUI_BUILD_DEMOS=FALSE
@@ -33,12 +32,12 @@ vcpkg_configure_cmake(
         -DMYGUI_RENDERSYSTEM=${MYGUI_RENDERSYSTEM}
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 file(REMOVE_RECURSE
-    ${CURRENT_PACKAGES_DIR}/debug/include
-    ${CURRENT_PACKAGES_DIR}/debug/share
+    "${CURRENT_PACKAGES_DIR}/debug/include"
+    "${CURRENT_PACKAGES_DIR}/debug/share"
 )
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/COPYING.MIT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING.MIT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/mygui/vcpkg.json b/ports/mygui/vcpkg.json
index 28a32c06074bdc..82e0361db7488a 100644
--- a/ports/mygui/vcpkg.json
+++ b/ports/mygui/vcpkg.json
@@ -1,12 +1,19 @@
 {
   "name": "mygui",
-  "version-string": "2020-06-17",
-  "port-version": 1,
+  "version": "3.4.1",
   "description": "Fast, flexible and simple GUI",
   "homepage": "http://mygui.info",
   "dependencies": [
     "freetype",
-    "sdl2-image"
+    "sdl2-image",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ],
   "features": {
     "opengl": {
diff --git a/versions/baseline.json b/versions/baseline.json
index 331b43cf8c3f18..c92818f79b750b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4597,8 +4597,8 @@
       "port-version": 4
     },
     "mygui": {
-      "baseline": "2020-06-17",
-      "port-version": 1
+      "baseline": "3.4.1",
+      "port-version": 0
     },
     "nameof": {
       "baseline": "0.10.1",
diff --git a/versions/m-/mygui.json b/versions/m-/mygui.json
index 581c0b1ff438db..38205251bf7e78 100644
--- a/versions/m-/mygui.json
+++ b/versions/m-/mygui.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6e9074e901ba523a48254a18b5d8e7f3807619be",
+      "version": "3.4.1",
+      "port-version": 0
+    },
     {
       "git-tree": "9d8226795430e83c733e936821400cf792265656",
       "version-string": "2020-06-17",

From 64672b7fc0320db98ca826740c170dc68196480c Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Tue, 14 Dec 2021 19:49:00 +0100
Subject: [PATCH 11/48] [s2n] Update, add openssl dependency (#21484)

* Update to 1.3.0, add openssl dependency

* Add 'tests' feature

* Update versions

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
---
 ports/s2n/portfile.cmake                  | 31 ++++++----
 ports/s2n/remove-libcrypto-messages.patch | 14 -----
 ports/s2n/use-openssl-crypto.patch        | 70 +++++++++++++++++++++++
 ports/s2n/vcpkg.json                      | 10 +++-
 versions/baseline.json                    |  2 +-
 versions/s-/s2n.json                      |  5 ++
 6 files changed, 105 insertions(+), 27 deletions(-)
 delete mode 100644 ports/s2n/remove-libcrypto-messages.patch
 create mode 100644 ports/s2n/use-openssl-crypto.patch

diff --git a/ports/s2n/portfile.cmake b/ports/s2n/portfile.cmake
index db40a08d733d22..e90c648022a4c0 100644
--- a/ports/s2n/portfile.cmake
+++ b/ports/s2n/portfile.cmake
@@ -1,28 +1,39 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aws/s2n-tls
-    REF 4513f8d707a68388990886d353e7cfe46cc6454b # v1.1.1
-    SHA512 6586e330733982ed3b70fd320e63575639d5793d69ffa06b2a46ed487d55d8271b46df611d62cc48410654b394d599de65edd9cdc860dea13255161d843f1f48
-    PATCHES fix-cmake-target-path.patch
-            remove-libcrypto-messages.patch
+    REF ab9a3be5a8abcbc5bd7bdba662497a717737c838 # v1.3.0
+    SHA512 0150cba56f7940253ffa5af0c27fdc8db08961d4c8a80377d25f588fa8a56249eb02723304969d0fdebe570388545527ee826a3070c21e50e63c4f021d425728
+    PATCHES
+        fix-cmake-target-path.patch
+        use-openssl-crypto.patch
 )
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        tests   BUILD_TESTING
+)
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        ${FEATURE_OPTIONS}
 )
 
 vcpkg_cmake_install()
+vcpkg_copy_pdbs()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/s2n/cmake)
 
+if(BUILD_TESTING)
+    message(STATUS Testing)
+    vcpkg_cmake_build(TARGET test LOGFILE_BASE test)
+endif()
+
 file(REMOVE_RECURSE
     "${CURRENT_PACKAGES_DIR}/debug/include"
     "${CURRENT_PACKAGES_DIR}/debug/lib/s2n"
-	"${CURRENT_PACKAGES_DIR}/lib/s2n"
-	)
-
-vcpkg_copy_pdbs()
-
-file(REMOVE_RECURSE	"${CURRENT_PACKAGES_DIR}/debug/share")
+    "${CURRENT_PACKAGES_DIR}/debug/share"
+    "${CURRENT_PACKAGES_DIR}/lib/s2n"
+    "${CURRENT_PACKAGES_DIR}/share/s2n/modules"
+)
 
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/s2n/remove-libcrypto-messages.patch b/ports/s2n/remove-libcrypto-messages.patch
deleted file mode 100644
index 58ceb575694dea..00000000000000
--- a/ports/s2n/remove-libcrypto-messages.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/cmake/modules/FindLibCrypto.cmake b/cmake/modules/FindLibCrypto.cmake
-index 1ba8473..b486a1a 100644
---- a/cmake/modules/FindLibCrypto.cmake
-+++ b/cmake/modules/FindLibCrypto.cmake
-@@ -88,9 +88,6 @@ else()
-         set(LIBCRYPTO_FOUND true)
-         set(LibCrypto_FOUND true)
- 
--        message(STATUS "LibCrypto Include Dir: ${LibCrypto_INCLUDE_DIR}")
--        message(STATUS "LibCrypto Shared Lib:  ${LibCrypto_SHARED_LIBRARY}")
--        message(STATUS "LibCrypto Static Lib:  ${LibCrypto_STATIC_LIBRARY}")
-         if (NOT TARGET crypto AND
-             (EXISTS "${LibCrypto_LIBRARY}")
-             )
diff --git a/ports/s2n/use-openssl-crypto.patch b/ports/s2n/use-openssl-crypto.patch
new file mode 100644
index 00000000000000..75c6885bc09d7f
--- /dev/null
+++ b/ports/s2n/use-openssl-crypto.patch
@@ -0,0 +1,70 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index edbf248..2992a05 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -400,7 +400,7 @@ endif()
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+ 
+ if (SEARCH_LIBCRYPTO)
+-    find_package(LibCrypto REQUIRED)
++    find_package(OpenSSL COMPONENTS Crypto REQUIRED)
+ else()
+     if (TARGET crypto)
+         message(STATUS "S2N found target: crypto")
+@@ -465,7 +465,7 @@ if (S2N_INTERN_LIBCRYPTO)
+         )
+     endif()
+ else()
+-    target_link_libraries(${PROJECT_NAME} PUBLIC crypto)
++    target_link_libraries(${PROJECT_NAME} PUBLIC OpenSSL::Crypto)
+ endif()
+ 
+ target_link_libraries(${PROJECT_NAME} PUBLIC ${OS_LIBS} m)
+@@ -473,7 +473,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC ${OS_LIBS} m)
+ target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
+ target_include_directories(${PROJECT_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/api> $<INSTALL_INTERFACE:include>)
+ 
+-target_include_directories(${PROJECT_NAME} PRIVATE $<TARGET_PROPERTY:crypto,INTERFACE_INCLUDE_DIRECTORIES>)
++target_include_directories(${PROJECT_NAME} PRIVATE $<TARGET_PROPERTY:OpenSSL::Crypto,INTERFACE_INCLUDE_DIRECTORIES>)
+ 
+ if (BUILD_TESTING)
+     enable_testing()
+@@ -485,7 +485,7 @@ if (BUILD_TESTING)
+     target_include_directories(testss2n PUBLIC tests)
+     target_compile_options(testss2n PRIVATE -std=gnu99)
+     target_link_libraries(testss2n PUBLIC ${PROJECT_NAME})
+-    target_include_directories(testss2n PUBLIC $<TARGET_PROPERTY:crypto,INTERFACE_INCLUDE_DIRECTORIES>)
++    target_include_directories(testss2n PUBLIC $<TARGET_PROPERTY:OpenSSL::Crypto,INTERFACE_INCLUDE_DIRECTORIES>)
+ 
+     if (S2N_INTERN_LIBCRYPTO)
+         # if libcrypto was interned, rewrite libcrypto symbols so use of internal functions will link correctly
+@@ -536,13 +536,13 @@ if (BUILD_TESTING)
+ 
+     add_executable(s2nc "bin/s2nc.c" "bin/echo.c" "bin/https.c" "bin/common.c")
+     target_link_libraries(s2nc ${PROJECT_NAME})
+-    target_include_directories(s2nc PRIVATE $<TARGET_PROPERTY:crypto,INTERFACE_INCLUDE_DIRECTORIES>)
++    target_include_directories(s2nc PRIVATE $<TARGET_PROPERTY:OpenSSL::Crypto,INTERFACE_INCLUDE_DIRECTORIES>)
+     target_include_directories(s2nc PRIVATE api)
+     target_compile_options(s2nc PRIVATE -std=gnu99 -D_POSIX_C_SOURCE=200112L)
+ 
+     add_executable(s2nd "bin/s2nd.c" "bin/echo.c" "bin/https.c" "bin/common.c")
+     target_link_libraries(s2nd ${PROJECT_NAME})
+-    target_include_directories(s2nd PRIVATE $<TARGET_PROPERTY:crypto,INTERFACE_INCLUDE_DIRECTORIES>)
++    target_include_directories(s2nd PRIVATE $<TARGET_PROPERTY:OpenSSL::Crypto,INTERFACE_INCLUDE_DIRECTORIES>)
+     target_include_directories(s2nd PRIVATE api)
+     target_compile_options(s2nd PRIVATE -std=gnu99 -D_POSIX_C_SOURCE=200112L)
+ 
+diff --git a/cmake/s2n-config.cmake b/cmake/s2n-config.cmake
+index 4e76ed6..f714df0 100644
+--- a/cmake/s2n-config.cmake
++++ b/cmake/s2n-config.cmake
+@@ -5,8 +5,7 @@ if (NOT MSVC)
+     find_package(Threads REQUIRED)
+ endif()
+ 
+-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/modules")
+-find_dependency(LibCrypto)
++find_dependency(OpenSSL COMPONENTS Crypto)
+ 
+ include(${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@-targets.cmake)
+ 
diff --git a/ports/s2n/vcpkg.json b/ports/s2n/vcpkg.json
index bae45af959c47b..d4c3a1960af06d 100644
--- a/ports/s2n/vcpkg.json
+++ b/ports/s2n/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "s2n",
-  "version": "1.1.1",
+  "version": "1.3.0",
   "description": "C99 implementation of the TLS/SSL protocols.",
   "homepage": "https://github.com/aws/s2n-tls",
   "supports": "!uwp & !windows",
   "dependencies": [
+    "openssl",
     {
       "name": "vcpkg-cmake",
       "host": true
@@ -13,5 +14,10 @@
       "name": "vcpkg-cmake-config",
       "host": true
     }
-  ]
+  ],
+  "features": {
+    "tests": {
+      "description": "Build and run the tests"
+    }
+  }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index c92818f79b750b..c0a5aadb7e5dbf 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6125,7 +6125,7 @@
       "port-version": 0
     },
     "s2n": {
-      "baseline": "1.1.1",
+      "baseline": "1.3.0",
       "port-version": 0
     },
     "safeint": {
diff --git a/versions/s-/s2n.json b/versions/s-/s2n.json
index c974721885c153..bebf0bbc9aa7e4 100644
--- a/versions/s-/s2n.json
+++ b/versions/s-/s2n.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a8252a918117164e1f6472663244fda74690f849",
+      "version": "1.3.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b1f3fbca47339363713845a0e8e06c52c1198a2a",
       "version": "1.1.1",

From 34f4281c5faa771514f709f18587887918913922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Tue, 14 Dec 2021 10:59:38 -0800
Subject: [PATCH 12/48] Libpq update and VCPKG_OSX_SYSROOT fix (#21583)

* [libpq] Update to 12.9

* [libpq] Use VCPKG_OSX_SYSROOT if set

otherwise configure set the default sysroot in addition, ignoring the
sysroot set by vcpkg_configure_cmake.

* [libpq] remove comment only chunks from patches

* [libpq] update version registry
---
 .../patches/windows/Solution_DEBUG.patch      | 103 +++----------
 .../patches/windows/Solution_RELEASE.patch    | 138 +-----------------
 ports/libpq/patches/windows/install.patch     |  57 +++-----
 .../patches/windows/python3_build_DEBUG.patch |   4 +-
 .../windows/python3_build_RELEASE.patch       |   4 +-
 .../patches/windows/win_bison_flex.patch      |  12 +-
 ports/libpq/portfile.cmake                    |   9 +-
 ports/libpq/vcpkg.json                        |   4 +-
 versions/baseline.json                        |   4 +-
 versions/l-/libpq.json                        |   5 +
 10 files changed, 72 insertions(+), 268 deletions(-)

diff --git a/ports/libpq/patches/windows/Solution_DEBUG.patch b/ports/libpq/patches/windows/Solution_DEBUG.patch
index e641f468a10924..7b8914e3ac052e 100644
--- a/ports/libpq/patches/windows/Solution_DEBUG.patch
+++ b/ports/libpq/patches/windows/Solution_DEBUG.patch
@@ -2,90 +2,35 @@ diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
 index 51711c2bf..d33fdc3b0 100644
 --- a/src/tools/msvc/Solution.pm	
 +++ b/src/tools/msvc/Solution.pm
-@@ -650,7 +650,7 @@ sub AddProject
+@@ -658,7 +658,7 @@ sub AddProject
  	if ($self->{options}->{zlib})
  	{
  		$proj->AddIncludeDir($self->{options}->{zlib} . '\include');
 -		$proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib');
-+		$proj->AddLibrary($self->{options}->{zlib} . '\debug\lib\zlibd.lib'); # This must be updated
++		$proj->AddLibrary($self->{options}->{zlib} . '\debug\lib\zlibd.lib');
  	}
  	if ($self->{options}->{openssl})
  	{
-@@ -661,7 +661,7 @@ sub AddProject
- 		# changed their library names from:
- 		# - libeay to libcrypto
- 		# - ssleay to libssl
--		if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0')
-+		if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0') # This must be updated
- 		{
- 			my $dbgsuffix;
- 			my $libsslpath;
-@@ -670,27 +670,27 @@ sub AddProject
- 			# The format name of the libraries is slightly
- 			# different between the Win32 and Win64 platform, so
- 			# adapt.
--			if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib")
-+			if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib") # This must be updated
- 			{
- 				# Win32 here, with a debugging library set.
- 				$dbgsuffix     = 1;
--				$libsslpath    = '\lib\VC\libssl32.lib';
--				$libcryptopath = '\lib\VC\libcrypto32.lib';
-+				$libsslpath    = '\lib\VC\libssl32.lib'; # This must be updated
-+				$libcryptopath = '\lib\VC\libcrypto32.lib'; # This must be updated
- 			}
--			elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib")
-+			elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib") # This must be updated
- 			{
- 				# Win64 here, with a debugging library set.
- 				$dbgsuffix     = 1;
--				$libsslpath    = '\lib\VC\libssl64.lib';
--				$libcryptopath = '\lib\VC\libcrypto64.lib';
-+				$libsslpath    = '\lib\VC\libssl64.lib'; # This must be updated
-+				$libcryptopath = '\lib\VC\libcrypto64.lib'; # This must be updated
- 			}
- 			else
- 			{
+@@ -698,8 +698,8 @@ sub AddProject
  				# On both Win32 and Win64 the same library
  				# names are used without a debugging context.
  				$dbgsuffix     = 0;
 -				$libsslpath    = '\lib\libssl.lib';
 -				$libcryptopath = '\lib\libcrypto.lib';
-+				$libsslpath    = '\debug\lib\libssl.lib'; # This must be updated
-+				$libcryptopath = '\debug\lib\libcrypto.lib'; # This must be updated
++				$libsslpath    = '\debug\lib\libssl.lib';
++				$libcryptopath = '\debug\lib\libcrypto.lib';
  			}
  
  			$proj->AddLibrary($self->{options}->{openssl} . $libsslpath,
-@@ -698,16 +698,16 @@ sub AddProject
- 			$proj->AddLibrary($self->{options}->{openssl} . $libcryptopath,
- 				$dbgsuffix);
- 		}
--		else
-+		else 
- 		{
- 			# Choose which set of libraries to use depending on if
- 			# debugging libraries are in place in the installer.
--			if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib")
-+			if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib") # This must be updated
- 			{
- 				$proj->AddLibrary(
--					$self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1);
-+					$self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1); # This must be updated
- 				$proj->AddLibrary(
--					$self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1);
-+					$self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1); # This must be updated
- 			}
- 			else
- 			{
-@@ -715,60 +715,60 @@ sub AddProject
+@@ -715,16 +715,16 @@ sub AddProject
  				# to be here, so don't ask for it in last
  				# parameter.
  				$proj->AddLibrary(
 -					$self->{options}->{openssl} . '\lib\ssleay32.lib', 0);
-+					$self->{options}->{openssl} . '\debug\lib\ssleay32.lib', 0); # This must be updated
++					$self->{options}->{openssl} . '\debug\lib\ssleay32.lib', 0);
  				$proj->AddLibrary(
 -					$self->{options}->{openssl} . '\lib\libeay32.lib', 0);
-+					$self->{options}->{openssl} . '\debug\lib\libeay32.lib', 0); # This must be updated
++					$self->{options}->{openssl} . '\debug\lib\libeay32.lib', 0);
  			}
  		}
  	}
@@ -93,24 +38,16 @@ index 51711c2bf..d33fdc3b0 100644
  	{
  		$proj->AddIncludeDir($self->{options}->{nls} . '\include');
 -		$proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib');
-+		$proj->AddLibrary($self->{options}->{nls} . '\debug\lib\intl.lib'); # This must be updated
++		$proj->AddLibrary($self->{options}->{nls} . '\debug\lib\intl.lib');
  	}
  	if ($self->{options}->{gss})
  	{
--		$proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');
--		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib');
--		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');
--		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');
-+		$proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');  # This must be updated
-+		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib'); # This must be updated
-+		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');# This must be updated
-+		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');# This must be updated
- 	}
+@@ -752,39 +752,39 @@ sub AddProject
  	if ($self->{options}->{iconv})
  	{
  		$proj->AddIncludeDir($self->{options}->{iconv} . '\include');
 -		$proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib');
-+		$proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\iconv.lib'); # This must be updated
++		$proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\iconv.lib');
  	}
  	if ($self->{options}->{icu})
  	{
@@ -120,18 +57,18 @@ index 51711c2bf..d33fdc3b0 100644
 -			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
 -			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib');
 -			$proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib');
-+			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # This must be updated
-+			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # This must be updated
-+			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # This must be updated
++			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib');
++			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib');
++			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib');
  		}
  		else
  		{
 -			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib');
 -			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib');
 -			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib');
-+			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # This must be updated
-+			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # This must be updated
-+			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # This must be updated
++			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib');
++			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib');
++			$proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib');
  		}
  	}
  	if ($self->{options}->{xml})
@@ -139,19 +76,19 @@ index 51711c2bf..d33fdc3b0 100644
  		$proj->AddIncludeDir($self->{options}->{xml} . '\include');
  		$proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2');
 -		$proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib');
-+		$proj->AddLibrary($self->{options}->{xml} . '\debug\lib\libxml2.lib'); # This must be updated
++		$proj->AddLibrary($self->{options}->{xml} . '\debug\lib\libxml2.lib');
  	}
  	if ($self->{options}->{xslt})
  	{
  		$proj->AddIncludeDir($self->{options}->{xslt} . '\include');
 -		$proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib');
-+		$proj->AddLibrary($self->{options}->{xslt} . '\debug\lib\libxslt.lib'); # This must be updated
++		$proj->AddLibrary($self->{options}->{xslt} . '\debug\lib\libxslt.lib');
  	}
  	if ($self->{options}->{uuid})
  	{
  		$proj->AddIncludeDir($self->{options}->{uuid} . '\include');
 -		$proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib');
-+		$proj->AddLibrary($self->{options}->{uuid} . '\debug\lib\uuid.lib'); # This must be updated
++		$proj->AddLibrary($self->{options}->{uuid} . '\debug\lib\uuid.lib');
  	}
  	return $proj;
  }
diff --git a/ports/libpq/patches/windows/Solution_RELEASE.patch b/ports/libpq/patches/windows/Solution_RELEASE.patch
index cc41b8d0b7d569..b690c18710c23c 100644
--- a/ports/libpq/patches/windows/Solution_RELEASE.patch
+++ b/ports/libpq/patches/windows/Solution_RELEASE.patch
@@ -2,156 +2,34 @@ diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
 index 51711c2bf..d33fdc3b0 100644
 --- a/src/tools/msvc/Solution.pm	
 +++ b/src/tools/msvc/Solution.pm
-@@ -650,7 +650,7 @@ sub AddProject
+@@ -658,7 +658,7 @@ sub AddProject
  	if ($self->{options}->{zlib})
  	{
  		$proj->AddIncludeDir($self->{options}->{zlib} . '\include');
 -		$proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib');
-+		$proj->AddLibrary($self->{options}->{zlib} . '\lib\zlib.lib'); # This must be updated
++		$proj->AddLibrary($self->{options}->{zlib} . '\lib\zlib.lib');
  	}
  	if ($self->{options}->{openssl})
  	{
-@@ -661,7 +661,7 @@ sub AddProject
- 		# changed their library names from:
- 		# - libeay to libcrypto
- 		# - ssleay to libssl
--		if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0')
-+		if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0') # This must be updated
- 		{
- 			my $dbgsuffix;
- 			my $libsslpath;
-@@ -670,27 +670,27 @@ sub AddProject
- 			# The format name of the libraries is slightly
- 			# different between the Win32 and Win64 platform, so
- 			# adapt.
--			if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib")
-+			if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib") # This must be updated
- 			{
- 				# Win32 here, with a debugging library set.
- 				$dbgsuffix     = 1;
--				$libsslpath    = '\lib\VC\libssl32.lib';
--				$libcryptopath = '\lib\VC\libcrypto32.lib';
-+				$libsslpath    = '\lib\VC\libssl32.lib'; # This must be updated
-+				$libcryptopath = '\lib\VC\libcrypto32.lib'; # This must be updated
- 			}
--			elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib")
-+			elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib") # This must be updated
- 			{
- 				# Win64 here, with a debugging library set.
- 				$dbgsuffix     = 1;
--				$libsslpath    = '\lib\VC\libssl64.lib';
--				$libcryptopath = '\lib\VC\libcrypto64.lib';
-+				$libsslpath    = '\lib\VC\libssl64.lib'; # This must be updated
-+				$libcryptopath = '\lib\VC\libcrypto64.lib'; # This must be updated
- 			}
- 			else
- 			{
- 				# On both Win32 and Win64 the same library
- 				# names are used without a debugging context.
- 				$dbgsuffix     = 0;
--				$libsslpath    = '\lib\libssl.lib';
--				$libcryptopath = '\lib\libcrypto.lib';
-+				$libsslpath    = '\lib\libssl.lib'; # This must be updated
-+				$libcryptopath = '\lib\libcrypto.lib'; # This must be updated
- 			}
- 
- 			$proj->AddLibrary($self->{options}->{openssl} . $libsslpath,
-@@ -698,16 +698,16 @@ sub AddProject
- 			$proj->AddLibrary($self->{options}->{openssl} . $libcryptopath,
- 				$dbgsuffix);
- 		}
--		else
-+		else 
- 		{
- 			# Choose which set of libraries to use depending on if
- 			# debugging libraries are in place in the installer.
--			if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib")
-+			if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib") # This must be updated
- 			{
- 				$proj->AddLibrary(
--					$self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1);
-+					$self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1); # This must be updated
- 				$proj->AddLibrary(
--					$self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1);
-+					$self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1); # This must be updated
- 			}
- 			else
- 			{
-@@ -715,60 +715,60 @@ sub AddProject
- 				# to be here, so don't ask for it in last
- 				# parameter.
- 				$proj->AddLibrary(
--					$self->{options}->{openssl} . '\lib\ssleay32.lib', 0);
-+					$self->{options}->{openssl} . '\lib\ssleay32.lib', 0); # This must be updated
- 				$proj->AddLibrary(
--					$self->{options}->{openssl} . '\lib\libeay32.lib', 0);
-+					$self->{options}->{openssl} . '\lib\libeay32.lib', 0); # This must be updated
- 			}
- 		}
- 	}
+@@ -724,7 +724,7 @@ sub AddProject
  	if ($self->{options}->{nls})
  	{
  		$proj->AddIncludeDir($self->{options}->{nls} . '\include');
 -		$proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib');
-+		$proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib'); # This must be updated
++		$proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib');
  	}
  	if ($self->{options}->{gss})
  	{
--		$proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');
--		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib');
--		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');
--		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');
-+		$proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');  # This must be updated
-+		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib'); # This must be updated
-+		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');# This must be updated
-+		$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');# This must be updated
- 	}
- 	if ($self->{options}->{iconv})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{iconv} . '\include');
--		$proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib');
-+		$proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); # This must be updated
- 	}
- 	if ($self->{options}->{icu})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{icu} . '\include');
- 		if ($self->{platform} eq 'Win32')
- 		{
--			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
--			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib');
--			$proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib');
-+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # This must be updated
-+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # This must be updated
-+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # This must be updated
+@@ -765,9 +765,9 @@ sub AddProject
  		}
  		else
  		{
 -			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib');
 -			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib');
 -			$proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib');
-+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # This must be updated
-+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # This must be updated
-+			$proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # This must be updated
++			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
++			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib');
++			$proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib');
  		}
  	}
  	if ($self->{options}->{xml})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{xml} . '\include');
- 		$proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2');
--		$proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib');
-+		$proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); # This must be updated
- 	}
- 	if ($self->{options}->{xslt})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{xslt} . '\include');
--		$proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib');
-+		$proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); # This must be updated
- 	}
- 	if ($self->{options}->{uuid})
- 	{
- 		$proj->AddIncludeDir($self->{options}->{uuid} . '\include');
--		$proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib');
-+		$proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); # This must be updated
- 	}
- 	return $proj;
- }
diff --git a/ports/libpq/patches/windows/install.patch b/ports/libpq/patches/windows/install.patch
index 42713389bb6da8..ecc14ac7bf2b6e 100644
--- a/ports/libpq/patches/windows/install.patch
+++ b/ports/libpq/patches/windows/install.patch
@@ -2,35 +2,7 @@ diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
 index d109b2c90..75c7446e6 100644
 --- a/src/tools/msvc/Install.pm
 +++ b/src/tools/msvc/Install.pm
-@@ -63,8 +63,16 @@ sub Install
- 		do "./config.pl" if (-f "config.pl");
- 	}
- 
--	chdir("../../..")    if (-f "../../../configure");
--	chdir("../../../..") if (-f "../../../../configure");
-+	# Move to the root path depending on the current location.
-+	if (-f "../../../configure")
-+	{
-+		chdir("../../..");
-+	}
-+	elsif (-f "../../../../configure")
-+	{
-+		chdir("../../../..");
-+	}
-+
- 	my $conf = "";
- 	if (-d "debug")
- 	{
-@@ -106,7 +106,7 @@ sub Install
- 			}
- 		},
- 		@top_dir);
--	CopySetOfFiles('config files', $sample_files, $target . '/share/');
-+	CopySetOfFiles('config files', $sample_files, $target . '/share/libpq/');
- 	CopyFiles(
- 		'Import libraries',
- 		$target . '/lib/',
-@@ -78,10 +78,10 @@ sub Install
+@@ -86,10 +86,10 @@ sub Install
  	my $majorver = DetermineMajorVersion();
  	print "Installing version $majorver for $conf in $target\n";
  
@@ -44,7 +16,16 @@ index d109b2c90..75c7446e6 100644
  	if ($insttype eq "client")
  	{
  		EnsureDirectories($target, @client_dirs);
-@@ -120,35 +120,35 @@ sub Install
+@@ -114,7 +114,7 @@ sub Install
+ 			}
+ 		},
+ 		@top_dir);
+-	CopySetOfFiles('config files', $sample_files, $target . '/share/');
++	CopySetOfFiles('config files', $sample_files, $target . '/share/libpq/');
+ 	CopyFiles(
+ 		'Import libraries',
+ 		$target . '/lib/',
+@@ -128,35 +128,35 @@ sub Install
  		CopySetOfFiles(
  			'timezone names',
  			[ glob('src\timezone\tznames\*.txt') ],
@@ -88,7 +69,7 @@ index d109b2c90..75c7446e6 100644
  
  		my $pl_extension_files = [];
  		my @pldirs             = ('src/pl/plpgsql/src');
-@@ -167,7 +167,7 @@ sub Install
+@@ -175,7 +175,7 @@ sub Install
  			},
  			@pldirs);
  		CopySetOfFiles('PL Extension files',
@@ -97,7 +78,7 @@ index d109b2c90..75c7446e6 100644
  	}
  
  	GenerateNLSFiles($target, $config->{nls}, $majorver) if ($config->{nls});
-@@ -282,23 +282,26 @@ sub CopySolutionOutput
+@@ -290,23 +290,26 @@ sub CopySolutionOutput
  		{
  			if ($1 == 1)
  			{
@@ -128,7 +109,7 @@ index d109b2c90..75c7446e6 100644
  			}
  		}
  		elsif ($vcproj eq 'vcxproj'
-@@ -306,11 +309,11 @@ sub CopySolutionOutput
+@@ -317,11 +317,11 @@ sub CopySolutionOutput
  		{
  			if ($1 eq 'Application')
  			{
@@ -142,7 +123,7 @@ index d109b2c90..75c7446e6 100644
  				if ($is_sharedlib)
  				{
  					push(@{ $install_list{'bin'} }, "dll");
-@@ -319,10 +322,9 @@ sub CopySolutionOutput
+@@ -327,10 +330,9 @@ sub CopySolutionOutput
  			}
  			else    # 'StaticLibrary'
  			{
@@ -154,7 +135,7 @@ index d109b2c90..75c7446e6 100644
  			}
  		}
  		else
-@@ -339,7 +339,7 @@ sub CopySolutionOutput
+@@ -349,7 +349,7 @@ sub CopySolutionOutput
  				  || croak "Could not copy $pf.$ext\n";
  			}
  		}
@@ -167,11 +148,11 @@ index d109b2c90..75c7446e6 100644
  	print "Generating timezone files...";
  
  	my @args =
--	  ("$conf/zic/zic", '-d', "$target/share/timezone", '-p', "$posixrules");
-+	  ("$conf/zic/zic", '-d', "$target/share/libpq/timezone", '-p', "$posixrules");
+-	  ("$conf/zic/zic", '-d', "$target/share/timezone",
++	  ("$conf/zic/zic", '-d', "$target/share/libpq/timezone",
+ 	   '-p', "$posixrules", '-b', 'fat');
  	foreach (@tzfiles)
  	{
- 		my $tzfile = $_;
 @@ -391,7 +391,7 @@ sub GenerateTsearchFiles
  	$mf =~ /^LANGUAGES\s*=\s*(.*)$/m
  	  || die "Could not find LANGUAGES line in snowball Makefile\n";
diff --git a/ports/libpq/patches/windows/python3_build_DEBUG.patch b/ports/libpq/patches/windows/python3_build_DEBUG.patch
index fb267e9df12b81..0a261038638931 100644
--- a/ports/libpq/patches/windows/python3_build_DEBUG.patch
+++ b/ports/libpq/patches/windows/python3_build_DEBUG.patch
@@ -9,7 +9,7 @@ index 99f39caa5..21b5559d6 100644
 -		my $pythonprog = "import sys;print(sys.prefix);"
 -		  . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
 -		my $prefixcmd =
--		  $solution->{options}->{python} . "\\python -c \"$pythonprog\"";
+-		  qq("$solution->{options}->{python}\\python" -c "$pythonprog");
 -		my $pyout = `$prefixcmd`;
 -		die "Could not query for python version!\n" if $?;
 -		my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
@@ -17,7 +17,7 @@ index 99f39caa5..21b5559d6 100644
 +		#my $pythonprog = "import sys;print(sys.prefix);"
 +		#  . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
 +		#my $prefixcmd =
-+		#  $solution->{options}->{python} . "\\python -c \"$pythonprog\"";
++		#  qq("$solution->{options}->{python}\\python" -c "$pythonprog");
 +		#my $pyout = `$prefixcmd`;
 +		#die "Could not query for python version!\n" if $?;
 +		#my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
diff --git a/ports/libpq/patches/windows/python3_build_RELEASE.patch b/ports/libpq/patches/windows/python3_build_RELEASE.patch
index b89e435e4fb38b..5631d55e09d48a 100644
--- a/ports/libpq/patches/windows/python3_build_RELEASE.patch
+++ b/ports/libpq/patches/windows/python3_build_RELEASE.patch
@@ -9,7 +9,7 @@ index 99f39caa5..21b5559d6 100644
 -		my $pythonprog = "import sys;print(sys.prefix);"
 -		  . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
 -		my $prefixcmd =
--		  $solution->{options}->{python} . "\\python -c \"$pythonprog\"";
+-		  qq("$solution->{options}->{python}\\python" -c "$pythonprog");
 -		my $pyout = `$prefixcmd`;
 -		die "Could not query for python version!\n" if $?;
 -		my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
@@ -17,7 +17,7 @@ index 99f39caa5..21b5559d6 100644
 +		#my $pythonprog = "import sys;print(sys.prefix);"
 +		#  . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
 +		#my $prefixcmd =
-+		#  $solution->{options}->{python} . "\\python -c \"$pythonprog\"";
++		#  qq("$solution->{options}->{python}\\python" -c "$pythonprog");
 +		#my $pyout = `$prefixcmd`;
 +		#die "Could not query for python version!\n" if $?;
 +		#my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
diff --git a/ports/libpq/patches/windows/win_bison_flex.patch b/ports/libpq/patches/windows/win_bison_flex.patch
index 95df3f49507efc..fecf0bd365ebe8 100644
--- a/ports/libpq/patches/windows/win_bison_flex.patch
+++ b/ports/libpq/patches/windows/win_bison_flex.patch
@@ -11,7 +11,7 @@ index aceed5ffd..f6ed215e8 100644
  $flexver = (split(/\s+/, $flexver))[1];
  $flexver =~ s/[^0-9.]//g;
  my @verparts = split(/\./, $flexver);
-@@ -48,7 +47,7 @@ close($mf);
+@@ -48,7 +48,7 @@ close($mf);
  my $basetarg = basename($output);
  my $flexflags = ($make =~ /^$basetarg:\s*FLEXFLAGS\s*=\s*(\S.*)/m ? $1 : '');
  
@@ -34,10 +34,10 @@ index 895e398c0..f5b524a5d 100644
  
  unless ($bisonver eq '1.875' || $bisonver ge '2.2')
 @@ -45,5 +45,5 @@ close($mf);
- my $basetarg = basename($output);
- my $headerflag = ($make =~ /^$basetarg:\s+BISONFLAGS\b.*-d/m ? '-d' : '');
-
--system("bison $headerflag $input -o $output");
-+system("win_bison $headerflag $input -o $output");
+ 
+ my $nodep = $bisonver ge '3.0' ? "-Wno-deprecated" : "";
+ 
+-system("bison $nodep $headerflag $input -o $output");
++system("win_bison $nodep $headerflag $input -o $output");
  exit $? >> 8;
 
diff --git a/ports/libpq/portfile.cmake b/ports/libpq/portfile.cmake
index 811ed613e09ba4..8d44094eebcb90 100644
--- a/ports/libpq/portfile.cmake
+++ b/ports/libpq/portfile.cmake
@@ -1,4 +1,4 @@
-set(PORT_VERSION 12.2)
+set(PORT_VERSION 12.9)
 # NOTE: the python patches must be regenerated on version update
 
 macro(feature_unsupported)
@@ -32,7 +32,7 @@ endif()
 vcpkg_download_distfile(ARCHIVE
     URLS "https://ftp.postgresql.org/pub/source/v${PORT_VERSION}/postgresql-${PORT_VERSION}.tar.bz2"
     FILENAME "postgresql-${PORT_VERSION}.tar.bz2"
-    SHA512 0e0ce8e21856e8f43e58b840c10c4e3ffae6d5207e0d778e9176e36f8e20e34633cbb06f0030a7c963c3491bb7e941456d91b55444c561cfc6f283fba76f33ee
+    SHA512 11697d8283f5df5a9c74c2406e94d1b6da6df8358ad48f3b773825aab98e8395f9fd4e3fc8b1e6ebad3743c3dadbda8b795d4fe84a447d7913223e136cf2b88f
 )
 
 set(PATCHES
@@ -281,6 +281,9 @@ else()
     if(VCPKG_TARGET_IS_ANDROID) # AND CMAKE_SYSTEM_VERSION LESS 26)
         list(APPEND BUILD_OPTS ac_cv_header_langinfo_h=no)
     endif()
+    if(VCPKG_OSX_SYSROOT)
+        list(APPEND BUILD_OPTS "PG_SYSROOT=${VCPKG_OSX_SYSROOT}")
+    endif()
     vcpkg_configure_make(
         SOURCE_PATH ${SOURCE_PATH}
         COPY_SOURCE
@@ -332,4 +335,4 @@ endif()
 configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/postgresql/vcpkg-cmake-wrapper.cmake" @ONLY)
 file(INSTALL "${CURRENT_PORT_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-vcpkg_fixup_pkgconfig()
\ No newline at end of file
+vcpkg_fixup_pkgconfig()
diff --git a/ports/libpq/vcpkg.json b/ports/libpq/vcpkg.json
index 0b5ff40a5c1c27..dc7adc983ce160 100644
--- a/ports/libpq/vcpkg.json
+++ b/ports/libpq/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libpq",
-  "version": "12.2",
-  "port-version": 20,
+  "version": "12.9",
+  "port-version": 1,
   "description": "The official database access API of postgresql",
   "homepage": "https://www.postgresql.org/",
   "supports": "!uwp",
diff --git a/versions/baseline.json b/versions/baseline.json
index c0a5aadb7e5dbf..be72362ebfdbc2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3797,8 +3797,8 @@
       "port-version": 14
     },
     "libpq": {
-      "baseline": "12.2",
-      "port-version": 20
+      "baseline": "12.9",
+      "port-version": 1
     },
     "libpqxx": {
       "baseline": "7.6.0",
diff --git a/versions/l-/libpq.json b/versions/l-/libpq.json
index af14f925114503..bdad019f865a81 100644
--- a/versions/l-/libpq.json
+++ b/versions/l-/libpq.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "099cade84111279ffa4a909061cb8f4f36137842",
+      "version": "12.9",
+      "port-version": 1
+    },
     {
       "git-tree": "bd369bc003e7ebebb688ee536065a356f1658260",
       "version": "12.2",

From fab111134e99a1b72e41504690eb24e8434f0d66 Mon Sep 17 00:00:00 2001
From: Vitaly <v31337@gmail.com>
Date: Tue, 14 Dec 2021 22:27:43 +0300
Subject: [PATCH 13/48] [qhttpengine] New port (#22009)

* [qhttpengine] New port

* Update version database

* Fix the format of portfile.cmake

* Fix the format of portfile.cmake

* update version

* Remove duplicate build_shared_libs setting.

Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>
Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
---
 ports/qhttpengine/portfile.cmake | 22 ++++++++++++++++++++++
 ports/qhttpengine/vcpkg.json     | 17 +++++++++++++++++
 versions/baseline.json           |  4 ++++
 versions/q-/qhttpengine.json     |  9 +++++++++
 4 files changed, 52 insertions(+)
 create mode 100644 ports/qhttpengine/portfile.cmake
 create mode 100644 ports/qhttpengine/vcpkg.json
 create mode 100644 versions/q-/qhttpengine.json

diff --git a/ports/qhttpengine/portfile.cmake b/ports/qhttpengine/portfile.cmake
new file mode 100644
index 00000000000000..5a59f0ce84d268
--- /dev/null
+++ b/ports/qhttpengine/portfile.cmake
@@ -0,0 +1,22 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO nitroshare/qhttpengine
+    REF 43f55df51623621ed3efb4e42c7894586d988667
+    SHA512 bf615016b9078ff1b3b47bb0d0329565d2d44caba67a3a207c430e7f03a7b5d8b326268fafa2b8ebff387aec9356014ec5510e18a422dd2dea7eb1e9bfc009f3
+    HEAD_REF master
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_DOC=OFF
+        -DBUILD_EXAMPLES=OFF
+        -DBUILD_TESTS=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/qhttpengine/vcpkg.json b/ports/qhttpengine/vcpkg.json
new file mode 100644
index 00000000000000..9e554e1e50bc5e
--- /dev/null
+++ b/ports/qhttpengine/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "qhttpengine",
+  "version": "1.0.2",
+  "description": "HTTP server for Qt applications",
+  "supports": "!uwp",
+  "dependencies": [
+    "qt5-base",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index be72362ebfdbc2..a4facd78bd80a0 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5488,6 +5488,10 @@
       "baseline": "2.0.1",
       "port-version": 5
     },
+    "qhttpengine": {
+      "baseline": "1.0.2",
+      "port-version": 0
+    },
     "qhull": {
       "baseline": "8.0.2",
       "port-version": 2
diff --git a/versions/q-/qhttpengine.json b/versions/q-/qhttpengine.json
new file mode 100644
index 00000000000000..7ce14ff67e9662
--- /dev/null
+++ b/versions/q-/qhttpengine.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "7981cbfcf13bef7cfede8cf40a9d69967cc63dfb",
+      "version": "1.0.2",
+      "port-version": 0
+    }
+  ]
+}

From a19bedd9582685ceb044232f710ef1aaac694efa Mon Sep 17 00:00:00 2001
From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Date: Wed, 15 Dec 2021 04:57:42 +0800
Subject: [PATCH 14/48] [ xtensor-io ] Fix wrong hash (#22018)

* [xtensor-io] Fix wrong hash

* update version
---
 ports/xtensor-io/portfile.cmake | 2 +-
 ports/xtensor-io/vcpkg.json     | 1 +
 versions/baseline.json          | 2 +-
 versions/x-/xtensor-io.json     | 5 +++++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ports/xtensor-io/portfile.cmake b/ports/xtensor-io/portfile.cmake
index 10476d146ed205..9deb72ec56d2f2 100644
--- a/ports/xtensor-io/portfile.cmake
+++ b/ports/xtensor-io/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO xtensor-stack/xtensor-io
     REF ffada938383b0f24c9e0b07cea7d5780057e1d96 # 0.13.0
-    SHA512 d7c5c85489aea9b9d8af7ee33a43dd8ab888e7f03da8b533ace39e143f89acbae4fe88bb10253931a3cc44041e1532bd76483686f7f20c00e2850647a574349c
+    SHA512 ce5d085e500ef7043eb51538cab9a53c857983ac43e392cd65958c76fcde3ddb00161097cb70d334fa7d12af12e8109bb958b51f39afd9eeb60bb3421424058e
     HEAD_REF master
 )
 
diff --git a/ports/xtensor-io/vcpkg.json b/ports/xtensor-io/vcpkg.json
index 18f0acdfecdff4..c09140b2b8259f 100644
--- a/ports/xtensor-io/vcpkg.json
+++ b/ports/xtensor-io/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "xtensor-io",
   "version": "0.13.0",
+  "port-version": 1,
   "description": "xtensor plugin to read and write images, audio files, numpy (compressed) npz and HDF5",
   "homepage": "https://github.com/xtensor-stack/xtensor-io",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index a4facd78bd80a0..48cdcca5d51ec5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7378,7 +7378,7 @@
     },
     "xtensor-io": {
       "baseline": "0.13.0",
-      "port-version": 0
+      "port-version": 1
     },
     "xtl": {
       "baseline": "0.7.2",
diff --git a/versions/x-/xtensor-io.json b/versions/x-/xtensor-io.json
index 63aa72108767ed..9c5f26f192533b 100644
--- a/versions/x-/xtensor-io.json
+++ b/versions/x-/xtensor-io.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5673651fb8b30a016de2c3a3d7fbe96838690cb1",
+      "version": "0.13.0",
+      "port-version": 1
+    },
     {
       "git-tree": "71f1c4cb5fb871e6dd863766646a38b232a20b2f",
       "version": "0.13.0",

From 1a0a2fe47bf7b6471cb296fcd9e8631c125adc6b Mon Sep 17 00:00:00 2001
From: Billy O'Neal <bion@microsoft.com>
Date: Tue, 14 Dec 2021 16:15:33 -0800
Subject: [PATCH 15/48] [vcpkg] Update VMs for December 2021 Patch Tuesday
 (#22013)

* Add Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools to VS as requested by https://github.com/microsoft/vcpkg/issues/19554

* Cherry pick python changes from https://github.com/microsoft/vcpkg/pull/21912

* Update linux pool.

* Update windows pool.
---
 scripts/azure-pipelines/azure-pipelines.yml              | 2 +-
 scripts/azure-pipelines/windows/deploy-visual-studio.ps1 | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml
index 02022e732acdee..300a80a9c01391 100644
--- a/scripts/azure-pipelines/azure-pipelines.yml
+++ b/scripts/azure-pipelines/azure-pipelines.yml
@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 #
 variables:
-  windows-pool: 'PrWin-2021-11-10'
+  windows-pool: 'PrWin-2021-12-14'
   linux-pool: 'PrLin-2021-12-13'
   osx-pool: 'PrOsx-2021-07-27'
 
diff --git a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1 b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1
index 0ec5ff7110688c..c8f0196057a231 100644
--- a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1
+++ b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1
@@ -23,7 +23,8 @@ $Workloads = @(
   'Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset',
   'Microsoft.VisualStudio.Component.VC.Llvm.Clang',
   'Microsoft.VisualStudio.Component.VC.v141.x86.x64',
-  'Microsoft.VisualStudio.Component.VC.140'
+  'Microsoft.VisualStudio.Component.VC.140',
+  'Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools'
 )
 
 <#

From bfb9db9ad7c37bb316586013acf8e963e84585ea Mon Sep 17 00:00:00 2001
From: Angus Comrie <accomrie@gmail.com>
Date: Wed, 15 Dec 2021 06:56:11 +0200
Subject: [PATCH 16/48] [starlink] Veggiesaurus/starlink ast cminpack fix
 (#20559)

* add CMINPACK_NO_DLL flag back

* bump port version

* updated versions JSON

* quotation mark adjustment

* git-tree update

* adjusted c flags configuration

* hash update

* whitespace fix

* git-tree hash update

* updated to ast 9.2.5, added external-cminpack flag

* updated version hash

* removed old version entry

* removed $schema element from json

* updated port git-tree hash
---
 ports/starlink-ast/portfile.cmake | 7 ++++---
 ports/starlink-ast/vcpkg.json     | 6 ++++--
 versions/baseline.json            | 4 ++--
 versions/s-/starlink-ast.json     | 5 +++++
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ports/starlink-ast/portfile.cmake b/ports/starlink-ast/portfile.cmake
index 92475ad5509dc2..b2169c666c9717 100644
--- a/ports/starlink-ast/portfile.cmake
+++ b/ports/starlink-ast/portfile.cmake
@@ -1,9 +1,9 @@
 vcpkg_fail_port_install(ON_TARGET "Linux" "OSX")
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/Starlink/ast/releases/download/v9.2.4/ast-9.2.4.tar.gz"
-    FILENAME "ast-9.2.4.tar.gz"
-    SHA512 84e6f243e6d9d77328b73b97355feb3990307fb9c8f9b2f30344d71e2f5e63a849cdce0090ff5b7cc16028e12d68516c885b13d76db841072c9d1d06a7742a9e
+    URLS "https://github.com/Starlink/ast/releases/download/v9.2.5/ast-9.2.5.tar.gz"
+    FILENAME "ast-9.2.5.tar.gz"
+    SHA512 2eee3df56ca49a9fbb6b103b26f41a63a7b77533bcc74bc4154b57567ee6da53d5c7ff1d38c4ad0ce330d9b902e35d40184fa9e985506c3dcbbb03071be65760
 )
 
 vcpkg_extract_source_archive_ex(
@@ -13,6 +13,7 @@ vcpkg_extract_source_archive_ex(
 
 set(CONFIGURE_OPTIONS
     --without-fortran
+    --with-external-cminpack
     star_cv_cnf_trail_type=long
     star_cv_cnf_f2c_compatible=no
 )
diff --git a/ports/starlink-ast/vcpkg.json b/ports/starlink-ast/vcpkg.json
index 5c3753df6b4cdd..340d9a424db17d 100644
--- a/ports/starlink-ast/vcpkg.json
+++ b/ports/starlink-ast/vcpkg.json
@@ -1,10 +1,12 @@
 {
   "name": "starlink-ast",
-  "version-semver": "9.2.4",
-  "port-version": 2,
+  "version-semver": "9.2.5",
   "description": "The AST library provides a comprehensive range of facilities for attaching world coordinate systems to astronomical data, for retrieving and interpreting that information and for generating graphical output based on it",
   "homepage": "https://starlink.eao.hawaii.edu/starlink/AST",
   "supports": "windows",
+  "dependencies": [
+    "cminpack"
+  ],
   "features": {
     "pthreads": {
       "description": "build with POSIX threads support",
diff --git a/versions/baseline.json b/versions/baseline.json
index 48cdcca5d51ec5..5af06abfd755d0 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6577,8 +6577,8 @@
       "port-version": 0
     },
     "starlink-ast": {
-      "baseline": "9.2.4",
-      "port-version": 2
+      "baseline": "9.2.5",
+      "port-version": 0
     },
     "status-code": {
       "baseline": "1.0.0-20211208",
diff --git a/versions/s-/starlink-ast.json b/versions/s-/starlink-ast.json
index 0ba8d7525f3ba6..dc9744f018437f 100644
--- a/versions/s-/starlink-ast.json
+++ b/versions/s-/starlink-ast.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b5cfb9d9ff68b40b5a910240d3b0d09190b17b36",
+      "version-semver": "9.2.5",
+      "port-version": 0
+    },
     {
       "git-tree": "487c5e318ce957c09647d0d74a2b5b4a4e99ffef",
       "version-semver": "9.2.4",

From 1bec8e862346c0fbb3984cae9b909a3d01bf61e4 Mon Sep 17 00:00:00 2001
From: Li Zeyang <a.banknote@gmail.com>
Date: Wed, 15 Dec 2021 12:56:53 +0800
Subject: [PATCH 17/48] [libunifex] Update to 2021-12-07 (#21995)

* updated libunifex version

* remove comment

* run x-add-versions --all

* Update ports/libunifex/vcpkg.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* rerun x-add-version libunifex

* Update versions/l-/libunifex.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* update libunifex to 12-07

* x-add-version

* libunifex port update

force cpp20 as cpp17 build doesn't work with msvc. added a compile fix for externConstexpr and removed warnings with /EHsc

* Update libunifex.json

version update

* Update fix-compile-error.patch

relax clang warnings

* Update libunifex.json

git x-add-version libunifex

* remove unused

* x-add-versions

* remove old version log

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
---
 ...warnings.patch => fix-compile-error.patch} | 30 ++++++++---------
 ports/libunifex/fix-install.patch             | 33 -------------------
 ports/libunifex/portfile.cmake                |  9 ++---
 ports/libunifex/vcpkg.json                    |  3 +-
 versions/baseline.json                        |  4 +--
 versions/l-/libunifex.json                    |  5 +++
 6 files changed, 28 insertions(+), 56 deletions(-)
 rename ports/libunifex/{allow-warnings.patch => fix-compile-error.patch} (76%)
 delete mode 100644 ports/libunifex/fix-install.patch

diff --git a/ports/libunifex/allow-warnings.patch b/ports/libunifex/fix-compile-error.patch
similarity index 76%
rename from ports/libunifex/allow-warnings.patch
rename to ports/libunifex/fix-compile-error.patch
index 272624f0667c16..10d578feeaaeb2 100644
--- a/ports/libunifex/allow-warnings.patch
+++ b/ports/libunifex/fix-compile-error.patch
@@ -1,15 +1,15 @@
-diff --git a/cmake/unifex_env.cmake b/cmake/unifex_env.cmake
-index cb99ae4..9825532 100644
---- a/cmake/unifex_env.cmake
-+++ b/cmake/unifex_env.cmake
-@@ -21,8 +21,8 @@ endif()
- 
- if (MSVC)
-     # warning level 3 and all warnings as errors
--    add_compile_options(/W3 /WX)
-+    add_compile_options(/W3)
- else()
-     # lots of warnings and all warnings as errors
--    add_compile_options(-Wall -Wextra -pedantic -Werror)
-+    add_compile_options(-Wall -Wextra -pedantic)
- endif()
+diff --git a/cmake/unifex_env.cmake b/cmake/unifex_env.cmake
+index cb99ae4..9825532 100644
+--- a/cmake/unifex_env.cmake
++++ b/cmake/unifex_env.cmake
+@@ -21,8 +21,8 @@ endif()
+ 
+ if (MSVC)
+     # warning level 3 and all warnings as errors
+-    add_compile_options(/W3 /WX)
++    add_compile_options(/W3 /WX /Zc:externConstexpr /EHsc)
+ else()
+     # lots of warnings and all warnings as errors
+-    add_compile_options(-Wall -Wextra -pedantic -Werror)
++    add_compile_options(-Wall -Wextra -pedantic)
+ endif()
diff --git a/ports/libunifex/fix-install.patch b/ports/libunifex/fix-install.patch
deleted file mode 100644
index 2b454c49c19a6c..00000000000000
--- a/ports/libunifex/fix-install.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
-index 3f25517..3c34a54 100644
---- a/source/CMakeLists.txt
-+++ b/source/CMakeLists.txt
-@@ -67,10 +67,27 @@ configure_file(
- target_include_directories(unifex
-   PUBLIC
-     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include/>
--    "${PROJECT_BINARY_DIR}/include")
-+    $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
-+    $<INSTALL_INTERFACE:include>)
- 
- target_compile_features(unifex PUBLIC cxx_std_17)
- 
- if(CXX_COROUTINES_HAVE_COROUTINES)
-   target_link_libraries(unifex PUBLIC std::coroutines)
- endif()
-+
-+install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/unifex
-+        DESTINATION include
-+)
-+install(FILES ${PROJECT_BINARY_DIR}/include/unifex/config.hpp
-+        DESTINATION include/unifex
-+)
-+
-+install(TARGETS unifex
-+  EXPORT unifex-config
-+  DESTINATION lib
-+)
-+install(EXPORT unifex-config
-+  NAMESPACE unofficial::
-+  DESTINATION lib/cmake/unifex
-+)
diff --git a/ports/libunifex/portfile.cmake b/ports/libunifex/portfile.cmake
index f7379fc20c4d18..bca5eca211d268 100644
--- a/ports/libunifex/portfile.cmake
+++ b/ports/libunifex/portfile.cmake
@@ -3,12 +3,11 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebookexperimental/libunifex
-    REF e36b43834329acc75f99910316d3ecec15c0f665
-    SHA512 58f738b49d18982fd3916500c78e8090a266738ec4a8ba416b004fa2c7db718db5ce0e27f5e4e22eaddcc27c8d1618bcb2bc080eee1a31d98543e2595ccc1135
+    REF 9df21c58d34ce8a1cd3b15c3a7347495e29417a0
+    SHA512 2a1c6dbe0e66893be888c301e53b5d2813049047a817e9e1562acf2dec4ae79dec7db90409cd415c59238f2f3e2738e52f86a424041459390c720568ee52d860 
     HEAD_REF master
     PATCHES
-        fix-install.patch
-        allow-warnings.patch
+        fix-compile-error.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -21,7 +20,9 @@ vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
         ${FEATURE_OPTIONS}
+        -DCMAKE_CXX_STANDARD:STRING=20
 )
+
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(PACKAGE_NAME unifex CONFIG_PATH lib/cmake/unifex)
 vcpkg_copy_pdbs()
diff --git a/ports/libunifex/vcpkg.json b/ports/libunifex/vcpkg.json
index 82101d6b975265..20add341a95247 100644
--- a/ports/libunifex/vcpkg.json
+++ b/ports/libunifex/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libunifex",
-  "version-date": "2021-08-01",
-  "port-version": 1,
+  "version-date": "2021-12-07",
   "description": "Unified Executors",
   "homepage": "https://github.com/facebookexperimental/libunifex",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 5af06abfd755d0..332314cd55c6fc 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4005,8 +4005,8 @@
       "port-version": 1
     },
     "libunifex": {
-      "baseline": "2021-08-01",
-      "port-version": 1
+      "baseline": "2021-12-07",
+      "port-version": 0
     },
     "libunistring": {
       "baseline": "0.9.10",
diff --git a/versions/l-/libunifex.json b/versions/l-/libunifex.json
index 2eb60baac970a1..05aad35f1b124d 100644
--- a/versions/l-/libunifex.json
+++ b/versions/l-/libunifex.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "713acea62d9dab0d2dd99d0790b9f716f9b9e971",
+      "version-date": "2021-12-07",
+      "port-version": 0
+    },
     {
       "git-tree": "7c98590771b98cb8c31e49867e78983853307a1f",
       "version-date": "2021-08-01",

From 9227e3e010edc15e1b7dfdeb8ae90ffb34de2d0c Mon Sep 17 00:00:00 2001
From: Joachim Gehweiler <44170764+jgehw@users.noreply.github.com>
Date: Wed, 15 Dec 2021 19:09:54 +0100
Subject: [PATCH 18/48] [tensorflow] update to 2.7, including bazel latest 4.x
 update (#22022)

* Revert "incorporate changes from microsoft:master"

* Revert "Revert "incorporate changes from microsoft:master""

* update tensorflow to 2.7 and bazel to latest 4.x

* Update version database.

Co-authored-by: jgehw <Joachim_Gehweiler@McAfee.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
---
 ports/tensorflow-cc/vcpkg.json                |  2 +-
 .../Update-bazel-max-version.patch            | 12 -------
 .../tensorflow-common/fix-windows-build.patch | 32 -------------------
 ports/tensorflow-common/portfile.cmake        |  1 -
 .../tensorflow-common/tensorflow-common.cmake |  7 ++--
 ports/tensorflow-common/vcpkg.json            |  3 +-
 ports/tensorflow/vcpkg.json                   |  2 +-
 .../cmake/vcpkg_find_acquire_program.cmake    |  8 ++---
 versions/baseline.json                        |  8 ++---
 versions/t-/tensorflow-cc.json                |  5 +++
 versions/t-/tensorflow-common.json            |  5 +++
 versions/t-/tensorflow.json                   |  5 +++
 12 files changed, 29 insertions(+), 61 deletions(-)
 delete mode 100644 ports/tensorflow-common/Update-bazel-max-version.patch

diff --git a/ports/tensorflow-cc/vcpkg.json b/ports/tensorflow-cc/vcpkg.json
index b2f1edcc77f92e..8a79f071679562 100644
--- a/ports/tensorflow-cc/vcpkg.json
+++ b/ports/tensorflow-cc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "tensorflow-cc",
-  "version-semver": "2.6.0",
+  "version-semver": "2.7.0",
   "description": "Library for computation using data flow graphs for scalable machine learning (C++ API version)",
   "homepage": "https://github.com/tensorflow/tensorflow",
   "supports": "!(x86 | arm | uwp)",
diff --git a/ports/tensorflow-common/Update-bazel-max-version.patch b/ports/tensorflow-common/Update-bazel-max-version.patch
deleted file mode 100644
index 172a6439d319f7..00000000000000
--- a/ports/tensorflow-common/Update-bazel-max-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure.py b/configure.py
---- a/configure.py
-+++ b/configure.py
-@@ -50,7 +50,7 @@
- _TF_BAZELRC = ''
- _TF_CURRENT_BAZEL_VERSION = None
- _TF_MIN_BAZEL_VERSION = '3.7.2'
--_TF_MAX_BAZEL_VERSION = '3.99.0'
-+_TF_MAX_BAZEL_VERSION = '4.1.0'
- 
- NCCL_LIB_PATHS = [
-     'lib64/', 'lib/powerpc64le-linux-gnu/', 'lib/x86_64-linux-gnu/', ''
diff --git a/ports/tensorflow-common/fix-windows-build.patch b/ports/tensorflow-common/fix-windows-build.patch
index 8450299e80f7fb..9f7f8dea8d29f1 100644
--- a/ports/tensorflow-common/fix-windows-build.patch
+++ b/ports/tensorflow-common/fix-windows-build.patch
@@ -10,22 +10,6 @@ diff --git a/tensorflow/core/kernels/depthtospace_op.cc b/tensorflow/core/kernel
        if (is_int8x4) {
          // NCHW_VECT_C with 4 x qint8 can be treated as NCHW int32.
          auto Tinput_v = input.template reinterpret_last_dimension<int32, 4>();
-@@ -173,15 +173,6 @@
-   }
- };
- 
--#ifdef WIN32
--template <typename T>
--struct DepthToSpaceOpFunctor<CPUDevice, T, FORMAT_NCHW> {
--  void operator()(const CPUDevice& d, typename TTypes<T, 4>::ConstTensor input,
--                  int block_size, typename TTypes<T, 4>::Tensor output) {
--    LOG(FATAL) << "Trivial implementation to make debug build compile.";
--  }
--};
--#endif
- }  // namespace functor
- 
- #define REGISTER(type)                                                \
 
 diff --git a/tensorflow/core/kernels/spacetodepth_op.cc b/tensorflow/core/kernels/spacetodepth_op.cc
 --- a/tensorflow/core/kernels/spacetodepth_op.cc
@@ -39,19 +23,3 @@ diff --git a/tensorflow/core/kernels/spacetodepth_op.cc b/tensorflow/core/kernel
        using RT = typename RawType<T>::type;
        if (data_format_ == FORMAT_NCHW_VECT_C) {
          // NCHW_VECT_C with 4 x qint8 can be treated as NCHW int32.
-@@ -189,15 +189,6 @@
-   }
- };
- 
--#ifdef WIN32
--template <typename T>
--struct SpaceToDepthOpFunctor<CPUDevice, T, FORMAT_NCHW> {
--  void operator()(const CPUDevice& d, typename TTypes<T, 4>::ConstTensor input,
--                  int block_size, typename TTypes<T, 4>::Tensor output) {
--    LOG(FATAL) << "Trivial implementation to make debug build compile.";
--  }
--};
--#endif
- }  // namespace functor
- 
- #define REGISTER(type)                                                \
diff --git a/ports/tensorflow-common/portfile.cmake b/ports/tensorflow-common/portfile.cmake
index bbfc287df5c544..45fb70e27099a2 100644
--- a/ports/tensorflow-common/portfile.cmake
+++ b/ports/tensorflow-common/portfile.cmake
@@ -18,7 +18,6 @@ set(TENSORFLOW_FILES
     "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-static.cmake.in"
     "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-dll.cmake.in"
     "${CMAKE_CURRENT_LIST_DIR}/tensorflow-config-windows-lib.cmake.in"
-    "${CMAKE_CURRENT_LIST_DIR}/Update-bazel-max-version.patch"
     )
 
 file(COPY ${TENSORFLOW_FILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/tensorflow-common/tensorflow-common.cmake b/ports/tensorflow-common/tensorflow-common.cmake
index cdb7c9665ef98f..c432f141730c6c 100644
--- a/ports/tensorflow-common/tensorflow-common.cmake
+++ b/ports/tensorflow-common/tensorflow-common.cmake
@@ -1,5 +1,5 @@
-set(TF_VERSION 2.6.0)
-set(TF_VERSION_SHORT 2.6)
+set(TF_VERSION 2.7.0)
+set(TF_VERSION_SHORT 2.7)
 
 vcpkg_find_acquire_program(BAZEL)
 get_filename_component(BAZEL_DIR "${BAZEL}" DIRECTORY)
@@ -144,11 +144,10 @@ foreach(BUILD_TYPE dbg rel)
 		OUT_SOURCE_PATH SOURCE_PATH
 		REPO tensorflow/tensorflow
 		REF "v${TF_VERSION}"
-		SHA512 d052da4b324f1b5ac9c904ac3cca270cefbf916be6e5968a6835ef3f8ea8c703a0b90be577ac5205edf248e8e6c7ee8817b6a1b383018bb77c381717c6205e05
+		SHA512 f1e892583c7b3a73d4d39ec65dc135a5b02c789b357d57414ad2b6d05ad9fbfc8ef81918ba6410e314abd6928b76f764e6ef64c0b0c84b58b50796634be03f39
 		HEAD_REF master
 		PATCHES
 			"${CMAKE_CURRENT_LIST_DIR}/fix-build-error.patch" # Fix namespace error
-			"${CMAKE_CURRENT_LIST_DIR}/Update-bazel-max-version.patch"
 			${STATIC_ONLY_PATCHES}
 			${WINDOWS_ONLY_PATCHES}
 	)
diff --git a/ports/tensorflow-common/vcpkg.json b/ports/tensorflow-common/vcpkg.json
index f6a9f7cd124dbf..dc23ce51725969 100644
--- a/ports/tensorflow-common/vcpkg.json
+++ b/ports/tensorflow-common/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "tensorflow-common",
-  "version-semver": "2.6.0",
-  "port-version": 1,
+  "version-semver": "2.7.0",
   "description": "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.",
   "homepage": "https://github.com/tensorflow/tensorflow"
 }
diff --git a/ports/tensorflow/vcpkg.json b/ports/tensorflow/vcpkg.json
index b00a067fcf3bf3..4aa6847128a937 100644
--- a/ports/tensorflow/vcpkg.json
+++ b/ports/tensorflow/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "tensorflow",
-  "version-semver": "2.6.0",
+  "version-semver": "2.7.0",
   "description": "Library for computation using data flow graphs for scalable machine learning (C API version)",
   "homepage": "https://github.com/tensorflow/tensorflow",
   "supports": "!(x86 | arm | uwp)",
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 036043462c6665..55e64feb3f3787 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -497,7 +497,7 @@ function(vcpkg_find_acquire_program program)
         set(tool_subdirectory c3eeb6b9fa-76d69c6db5)
     elseif(program STREQUAL "BAZEL")
         set(program_name bazel)
-        set(program_version 4.1.0)
+        set(program_version 4.2.2)
         set(rename_binary_to "bazel")
         if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
             set(supported_on_unix ON)
@@ -505,19 +505,19 @@ function(vcpkg_find_acquire_program program)
             set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64")
             set(download_filename "bazel-${tool_subdirectory}-x86_64")
             set(raw_executable ON)
-            set(download_sha512 50aa0894dbeedb9189a56f17baa8cecfa55c5f9c1f93a61b9ab5e10984754a400884fc9802b4979f536778e15f813a72807396b4b47694e4c05eadb841361c69)
+            set(download_sha512 f38619e054df78cab38278a5901b2798f2e25b5cec53358d98278002e713d225fd3df96a209b7f22a2357835a279cee8ef1768e10561b3e9fe6361f324563bb9)
         elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
             set(supported_on_unix ON)
             set(tool_subdirectory "${program_version}-darwin")
             set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64")
             set(download_filename "bazel-${tool_subdirectory}-x86_64")
             set(raw_executable ON)
-            set(download_sha512 3500560c9d49d37a1ead2d2777d673c6f1874582883e141ecd5b3991005b1b6b8aab5f255c187133d771497c2a956f5c1e0dfad04dc453525634537e65b649af)
+            set(download_sha512 a3fd8f9d71b0669d742439200f27ee0a3891c1f248df62c841ebb2b416a47534562f429f8a08793b074e9b74f2ede3d97a7e13ac9921c7ee2dc6a2dca8b7f275)
         else()
             set(tool_subdirectory "${program_version}-windows")
             set(download_urls "https://github.com/bazelbuild/bazel/releases/download/${program_version}/bazel-${tool_subdirectory}-x86_64.zip")
             set(download_filename "bazel-${tool_subdirectory}-x86_64.zip")
-            set(download_sha512 3954ab54b465d62eef397767dac7ce21d06ac8ea3e1571d0e7b1f0ea8b5c2cf44eea5d252b85a63a1e1a08dbe9a219783cc23c2888673c35e2df03edfdc9e5a7)
+            set(download_sha512 8a8196e242964114316232818cb81bfa19ebfd3a029ebf550a241e33b22a6e9ed636dade06411a8706c05c4e73def0bc8d7f45ff0ec5478bcc5de21b5638204d)
         endif()
     elseif(program STREQUAL "ARIA2")
         set(program_name aria2c)
diff --git a/versions/baseline.json b/versions/baseline.json
index 332314cd55c6fc..fa33ab9621e33d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6693,16 +6693,16 @@
       "port-version": 1
     },
     "tensorflow": {
-      "baseline": "2.6.0",
+      "baseline": "2.7.0",
       "port-version": 0
     },
     "tensorflow-cc": {
-      "baseline": "2.6.0",
+      "baseline": "2.7.0",
       "port-version": 0
     },
     "tensorflow-common": {
-      "baseline": "2.6.0",
-      "port-version": 1
+      "baseline": "2.7.0",
+      "port-version": 0
     },
     "tensorpipe": {
       "baseline": "2021-04-26",
diff --git a/versions/t-/tensorflow-cc.json b/versions/t-/tensorflow-cc.json
index 2fb6918aa5f074..017d76e1637d58 100644
--- a/versions/t-/tensorflow-cc.json
+++ b/versions/t-/tensorflow-cc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f0bd2999562da259b6e2c39131a6a02f632b21a8",
+      "version-semver": "2.7.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b9e9f840127f8da0c67cadf0369023753c90686b",
       "version-semver": "2.6.0",
diff --git a/versions/t-/tensorflow-common.json b/versions/t-/tensorflow-common.json
index 532edc4b54c3ca..a7797048467249 100644
--- a/versions/t-/tensorflow-common.json
+++ b/versions/t-/tensorflow-common.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "eb9e0e1345847b72eccecd5a6b85a441f034e1a7",
+      "version-semver": "2.7.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e766afec982de89398663f587da490fc8996474f",
       "version-semver": "2.6.0",
diff --git a/versions/t-/tensorflow.json b/versions/t-/tensorflow.json
index 900e6a8ed8106e..97c05bf141f58b 100644
--- a/versions/t-/tensorflow.json
+++ b/versions/t-/tensorflow.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b12af58d1b9069b6ab8b2de9e1c6c7f2b07aadfe",
+      "version-semver": "2.7.0",
+      "port-version": 0
+    },
     {
       "git-tree": "8692b5026a3b7666e73dcaf7432e525dc103f8c5",
       "version-semver": "2.6.0",

From 38f7c8e7042660bd1a6b6a05142b92ae15be411c Mon Sep 17 00:00:00 2001
From: Vitaly <v31337@gmail.com>
Date: Wed, 15 Dec 2021 21:58:34 +0300
Subject: [PATCH 19/48] [hiredis] Fix static build (#22038)

* [hiredis] Fix static build

* Update version database
---
 ports/hiredis/portfile.cmake                                 | 4 ++--
 .../{support-static-in-win.patch => support-static.patch}    | 0
 ports/hiredis/vcpkg.json                                     | 2 +-
 versions/baseline.json                                       | 2 +-
 versions/h-/hiredis.json                                     | 5 +++++
 5 files changed, 9 insertions(+), 4 deletions(-)
 rename ports/hiredis/{support-static-in-win.patch => support-static.patch} (100%)

diff --git a/ports/hiredis/portfile.cmake b/ports/hiredis/portfile.cmake
index 7c1da46ada96d5..6e7e0937d3adac 100644
--- a/ports/hiredis/portfile.cmake
+++ b/ports/hiredis/portfile.cmake
@@ -1,5 +1,5 @@
-if (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    set(HIREDIS_PATCHES support-static-in-win.patch)
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    set(HIREDIS_PATCHES support-static.patch)
 endif()
 
 vcpkg_from_github(
diff --git a/ports/hiredis/support-static-in-win.patch b/ports/hiredis/support-static.patch
similarity index 100%
rename from ports/hiredis/support-static-in-win.patch
rename to ports/hiredis/support-static.patch
diff --git a/ports/hiredis/vcpkg.json b/ports/hiredis/vcpkg.json
index aee055198b080a..48379f488c24b6 100644
--- a/ports/hiredis/vcpkg.json
+++ b/ports/hiredis/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "hiredis",
   "version": "1.0.2",
-  "port-version": 2,
+  "port-version": 3,
   "description": "Hiredis is a minimalistic C client library for the Redis database.",
   "homepage": "https://github.com/redis/hiredis",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index fa33ab9621e33d..62dfb5d365d9a5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2698,7 +2698,7 @@
     },
     "hiredis": {
       "baseline": "1.0.2",
-      "port-version": 2
+      "port-version": 3
     },
     "hpx": {
       "baseline": "1.7.1",
diff --git a/versions/h-/hiredis.json b/versions/h-/hiredis.json
index 0821aee51a1bb4..36c7df6bef130f 100644
--- a/versions/h-/hiredis.json
+++ b/versions/h-/hiredis.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4eafe5d23a2d906153cc8821c14092f2a9d3ef8a",
+      "version": "1.0.2",
+      "port-version": 3
+    },
     {
       "git-tree": "b651b36e6488f1eaaafc33d15d73d94751919f03",
       "version": "1.0.2",

From 608d9121d9eac7ed0724616d1ec7b42269f7e060 Mon Sep 17 00:00:00 2001
From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>
Date: Thu, 16 Dec 2021 14:16:32 +0800
Subject: [PATCH 20/48] [vcpkg baseline] Fix mpg123 build failed on Linux
 (#22028)

* [baseline] Fix mpg123 build failed on Linux

* update version

* Fix misspelled "module".

* Actually fix the misspelling this time Bill.

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
---
 ports/mpg123/fix-modulejack.patch | 13 +++++++++++++
 ports/mpg123/portfile.cmake       | 10 ++++++----
 ports/mpg123/vcpkg.json           |  1 +
 versions/baseline.json            |  2 +-
 versions/m-/mpg123.json           |  5 +++++
 5 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 ports/mpg123/fix-modulejack.patch

diff --git a/ports/mpg123/fix-modulejack.patch b/ports/mpg123/fix-modulejack.patch
new file mode 100644
index 00000000000000..fd4113270990c3
--- /dev/null
+++ b/ports/mpg123/fix-modulejack.patch
@@ -0,0 +1,13 @@
+diff --git a/ports/cmake/src/CMakeLists.txt b/ports/cmake/src/CMakeLists.txt
+index 7147174..76e1743 100644
+--- a/ports/cmake/src/CMakeLists.txt
++++ b/ports/cmake/src/CMakeLists.txt
+@@ -238,7 +238,7 @@ if(BUILD_LIBOUT123)
+             endif()
+         endif()
+ 
+-        if(NOT CHECK_MODULES OR NOT JACK_REQUIRED EQUAL -1)
++        if(0)
+             pkg_search_module(JACK jack)
+             if(JACK_FOUND)
+                 list(APPEND OUTPUT_MODULES jack)
diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake
index 6af3d50f0436d4..ceca50482f06d1 100644
--- a/ports/mpg123/portfile.cmake
+++ b/ports/mpg123/portfile.cmake
@@ -7,14 +7,16 @@ vcpkg_from_sourceforge(
     REF ${MPG123_VERSION}
     FILENAME "mpg123-${MPG123_VERSION}.tar.bz2"
     SHA512 ${MPG123_HASH}
-    PATCHES no-executables.patch
+    PATCHES
+        no-executables.patch
+        fix-modulejack.patch
 )
 
-include(${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake)
+include("${CURRENT_INSTALLED_DIR}/share/yasm-tool-helper/yasm-tool-helper.cmake")
 yasm_tool_helper(APPEND_TO_PATH)
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/ports/cmake
+    SOURCE_PATH "${SOURCE_PATH}/ports/cmake"
     OPTIONS -DUSE_MODULES=OFF
 )
 vcpkg_cmake_install()
@@ -24,4 +26,4 @@ vcpkg_fixup_pkgconfig()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/mpg123/vcpkg.json b/ports/mpg123/vcpkg.json
index e293e914496ba4..dba644357495be 100644
--- a/ports/mpg123/vcpkg.json
+++ b/ports/mpg123/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "mpg123",
   "version": "1.29.2",
+  "port-version": 1,
   "description": "mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).",
   "homepage": "https://sourceforge.net/projects/mpg123/",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 62dfb5d365d9a5..0b0177dfa2c2b1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4518,7 +4518,7 @@
     },
     "mpg123": {
       "baseline": "1.29.2",
-      "port-version": 0
+      "port-version": 1
     },
     "mpi": {
       "baseline": "1",
diff --git a/versions/m-/mpg123.json b/versions/m-/mpg123.json
index e87a5956cd99d4..8e7e9b411e140c 100644
--- a/versions/m-/mpg123.json
+++ b/versions/m-/mpg123.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "d7d73f2de9ed526b2cc13e39a4bdc100fcd6ab4e",
+      "version": "1.29.2",
+      "port-version": 1
+    },
     {
       "git-tree": "a0b39904e9eec57506653dc7252ea7e808914b8c",
       "version": "1.29.2",

From 83c0859751b2d2a2b06225321237f8730564b90a Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Thu, 16 Dec 2021 18:00:16 +0100
Subject: [PATCH 21/48] [qt5-base] no _debug lib suffixes on macOS (#14225)
 (#21695)

* [qt5-base] no _debug lib suffixes on macOS (#14225)

* [qt5-base] patch qt5-base to remove _debug postfix on osx

* Apply suggestions from code review

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>

* [qt5-base] create link to _debug.pc file from .pc file without _debug

* update version

* [qt5-base] create forward pkgconfig file

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
---
 ports/qt5-base/portfile.cmake | 10 ++++++++++
 ports/qt5-base/vcpkg.json     |  2 +-
 versions/baseline.json        |  2 +-
 versions/q-/qt5-base.json     |  5 +++++
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
index 1dacc980faef83..dac4d876ba9a36 100644
--- a/ports/qt5-base/portfile.cmake
+++ b/ports/qt5-base/portfile.cmake
@@ -506,6 +506,16 @@ endif()
 
 vcpkg_fixup_pkgconfig()
 
+if(VCPKG_TARGET_IS_OSX)
+    file(GLOB _debug_files "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/*_debug.pc")
+    foreach(_file ${_debug_files})
+        string(REGEX REPLACE "_debug\\.pc$" ".pc" _new_filename "${_file}")
+        string(REGEX MATCH "(Qt5[a-zA-Z]+)_debug\\.pc$" _not_used "${_file}")
+        set(_name ${CMAKE_MATCH_1})
+        file(STRINGS "${_file}" _version REGEX "^(Version):.+$")
+        file(WRITE "${_new_filename}" "Name: ${_name}\nDescription: Forwarding to the _debug version by vcpkg\n${_version}\nRequires: ${_name}_debug\n")
+    endforeach()
+endif()
 # #Code to get generated CMake files from CI
 # file(RENAME "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Core/Qt5CoreConfig.cmake" "${CURRENT_BUILDTREES_DIR}/Qt5CoreConfig.cmake.log")
 # file(GLOB_RECURSE CMAKE_GUI_FILES "${CURRENT_PACKAGES_DIR}/share/cmake/Qt5Gui/*.cmake" )
diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json
index 8a05321bcf8646..072ee42b04cd3b 100644
--- a/ports/qt5-base/vcpkg.json
+++ b/ports/qt5-base/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "qt5-base",
   "version-semver": "5.15.2",
-  "port-version": 18,
+  "port-version": 19,
   "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 0b0177dfa2c2b1..e19838d1cc3c20 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5534,7 +5534,7 @@
     },
     "qt5-base": {
       "baseline": "5.15.2",
-      "port-version": 18
+      "port-version": 19
     },
     "qt5-canvas3d": {
       "baseline": "0",
diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json
index 75a6d40b973b85..829c9e123fead5 100644
--- a/versions/q-/qt5-base.json
+++ b/versions/q-/qt5-base.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5a9c2b85fd5f62bb1b52f18c4628b0e08d765dd4",
+      "version-semver": "5.15.2",
+      "port-version": 19
+    },
     {
       "git-tree": "5793fff5370499ba464430142f86b971a23dff25",
       "version-semver": "5.15.2",

From f8992fb4e1a0a6b0cc815801ab2bbb67c7ea4267 Mon Sep 17 00:00:00 2001
From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Date: Fri, 17 Dec 2021 14:20:11 +0800
Subject: [PATCH 22/48] [python3] Support arm (#21528)

* [python3] Support arm on non Windows

* Support arm on all platform, add host dependency

* version

* [pybind11] Add supports

* version

Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
---
 ports/pybind11/vcpkg.json    | 2 ++
 ports/python3/portfile.cmake | 3 ++-
 ports/python3/vcpkg.json     | 8 ++++++--
 versions/baseline.json       | 4 ++--
 versions/p-/pybind11.json    | 5 +++++
 versions/p-/python3.json     | 5 +++++
 6 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/ports/pybind11/vcpkg.json b/ports/pybind11/vcpkg.json
index 3c6faa3c719f77..e8dbe72752eac3 100644
--- a/ports/pybind11/vcpkg.json
+++ b/ports/pybind11/vcpkg.json
@@ -1,8 +1,10 @@
 {
   "name": "pybind11",
   "version-semver": "2.8.1",
+  "port-version": 1,
   "description": "pybind11 is a lightweight header-only library that exposes C++ types in Python and vice versa, mainly to create Python bindings of existing C++ code",
   "homepage": "https://github.com/pybind/pybind11",
+  "supports": "!(arm & windows)",
   "dependencies": [
     "python3",
     {
diff --git a/ports/python3/portfile.cmake b/ports/python3/portfile.cmake
index 758cb31720ff1f..77f8a82a8380bd 100644
--- a/ports/python3/portfile.cmake
+++ b/ports/python3/portfile.cmake
@@ -149,7 +149,8 @@ if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
     file(GLOB PYTHON_INSTALLERS "${CURRENT_PACKAGES_DIR}/tools/${PORT}/wininst-*.exe")
     file(REMOVE ${PYTHON_LIBS} ${PYTHON_INSTALLERS})
 
-    if(PYTHON_ALLOW_EXTENSIONS)
+    # The generated python executable must match the host arch
+    if(PYTHON_ALLOW_EXTENSIONS AND NOT VCPKG_CROSSCOMPILING)
         message(STATUS "Bootstrapping pip")
         vcpkg_execute_required_process(COMMAND python -m ensurepip
             WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}"
diff --git a/ports/python3/vcpkg.json b/ports/python3/vcpkg.json
index 2364e9fbc413f7..1d1b70a8e92908 100644
--- a/ports/python3/vcpkg.json
+++ b/ports/python3/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "python3",
   "version-semver": "3.10.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "The Python programming language",
   "homepage": "https://github.com/python/cpython",
-  "supports": "!(arm | uwp)",
+  "supports": "!uwp",
   "dependencies": [
     {
       "name": "bzip2",
@@ -31,6 +31,10 @@
       "name": "openssl",
       "platform": "!(windows & static)"
     },
+    {
+      "name": "python3",
+      "host": true
+    },
     {
       "name": "sqlite3",
       "platform": "!(windows & static)"
diff --git a/versions/baseline.json b/versions/baseline.json
index e19838d1cc3c20..52cdd299647448 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5466,7 +5466,7 @@
     },
     "pybind11": {
       "baseline": "2.8.1",
-      "port-version": 0
+      "port-version": 1
     },
     "pystring": {
       "baseline": "1.1.3",
@@ -5478,7 +5478,7 @@
     },
     "python3": {
       "baseline": "3.10.1",
-      "port-version": 1
+      "port-version": 2
     },
     "qca": {
       "baseline": "2.3.4",
diff --git a/versions/p-/pybind11.json b/versions/p-/pybind11.json
index ee5ae11d7d9bb9..83ddc0af648d03 100644
--- a/versions/p-/pybind11.json
+++ b/versions/p-/pybind11.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "16618fe9543461ee68ba815f511afacbbcfd8330",
+      "version-semver": "2.8.1",
+      "port-version": 1
+    },
     {
       "git-tree": "893da2421e31681611515d8416a8f1a3b4496b5e",
       "version-semver": "2.8.1",
diff --git a/versions/p-/python3.json b/versions/p-/python3.json
index 517b8343bb1b78..6d83a288327110 100644
--- a/versions/p-/python3.json
+++ b/versions/p-/python3.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "198663bdc6b156d4423eb6ebf085c803f83babf8",
+      "version-semver": "3.10.1",
+      "port-version": 2
+    },
     {
       "git-tree": "5fe3685d04e62103465074dbe416e3158a6017a8",
       "version-semver": "3.10.1",

From b84c9fc0bd063496190f6c6953abea2e5abfaa35 Mon Sep 17 00:00:00 2001
From: Frank <65999885+FrankXie05@users.noreply.github.com>
Date: Thu, 16 Dec 2021 22:45:03 -0800
Subject: [PATCH 23/48] [openmvg] update to 2.0 (#22020)

* [openmvg] update to 2.0

* update version

* update patch

* update version
---
 ports/openmvg/0001-eigen_3.4.0.patch |  32 ++---
 ports/openmvg/build_fixes.patch      | 184 ++++++++++++---------------
 ports/openmvg/portfile.cmake         |  63 ++++-----
 ports/openmvg/vcpkg.json             |  11 +-
 versions/baseline.json               |   4 +-
 versions/o-/openmvg.json             |   5 +
 6 files changed, 132 insertions(+), 167 deletions(-)

diff --git a/ports/openmvg/0001-eigen_3.4.0.patch b/ports/openmvg/0001-eigen_3.4.0.patch
index be81355dd4e5c1..a4e759f52ebb36 100644
--- a/ports/openmvg/0001-eigen_3.4.0.patch
+++ b/ports/openmvg/0001-eigen_3.4.0.patch
@@ -1,25 +1,13 @@
-From 7be28dca0403660e721d66de954f27b92897163e Mon Sep 17 00:00:00 2001
-From: Alberto Luaces <aluaces@udc.es>
-Date: Wed, 8 Sep 2021 18:00:53 +0200
-Subject: [PATCH] eigen_3.4.0
-
----
- src/openMVG/multiview/solver_fundamental_kernel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 diff --git a/src/openMVG/multiview/solver_fundamental_kernel.cpp b/src/openMVG/multiview/solver_fundamental_kernel.cpp
-index 5e0c12eb..fa025198 100644
+index 2ffd45a..bbf74b4 100644
 --- a/src/openMVG/multiview/solver_fundamental_kernel.cpp
 +++ b/src/openMVG/multiview/solver_fundamental_kernel.cpp
-@@ -134,7 +134,7 @@ void EightPointSolver::Solve
-     MatX9 epipolar_constraint(x1.cols(), 9);
-     epipolar_constraint.fill(0.0);
-     EncodeEpipolarEquation(x1, x2, &epipolar_constraint);
--    Eigen::SelfAdjointEigenSolver<MatX9> solver
-+    Eigen::SelfAdjointEigenSolver<Eigen::Matrix<double, 9, 9>> solver
-       (epipolar_constraint.transpose() * epipolar_constraint);
-     f = solver.eigenvectors().leftCols<1>();
-   }
--- 
-2.30.2
-
+@@ -110,7 +110,7 @@ void EightPointSolver::Solve
+                          x2.colwise().homogeneous(),
+                          &epipolar_constraint);
+   // Find the F matrice in the nullspace of epipolar_constraint.
+-  Eigen::SelfAdjointEigenSolver<Mat9> solver
++  Eigen::SelfAdjointEigenSolver<Eigen::Matrix<double, 9, 9>> solver
+     (epipolar_constraint.transpose() * epipolar_constraint);
+   f = solver.eigenvectors().leftCols<1>();
+ 
diff --git a/ports/openmvg/build_fixes.patch b/ports/openmvg/build_fixes.patch
index 3b2b199b4b29ae..fecc458bdddf53 100644
--- a/ports/openmvg/build_fixes.patch
+++ b/ports/openmvg/build_fixes.patch
@@ -1,8 +1,8 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 9cfd06c..8859469 100644
+index 5d909ec..ab7eb6f 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -14,6 +14,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
+@@ -20,6 +20,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
    message(FATAL_ERROR "In-source builds not allowed.")
  endif()
  
@@ -10,16 +10,15 @@ index 9cfd06c..8859469 100644
  # ==============================================================================
  # OpenMVG build options
  # ==============================================================================
-@@ -31,7 +32,7 @@ option(OpenMVG_USE_OPENMP "Enable OpenMP parallelization" ON)
+@@ -37,6 +38,7 @@ option(OpenMVG_USE_OPENMP "Enable OpenMP parallelization" ON)
  #  and openMVG simultaneously
  # ==============================================================================
  option(OpenMVG_USE_OPENCV "Build or not opencv+openMVG samples programs" OFF)
--
 +endif()
+ 
  # ==============================================================================
  # Since OpenCV 3, SIFT is no longer in the default modules. See
- # https://github.com/itseez/opencv_contrib for more informations.
-@@ -85,6 +86,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+@@ -95,6 +97,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
    register_definitions(-DOPENMVG_STD_UNORDERED_MAP)
  endif()
  
@@ -27,7 +26,7 @@ index 9cfd06c..8859469 100644
  # ==============================================================================
  # Check that submodule have been initialized and updated
  # ==============================================================================
-@@ -93,6 +95,7 @@ if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include)
+@@ -103,6 +106,7 @@ if (NOT EXISTS ${PROJECT_SOURCE_DIR}/dependencies/cereal/include)
      "\n submodule(s) are missing, please update your repository:\n"
      "  > git submodule update -i\n")
  endif()
@@ -35,7 +34,7 @@ index 9cfd06c..8859469 100644
  
  # ==============================================================================
  # Additional cmake find modules
-@@ -128,7 +131,6 @@ if (OpenMVG_USE_OPENMP)
+@@ -138,7 +142,6 @@ if (OpenMVG_USE_OPENMP)
    find_package(OpenMP)
    if (OPENMP_FOUND)
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
@@ -43,7 +42,7 @@ index 9cfd06c..8859469 100644
      register_definitions(-DOPENMVG_USE_OPENMP)
      if (NOT MSVC)
        if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-@@ -139,11 +141,6 @@ if (OpenMVG_USE_OPENMP)
+@@ -149,11 +152,6 @@ if (OpenMVG_USE_OPENMP)
        endif()
      endif (NOT MSVC)
    endif (OPENMP_FOUND)
@@ -55,22 +54,21 @@ index 9cfd06c..8859469 100644
  endif (OpenMVG_USE_OPENMP)
  
  # ==============================================================================
-@@ -160,10 +157,10 @@ endif()
+@@ -170,9 +168,10 @@ endif()
  # ==============================================================================
  # IMAGE IO detection
  # ==============================================================================
 -find_package(JPEG QUIET)
 -find_package(PNG QUIET)
 -find_package(TIFF QUIET)
--
 +find_package(JPEG REQUIRED)
 +find_package(PNG REQUIRED)
 +find_package(TIFF REQUIRED)
 +find_package(vlfeat REQUIRED)
+ 
  # Folders
  set_property(GLOBAL PROPERTY USE_FOLDERS ON)
- 
-@@ -182,6 +179,7 @@ if (OpenMVG_BUILD_OPENGL_EXAMPLES)
+@@ -192,6 +191,7 @@ if (OpenMVG_BUILD_OPENGL_EXAMPLES)
    set_property(TARGET glfw PROPERTY FOLDER OpenMVG/3rdParty/glfw)
  endif (OpenMVG_BUILD_OPENGL_EXAMPLES)
  
@@ -78,16 +76,15 @@ index 9cfd06c..8859469 100644
  # Dependencies install rules
  install(
    DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/
-@@ -189,7 +187,7 @@ install(
+@@ -199,6 +199,7 @@ install(
    COMPONENT headers
    FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h"
  )
--
 +endif()
+ 
  # ==============================================================================
  # --END-- SUBMODULE CONFIGURATION
- # ==============================================================================
-@@ -225,6 +223,7 @@ ENDMACRO(UNIT_TEST)
+@@ -235,6 +236,7 @@ ENDMACRO(UNIT_TEST)
  # - external by default
  # - internal if cereal not found
  # ==============================================================================
@@ -95,18 +92,19 @@ index 9cfd06c..8859469 100644
  find_package(cereal QUIET CONFIG)
  if (NOT TARGET cereal)
    add_library(cereal INTERFACE)
-@@ -237,6 +236,10 @@ if (NOT TARGET cereal)
+@@ -247,7 +249,11 @@ if (NOT TARGET cereal)
  
    set(OpenMVG_USE_INTERNAL_CEREAL ON)
  endif()
 +endif()
-+
+ 
 +find_package(cereal REQUIRED CONFIG)
 +get_target_property(CEREAL_INCLUDE_DIRS cereal INTERFACE_INCLUDE_DIRECTORIES)
- 
++ 
  # ==============================================================================
  # Eigen
-@@ -245,6 +248,7 @@ endif()
+ # ==============================================================================
+@@ -255,6 +261,7 @@ endif()
  # - external if EIGEN_INCLUDE_DIR_HINTS is defined
  # - internal if Eigen not found
  # ==============================================================================
@@ -114,17 +112,18 @@ index 9cfd06c..8859469 100644
  find_package(Eigen3 QUIET)
  if (NOT Eigen3_FOUND)
    set(EIGEN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/eigen)
-@@ -253,13 +257,17 @@ if (NOT Eigen3_FOUND)
+@@ -263,6 +270,10 @@ if (NOT Eigen3_FOUND)
  else()
    set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
  endif()
 +endif()
- 
++ 
 +find_package(Eigen3 REQUIRED)
 +set(EIGEN_INCLUDE_DIRS ${EIGEN3_INCLUDE_DIR})
+ 
  # ==============================================================================
  # Ceres
- # ==============================================================================
+@@ -270,6 +281,7 @@ endif()
  # - external by default if CERES_DIR_HINTS or find_package found a valid Ceres
  # - internal if ceres not found (ceres-solver+cxsparse+miniglog)
  # ==============================================================================
@@ -132,16 +131,17 @@ index 9cfd06c..8859469 100644
  find_package(Ceres QUIET HINTS ${CERES_DIR_HINTS})
  if (NOT Ceres_FOUND)
    set(OpenMVG_USE_INTERNAL_CERES ON)
-@@ -271,13 +279,16 @@ if (NOT Ceres_FOUND)
+@@ -281,6 +293,9 @@ if (NOT Ceres_FOUND)
      STRING(REGEX REPLACE "version ([0-9.]+).*" "\\1" CERES_VERSION ${CERES_CONFIG})
    set(CERES_LIBRARIES openMVG_ceres)
  endif()
 +endif()
- 
++ 
 +find_package(Ceres REQUIRED)
+ 
  # ==============================================================================
  # Flann
- # ==============================================================================
+@@ -288,6 +303,7 @@ endif()
  # - internal by default (flann),
  # - external if FLANN_INCLUDE_DIR_HINTS and a valid Flann setup is found
  # ==============================================================================
@@ -149,16 +149,17 @@ index 9cfd06c..8859469 100644
  if (NOT DEFINED FLANN_INCLUDE_DIR_HINTS)
    set(FLANN_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp)
    set(OpenMVG_USE_INTERNAL_FLANN ON)
-@@ -286,13 +297,16 @@ find_package(Flann QUIET)
+@@ -296,6 +312,9 @@ find_package(Flann QUIET)
  if (NOT FLANN_FOUND OR OpenMVG_USE_INTERNAL_FLANN)
    set(FLANN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/flann/src/cpp)
  endif()
 +endif()
- 
++ 
 +find_package(flann REQUIRED)
+ 
  # ==============================================================================
  # CoinUtils
- # ==============================================================================
+@@ -303,6 +322,7 @@ endif()
  # - internal by default (CoinUtils),
  # - external if COINUTILS_INCLUDE_DIR_HINTS and a valid CoinUtils setup is found
  # ==============================================================================
@@ -166,16 +167,17 @@ index 9cfd06c..8859469 100644
  if (NOT DEFINED COINUTILS_INCLUDE_DIR_HINTS)
    set(COINUTILS_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/CoinUtils/src/)
    set(OpenMVG_USE_INTERNAL_COINUTILS ON)
-@@ -302,13 +316,16 @@ if (NOT DEFINED COINUTILS_INCLUDE_DIR_HINTS)
+@@ -312,6 +332,9 @@ if (NOT DEFINED COINUTILS_INCLUDE_DIR_HINTS)
  else()
    find_package(CoinUtils QUIET)
  endif()
 +endif()
- 
++ 
 +find_package(CoinUtils REQUIRED)
+ 
  ## ==============================================================================
  ## Clp
- ## ==============================================================================
+@@ -319,6 +342,7 @@ endif()
  ## - internal by default (Clp),
  ## - external if CLP_INCLUDE_DIR_HINTS and a valid Clp setup is found
  ## ==============================================================================
@@ -183,17 +185,17 @@ index 9cfd06c..8859469 100644
  if (NOT DEFINED CLP_INCLUDE_DIR_HINTS)
    set(CLP_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Clp/src/)
    set(OpenMVG_USE_INTERNAL_CLP ON)
-@@ -320,6 +337,9 @@ if (NOT DEFINED CLP_INCLUDE_DIR_HINTS)
+@@ -330,13 +354,17 @@ if (NOT DEFINED CLP_INCLUDE_DIR_HINTS)
  else()
    find_package(Clp QUIET)
  endif()
 +endif()
-+
-+find_package(Clp REQUIRED)
  
++find_package(Clp REQUIRED)
++ 
  # ==============================================================================
  # Osi
-@@ -327,6 +347,7 @@ endif()
+ # ==============================================================================
  # - internal by default (Osi),
  # - external if OSI_INCLUDE_DIR_HINTS and a valid Osi setup is found
  # ==============================================================================
@@ -201,7 +203,7 @@ index 9cfd06c..8859469 100644
  if (NOT DEFINED OSI_INCLUDE_DIR_HINTS)
    set(OSI_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/dependencies/osi_clp/Osi/src/)
    set(OpenMVG_USE_INTERNAL_OSI ON)
-@@ -336,6 +357,9 @@ if (NOT DEFINED OSI_INCLUDE_DIR_HINTS)
+@@ -346,6 +374,9 @@ if (NOT DEFINED OSI_INCLUDE_DIR_HINTS)
  else()
    find_package(Osi QUIET)
  endif()
@@ -211,7 +213,7 @@ index 9cfd06c..8859469 100644
  
  # ==============================================================================
  # Internal CLP/OSI/COINUTILS libraries:
-@@ -354,6 +378,7 @@ endif()
+@@ -364,6 +395,7 @@ endif()
  # - internal by default (Lemon),
  # - external if LEMON_INCLUDE_DIR_HINTS and a valid Lemon setup is found
  # ==============================================================================
@@ -219,9 +221,9 @@ index 9cfd06c..8859469 100644
  if (NOT DEFINED LEMON_INCLUDE_DIR_HINTS)
    set(LEMON_INCLUDE_DIR_HINTS ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon)
    set(OpenMVG_USE_INTERNAL_LEMON ON)
-@@ -365,6 +390,9 @@ if (NOT LEMON_FOUND OR OpenMVG_USE_INTERNAL_LEMON)
+@@ -374,6 +406,9 @@ if (NOT LEMON_FOUND OR OpenMVG_USE_INTERNAL_LEMON)
+     ${CMAKE_CURRENT_SOURCE_DIR}/third_party/lemon
      ${PROJECT_BINARY_DIR}/third_party/lemon)
-   set(LEMON_LIBRARY openMVG_lemon)
  endif()
 +endif()
 +
@@ -229,7 +231,7 @@ index 9cfd06c..8859469 100644
  
  # ==============================================================================
  # OpenCV
-@@ -372,20 +400,13 @@ endif()
+@@ -381,12 +416,7 @@ endif()
  # - only external and enabled only if OpenMVG_USE_OPENCV is set to ON
  # ==============================================================================
  if (OpenMVG_USE_OPENCV)
@@ -239,11 +241,11 @@ index 9cfd06c..8859469 100644
 -    UPDATE_CACHE_VARIABLE(OpenMVG_USE_OPENCV OFF)
 -    UPDATE_CACHE_VARIABLE(OpenMVG_USE_OCVSIFT OFF)
 -  endif()
-+  find_package( OpenCV REQUIRED )
++    find_package( OpenCV REQUIRED )
  endif()
  
--
- # ==============================================================================
+ 
+@@ -394,7 +424,6 @@ endif()
  # Third-party libraries:
  # ==============================================================================
  add_subdirectory(third_party)
@@ -251,7 +253,7 @@ index 9cfd06c..8859469 100644
  
  # ==============================================================================
  # openMVG modules
-@@ -472,67 +493,67 @@ message("** Use OpenCV SIFT features: " ${OpenMVG_USE_OCVSIFT})
+@@ -481,67 +510,67 @@ message("** Use OpenCV SIFT features: " ${OpenMVG_USE_OCVSIFT})
  
  message("\n")
  
@@ -331,23 +333,22 @@ index 9cfd06c..8859469 100644
  else()
    message(STATUS "LEMON: " ${LEMON_VERSION} " (external)")
 diff --git a/src/cmakeFindModules/FindClp.cmake b/src/cmakeFindModules/FindClp.cmake
-index 8a69c23..6a81580 100644
+index 8a69c23..6ebc661 100644
 --- a/src/cmakeFindModules/FindClp.cmake
 +++ b/src/cmakeFindModules/FindClp.cmake
-@@ -51,9 +51,8 @@ IF(EXISTS "${CLP_DIR}" AND NOT "${CLP_DIR}" STREQUAL "")
+@@ -50,8 +50,8 @@ IF(EXISTS "${CLP_DIR}" AND NOT "${CLP_DIR}" STREQUAL "")
+         ENDIF (NOT EXISTS ${CLP_VERSION_FILE})
          SET(CLP_INCLUDE_DIR ${CLP_DIR})
  
-         FIND_LIBRARY(CLP_LIBRARY NAMES Clp)
+-        FIND_LIBRARY(CLP_LIBRARY NAMES Clp)
 -        FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver)
--        FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp)
--
 +        FIND_LIBRARY(CLPSOLVER_LIBRARY NAMES ClpSolver Clp)
 +        FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp Clp)
+         FIND_LIBRARY(OSICLP_LIBRARY NAMES OsiClp)
+ 
          # locate Clp libraries
-         IF(DEFINED CLP_LIBRARY AND DEFINED CLPSOLVER_LIBRARY AND DEFINED OSICLP_LIBRARY)
-           SET(CLP_LIBRARIES ${CLP_LIBRARY} ${CLPSOLVER_LIBRARY} ${OSICLP_LIBRARY})
 diff --git a/src/cmakeFindModules/OpenMVGConfig.cmake.in b/src/cmakeFindModules/OpenMVGConfig.cmake.in
-index e7dfbfd..c01910d 100644
+index e7dfbfd..65224c4 100644
 --- a/src/cmakeFindModules/OpenMVGConfig.cmake.in
 +++ b/src/cmakeFindModules/OpenMVGConfig.cmake.in
 @@ -19,7 +19,7 @@
@@ -359,11 +360,12 @@ index e7dfbfd..c01910d 100644
  # unsets all public (designed to be used externally) variables and reports
  # error message at priority depending upon [REQUIRED/QUIET/<NONE>] argument.
  macro(OPENMVG_REPORT_NOT_FOUND REASON_MSG)
-@@ -59,9 +59,19 @@ set(CALLERS_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
+@@ -58,10 +58,20 @@ set(CALLERS_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
+ # Reset CMake module path to the installation directory of this
  # script.
  set(CMAKE_MODULE_PATH ${CURRENT_CONFIG_INSTALL_DIR})
- 
 +include(CMakeFindDependencyMacro)
++
 +find_dependency(CoinUtils)
 +find_dependency(Clp)
 +find_dependency(Osi)
@@ -372,7 +374,7 @@ index e7dfbfd..c01910d 100644
 +find_dependency(cereal)
 +find_dependency(Ceres)
 +find_dependency(vlfeat)
-+
+ 
  # Build the absolute root install directory as a relative path
  get_filename_component(CURRENT_ROOT_INSTALL_DIR
 -  ${CMAKE_MODULE_PATH}/../../../ ABSOLUTE)
@@ -500,10 +502,10 @@ index cc5212f..acc57dd 100644
      $<INSTALL_INTERFACE:include>
  )
 diff --git a/src/openMVG/matching/CMakeLists.txt b/src/openMVG/matching/CMakeLists.txt
-index 5fcd972..b21ea7b 100644
+index 2e0eafd..be0006f 100644
 --- a/src/openMVG/matching/CMakeLists.txt
 +++ b/src/openMVG/matching/CMakeLists.txt
-@@ -18,6 +18,7 @@ list(REMOVE_ITEM matching_files_cpp ${REMOVEFILESUNITTEST})
+@@ -16,6 +16,7 @@ list(REMOVE_ITEM matching_files_cpp ${REMOVEFILESUNITTEST})
  
  set(THREADS_PREFER_PTHREAD_FLAG ON)
  find_package(Threads REQUIRED)
@@ -511,7 +513,7 @@ index 5fcd972..b21ea7b 100644
  
  set_source_files_properties(${matching_files_cpp} PROPERTIES LANGUAGE CXX)
  add_library(openMVG_matching
-@@ -39,10 +40,10 @@ target_link_libraries(openMVG_matching
+@@ -37,10 +38,10 @@ target_link_libraries(openMVG_matching
      Threads::Threads
      cereal
  )
@@ -538,18 +540,19 @@ index 1f3fc30..4097320 100644
      $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/eigen/>)
  else()
 diff --git a/src/openMVG_Samples/describe_and_match_GUI/CMakeLists.txt b/src/openMVG_Samples/describe_and_match_GUI/CMakeLists.txt
-index 862ffc7..326fc9a 100644
+index 862ffc7..62508af 100644
 --- a/src/openMVG_Samples/describe_and_match_GUI/CMakeLists.txt
 +++ b/src/openMVG_Samples/describe_and_match_GUI/CMakeLists.txt
-@@ -18,7 +18,7 @@ if (OpenMVG_BUILD_GUI_SOFTWARES)
+@@ -18,8 +18,7 @@ if (OpenMVG_BUILD_GUI_SOFTWARES)
        add_executable( openMVG_sample_describe_and_match_GUI WIN32 ${FEATURES_PAIR_DEMO_SRCS} ${FEATURES_PAIR_DEMO_HDRS} )
      endif( APPLE )
  
 -    target_link_libraries( openMVG_sample_describe_and_match_GUI Qt5::Widgets openMVG_features openMVG_image openMVG_matching vlsift )
+-
 +    target_link_libraries( openMVG_sample_describe_and_match_GUI Qt5::Widgets openMVG_features openMVG_image openMVG_matching unofficial::vlfeat::vl )
- 
      set_target_properties( openMVG_sample_describe_and_match_GUI PROPERTIES CXX_STANDARD 11)
  
+     set_property(TARGET openMVG_sample_describe_and_match_GUI PROPERTY FOLDER OpenMVG/Samples)
 diff --git a/src/openMVG_Samples/features_image_matching/CMakeLists.txt b/src/openMVG_Samples/features_image_matching/CMakeLists.txt
 index 18fb385..d44ffce 100644
 --- a/src/openMVG_Samples/features_image_matching/CMakeLists.txt
@@ -590,7 +593,7 @@ index 2f60393..0d57d0a 100644
  
  # Installation rules
 diff --git a/src/software/SfM/CMakeLists.txt b/src/software/SfM/CMakeLists.txt
-index 013a6c8..f38daa9 100644
+index 6db7e83..51e06f5 100644
 --- a/src/software/SfM/CMakeLists.txt
 +++ b/src/software/SfM/CMakeLists.txt
 @@ -44,7 +44,7 @@ target_link_libraries(openMVG_main_ComputeFeatures
@@ -602,7 +605,7 @@ index 013a6c8..f38daa9 100644
  )
  if (MSVC)
    set_target_properties(openMVG_main_ComputeFeatures PROPERTIES COMPILE_FLAGS "/bigobj")
-@@ -235,7 +235,7 @@ if(OpenMVG_USE_OPENCV)
+@@ -275,7 +275,7 @@ if(OpenMVG_USE_OPENCV)
      openMVG_multiview
      openMVG_sfm
      ${STLPLUS_LIBRARY}
@@ -612,7 +615,7 @@ index 013a6c8..f38daa9 100644
    target_include_directories(openMVG_main_ComputeFeatures_OpenCV PRIVATE ${OpenCV_INCLUDE_DIRS})
  
 diff --git a/src/software/SfM/SfM_GlobalPipeline.py.in b/src/software/SfM/SfM_GlobalPipeline.py.in
-index 42405a4..28b0246 100644
+index 42b41cc..7fda0cd 100644
 --- a/src/software/SfM/SfM_GlobalPipeline.py.in
 +++ b/src/software/SfM/SfM_GlobalPipeline.py.in
 @@ -21,7 +21,7 @@
@@ -624,14 +627,8 @@ index 42405a4..28b0246 100644
  
  import os
  import subprocess
-@@ -77,5 +77,3 @@ pRecons.wait()
- 
- pRecons = subprocess.Popen( [os.path.join(OPENMVG_SFM_BIN, "openMVG_main_ComputeSfM_DataColor"),  "-i", reconstruction_dir+"/robust.bin", "-o", os.path.join(reconstruction_dir,"robust_colorized.ply")] )
- pRecons.wait()
--
--
 diff --git a/src/software/SfM/SfM_SequentialPipeline.py.in b/src/software/SfM/SfM_SequentialPipeline.py.in
-index 9a5a482..e804a19 100644
+index 423c85c..0ff2e77 100644
 --- a/src/software/SfM/SfM_SequentialPipeline.py.in
 +++ b/src/software/SfM/SfM_SequentialPipeline.py.in
 @@ -21,7 +21,7 @@
@@ -643,27 +640,8 @@ index 9a5a482..e804a19 100644
  
  import os
  import subprocess
-@@ -77,5 +77,3 @@ pRecons.wait()
- 
- pRecons = subprocess.Popen( [os.path.join(OPENMVG_SFM_BIN, "openMVG_main_ComputeSfM_DataColor"),  "-i", reconstruction_dir+"/robust.bin", "-o", os.path.join(reconstruction_dir,"robust_colorized.ply")] )
- pRecons.wait()
--
--
-diff --git a/src/software/SfM/main_ComputeFeatures_OpenCV.cpp b/src/software/SfM/main_ComputeFeatures_OpenCV.cpp
-index 9cc46af..f8bd892 100644
---- a/src/software/SfM/main_ComputeFeatures_OpenCV.cpp
-+++ b/src/software/SfM/main_ComputeFeatures_OpenCV.cpp
-@@ -208,7 +208,7 @@ public:
-     // Create a SIFT detector
-     std::vector< cv::KeyPoint > v_keypoints;
-     cv::Mat m_desc;
--    cv::Ptr<cv::Feature2D> siftdetector = cv::xfeatures2d::SIFT::create();
-+    cv::Ptr<cv::Feature2D> siftdetector = cv::SIFT::create();
- 
-     // Process SIFT computation
-     siftdetector->detectAndCompute(img, m_mask, v_keypoints, m_desc);
 diff --git a/src/software/SfM/tutorial_demo.py.in b/src/software/SfM/tutorial_demo.py.in
-index 259e24e..1097062 100644
+index c7361f3..1c56aab 100644
 --- a/src/software/SfM/tutorial_demo.py.in
 +++ b/src/software/SfM/tutorial_demo.py.in
 @@ -12,7 +12,7 @@
@@ -675,12 +653,6 @@ index 259e24e..1097062 100644
  
  import os
  import subprocess
-@@ -89,5 +89,3 @@ pRecons.wait()
- print ("4. Structure from Known Poses (robust triangulation)")
- pRecons = subprocess.Popen( [os.path.join(OPENMVG_SFM_BIN, "openMVG_main_ComputeStructureFromKnownPoses"),  "-i", reconstruction_dir+"/sfm_data.bin", "-m", matches_dir, "-o", os.path.join(reconstruction_dir,"robust.ply")] )
- pRecons.wait()
--
--
 diff --git a/src/software/VO/Tracker_opencv_klt.hpp b/src/software/VO/Tracker_opencv_klt.hpp
 index aa7dffe..2c4d237 100644
 --- a/src/software/VO/Tracker_opencv_klt.hpp
@@ -695,7 +667,7 @@ index aa7dffe..2c4d237 100644
  
      m_detector->detect(current_img, m_nextKeypoints);
 diff --git a/src/third_party/CMakeLists.txt b/src/third_party/CMakeLists.txt
-index b71dfab..ad98e51 100644
+index 0d61c9f..05c8b29 100644
 --- a/src/third_party/CMakeLists.txt
 +++ b/src/third_party/CMakeLists.txt
 @@ -18,7 +18,7 @@ add_subdirectory(stlplus3)
@@ -705,9 +677,9 @@ index b71dfab..ad98e51 100644
 -if(DEFINED OpenMVG_USE_INTERNAL_LEMON)
 +if(OpenMVG_USE_INTERNAL_LEMON)
    add_subdirectory(lemon)
-   set_property(TARGET openMVG_lemon PROPERTY FOLDER OpenMVG/3rdParty/lemon)
-   set_property(TARGET check PROPERTY FOLDER OpenMVG/3rdParty/lemon)
-@@ -68,7 +68,7 @@ endif (NOT TIFF_FOUND)
+   set(LEMON_LIBRARY openMVG_lemon PARENT_SCOPE)
+ endif()
+@@ -67,7 +67,7 @@ endif (NOT TIFF_FOUND)
  add_subdirectory(vectorGraphics)
  
  # Add ceres-solver (A Nonlinear Least Squares Minimizer)
@@ -716,7 +688,7 @@ index b71dfab..ad98e51 100644
    add_subdirectory(cxsparse)
    add_subdirectory(ceres-solver)
    set_property(TARGET openMVG_cxsparse PROPERTY FOLDER OpenMVG/3rdParty/ceres)
-@@ -76,7 +76,7 @@ if (DEFINED OpenMVG_USE_INTERNAL_CERES)
+@@ -75,7 +75,7 @@ if (DEFINED OpenMVG_USE_INTERNAL_CERES)
  endif()
  
  # Add an Approximate Nearest Neighbor library
@@ -725,12 +697,12 @@ index b71dfab..ad98e51 100644
    set(FLANN_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/flann/src/cpp)
    add_subdirectory(flann)
  endif()
-@@ -90,7 +90,7 @@ add_subdirectory(fast)
+@@ -89,7 +89,7 @@ add_subdirectory(fast)
  ##
  # Install Header only libraries if necessary
  ##
 -if (DEFINED OpenMVG_USE_INTERNAL_EIGEN)
 +if (OpenMVG_USE_INTERNAL_EIGEN)
    #Configure Eigen install
-   set(EIGEN_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/eigen)
+   set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/openMVG/third_party/eigen)
    add_subdirectory(eigen)
diff --git a/ports/openmvg/portfile.cmake b/ports/openmvg/portfile.cmake
index bb8d115ee8f553..aacf749be34861 100644
--- a/ports/openmvg/portfile.cmake
+++ b/ports/openmvg/portfile.cmake
@@ -10,8 +10,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO openMVG/openMVG
-    REF 74deb33d12bf275a3b3a9afc833f4760be90f031 # v1.6
-    SHA512 6e74effbc66f5d5e7c2d5edd7dacf3c0fa7eec1cb666244db8e4147c08d2e6faca98c1164ca1305a5013d247d479184742e5156232d4d8430615af31811e216e
+    REF d0fe73dd426ae4001631a51272cff71047522df9  # v2.0
+    SHA512 1d5c68971ad63ced46d8b9070bdacc1065b4ba950fe919e11f952a004def87d4d83a474d48aee714c21b12106d7d81187d3670d8a2e6daf2d3c5fceb008a5de3
     PATCHES
         build_fixes.patch
         0001-eigen_3.4.0.patch
@@ -19,11 +19,7 @@ vcpkg_from_github(
 
 set(OpenMVG_USE_OPENMP OFF)
 if("openmp" IN_LIST FEATURES)
-  if(VCPKG_TARGET_IS_WINDOWS)
-    message(WARNING "OpenMP feature is broken on Windows, disabled until fixed https://github.com/openMVG/openMVG/issues/1765")
-  else()
     set(OpenMVG_USE_OPENMP ON)
-  endif()
 endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -53,9 +49,8 @@ file(REMOVE_RECURSE ${SOURCE_PATH}/src/cmakeFindModules/FindEigen.cmake
                     ${SOURCE_PATH}/src/cmakeFindModules/FindClp.cmake
                     ${SOURCE_PATH}/src/cmakeFindModules/FindOsi.cmake)
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}/src
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}/src"
     OPTIONS ${FEATURE_OPTIONS}
         -DOpenMVG_USE_OPENMP=${OpenMVG_USE_OPENMP}
         -DOpenMVG_BUILD_SHARED=OFF
@@ -74,29 +69,29 @@ vcpkg_configure_cmake(
         -DOpenMVG_USE_INTERNAL_LEMON=OFF
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/openMVG/cmake)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH share/openMVG/cmake)
 
 if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
 endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/openMVG/image/image_test
-                    ${CURRENT_PACKAGES_DIR}/include/openMVG/exif/image_data
-                    ${CURRENT_PACKAGES_DIR}/include/openMVG_dependencies/nonFree/sift/vl)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/openMVG/image/image_test"
+                    "${CURRENT_PACKAGES_DIR}/include/openMVG/exif/image_data"
+                    "${CURRENT_PACKAGES_DIR}/include/openMVG_dependencies/nonFree/sift/vl")
 
 if(OpenMVG_BUILD_SHARED)
     if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
         # release
-        file(GLOB DLL_FILES  ${CURRENT_PACKAGES_DIR}/lib/*.dll)
-        file(COPY ${DLL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-        file(REMOVE_RECURSE ${DLL_FILES})
+        file(GLOB DLL_FILES  "${CURRENT_PACKAGES_DIR}/lib/*.dll")
+        file(COPY "${DLL_FILES}" DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
+        file(REMOVE_RECURSE "${DLL_FILES}")
     endif()
     if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
         # debug
-        file(GLOB DLL_FILES  ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll)
-        file(COPY ${DLL_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-        file(REMOVE_RECURSE ${DLL_FILES})
+        file(GLOB DLL_FILES  "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll")
+        file(COPY "${DLL_FILES}" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
+        file(REMOVE_RECURSE "${DLL_FILES}")
     endif()
 endif()
 vcpkg_copy_pdbs()
@@ -107,10 +102,10 @@ if("software" IN_LIST FEATURES)
             openMVG_main_AlternativeVO.app
             ui_openMVG_MatchesViewer.app
         )
-        file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/openMVG_main_AlternativeVO.app)
-        file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/ui_openMVG_MatchesViewer.app)
-        file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/openMVG_main_AlternativeVO.app)
-        file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/ui_openMVG_MatchesViewer.app)
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/openMVG_main_AlternativeVO.app")
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/ui_openMVG_MatchesViewer.app")
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/openMVG_main_AlternativeVO.app")
+        file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/ui_openMVG_MatchesViewer.app")
     else()
         vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES
             openMVG_main_AlternativeVO
@@ -135,9 +130,6 @@ if("software" IN_LIST FEATURES)
         openMVG_main_ExportUndistortedImages
         openMVG_main_FrustumFiltering
         openMVG_main_geodesy_registration_to_gps_position
-        openMVG_main_GlobalSfM
-        openMVG_main_IncrementalSfM
-        openMVG_main_IncrementalSfM2
         openMVG_main_ListMatchingPairs
         openMVG_main_MatchesToTracks
         openMVG_main_openMVG2Agisoft
@@ -157,21 +149,22 @@ if("software" IN_LIST FEATURES)
         openMVG_main_SfM_Localization
         openMVG_main_SplitMatchFileIntoMatchFiles
         ui_openMVG_control_points_registration
+        openMVG_main_GeometricFilter
+        openMVG_main_PairGenerator
+        openMVG_main_SfM
     )
     if("opencv" IN_LIST FEATURES)
         vcpkg_copy_tools(AUTO_CLEAN TOOL_NAMES
-            openMVG_main_ComputeFeatures_OpenCV
-        )
+            openMVG_main_ComputeFeatures_OpenCV)
     endif()
 
-    file(COPY ${SOURCE_PATH}/src/openMVG/exif/sensor_width_database/sensor_width_camera_database.txt DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
-    set(OPENMVG_SOFTWARE_SFM_BUILD_DIR ${CURRENT_INSTALLED_DIR}/tools/${PORT})
-    set(OPENMVG_CAMERA_SENSOR_WIDTH_DIRECTORY ${CURRENT_INSTALLED_DIR}/tools/${PORT})
+    file(COPY "${SOURCE_PATH}/src/openMVG/exif/sensor_width_database/sensor_width_camera_database.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+    set(OPENMVG_SOFTWARE_SFM_BUILD_DIR "${CURRENT_INSTALLED_DIR}/tools/${PORT}")
+    set(OPENMVG_CAMERA_SENSOR_WIDTH_DIRECTORY "${CURRENT_INSTALLED_DIR}/tools/${PORT}")
     configure_file("${SOURCE_PATH}/src/software/SfM/tutorial_demo.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/tutorial_demo.py" @ONLY)
     configure_file("${SOURCE_PATH}/src/software/SfM/SfM_GlobalPipeline.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/SfM_GlobalPipeline.py" @ONLY)
     configure_file("${SOURCE_PATH}/src/software/SfM/SfM_SequentialPipeline.py.in" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/SfM_SequentialPipeline.py" @ONLY)
-    message(STATUS "To use tools, you need graphviz installed and manually added to path (to have neato executable)")
 endif()
 
 # Handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/openmvg/vcpkg.json b/ports/openmvg/vcpkg.json
index 42686e60a0b712..28732cc07d52fd 100644
--- a/ports/openmvg/vcpkg.json
+++ b/ports/openmvg/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "openmvg",
-  "version": "1.6",
-  "port-version": 3,
+  "version": "2.0",
   "description": "open Multiple View Geometry library. Basis for 3D computer vision and Structure from Motion.",
   "dependencies": [
     "cereal",
@@ -21,6 +20,14 @@
     "libpng",
     "osi",
     "tiff",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    },
     "vlfeat",
     "zlib"
   ],
diff --git a/versions/baseline.json b/versions/baseline.json
index 52cdd299647448..5c132d51098dc8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5001,8 +5001,8 @@
       "port-version": 3
     },
     "openmvg": {
-      "baseline": "1.6",
-      "port-version": 3
+      "baseline": "2.0",
+      "port-version": 0
     },
     "openmvs": {
       "baseline": "1.1.1",
diff --git a/versions/o-/openmvg.json b/versions/o-/openmvg.json
index 1731c064e518f9..ca980eaaa60dfb 100644
--- a/versions/o-/openmvg.json
+++ b/versions/o-/openmvg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "08113de9c7bc1b9201be4c3a01c1c3e5a1cf5acd",
+      "version": "2.0",
+      "port-version": 0
+    },
     {
       "git-tree": "6f3087d8d002d7f226e77427ce363e2b20371485",
       "version": "1.6",

From 2e46c24c9dbf0b93082da5d9cd3248922ba31f85 Mon Sep 17 00:00:00 2001
From: IronsDu <irons.du@gmail.com>
Date: Fri, 17 Dec 2021 14:45:25 +0800
Subject: [PATCH 24/48] [brynet] Update to 1.11.1 (#22021)

* brynet: upgrade to 1.11.1

* Update portfile.cmake

* Update brynet.json
---
 ports/brynet/portfile.cmake | 4 ++--
 ports/brynet/vcpkg.json     | 2 +-
 versions/b-/brynet.json     | 5 +++++
 versions/baseline.json      | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ports/brynet/portfile.cmake b/ports/brynet/portfile.cmake
index f07030c495b88b..43e28bdb7740a7 100644
--- a/ports/brynet/portfile.cmake
+++ b/ports/brynet/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO IronsDu/brynet
-    REF b33f44df85ca56ca315a560239db3a09a1aef4d7 # v1.11.0
-    SHA512 0eaa212ab75a7b51ab546dbca10357d1cbb611ccfe09e3246050518c808a65cecb1374b60e2289023462b96f8b67aa8d19010f446364fecbec64115752234e60
+    REF 1a48a74ba5c6074cf6f478d6a52e3c37ce3b9cc8 # v1.11.1
+    SHA512 5f04ee74a1ba8955ddb355286aa2bcd29d50b2a8bb7c2c3296fd000ab5e2060ceb3a5254e54e48f6c090f16883aea07178001532da39f28dcafbcf8df7a7304c 
     HEAD_REF master
 )
 
diff --git a/ports/brynet/vcpkg.json b/ports/brynet/vcpkg.json
index 79dec2c58202d2..173ca0bd92ed6f 100644
--- a/ports/brynet/vcpkg.json
+++ b/ports/brynet/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "brynet",
-  "version-string": "1.11.0",
+  "version-string": "1.11.1",
   "port-version": 1,
   "description": "A C++ header only cross platform high performance tcp network library, and support SSL/HTTP/Websocket.",
   "homepage": "https://github.com/IronsDu/brynet"
diff --git a/versions/b-/brynet.json b/versions/b-/brynet.json
index 63b0a8bf79d029..60d187b01065b7 100644
--- a/versions/b-/brynet.json
+++ b/versions/b-/brynet.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1700fdb373d8d3789f510b64aeee7d79859393f1",
+      "version-string": "1.11.1",
+      "port-version": 1
+    },
     {
       "git-tree": "f164bb20f8c10203d2ab57ecf5a28b5891c5259a",
       "version-string": "1.11.0",
diff --git a/versions/baseline.json b/versions/baseline.json
index 5c132d51098dc8..30f1df89f1dc48 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1157,7 +1157,7 @@
       "port-version": 0
     },
     "brynet": {
-      "baseline": "1.11.0",
+      "baseline": "1.11.1",
       "port-version": 1
     },
     "bshoshany-thread-pool": {

From 91d0eead53ba6f060e32ebc181a9aaf5c1963276 Mon Sep 17 00:00:00 2001
From: Josue Andrade Gomes <josuegomes@gmail.com>
Date: Fri, 17 Dec 2021 03:45:50 -0300
Subject: [PATCH 25/48] [graphicsmagick] update to version 1.3.37 (#22024)

* [graphicsmagick] update to version 1.3.37

* [graphicsmagick] manifest format

* [graphicsmagick] version database update

* [graphicsmagick] version-string -> version

* [graphicsmagick] version database update
---
 ports/graphicsmagick/portfile.cmake | 6 +++---
 ports/graphicsmagick/vcpkg.json     | 3 +--
 versions/baseline.json              | 4 ++--
 versions/g-/graphicsmagick.json     | 5 +++++
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ports/graphicsmagick/portfile.cmake b/ports/graphicsmagick/portfile.cmake
index 11b1252dc6ee36..142364ea9dbd32 100644
--- a/ports/graphicsmagick/portfile.cmake
+++ b/ports/graphicsmagick/portfile.cmake
@@ -1,11 +1,11 @@
-set(GM_VERSION 1.3.36)
+set(GM_VERSION 1.3.37)
 
 vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO graphicsmagick/graphicsmagick
     REF ${GM_VERSION}
-    FILENAME "GraphicsMagick-${GM_VERSION}-windows-source.7z"
-    SHA512 4976816acb9d348b83cc33c1ad2b0a3f9c4174c8983b3a3f867bcd6369984bea34b203a4e168f52f556c94288b9340db1357f614e8ff3a8802bef859378bdd31
+    FILENAME "GraphicsMagick-${GM_VERSION}-windows.7z"
+    SHA512 2e465a290946d730c0da1b45602ebdebc256d9a0705d6d79784efcefb0760a923dd78c73f7a563ce6ec41e4199da66d3b31cc8c6b8f821ff993092d348aeaa2f
     PATCHES
         # GM always requires a dynamic BZIP2. This patch makes this dependent if _DLL is defined
         dynamic_bzip2.patch
diff --git a/ports/graphicsmagick/vcpkg.json b/ports/graphicsmagick/vcpkg.json
index 7e8ef699e00f45..f3d740708a6221 100644
--- a/ports/graphicsmagick/vcpkg.json
+++ b/ports/graphicsmagick/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "graphicsmagick",
-  "version-string": "1.3.36",
-  "port-version": 1,
+  "version": "1.3.37",
   "description": "Image processing library",
   "homepage": "https://sourceforge.net/projects/graphicsmagick/",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 30f1df89f1dc48..440e8e5ec77f07 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2553,8 +2553,8 @@
       "port-version": 2
     },
     "graphicsmagick": {
-      "baseline": "1.3.36",
-      "port-version": 1
+      "baseline": "1.3.37",
+      "port-version": 0
     },
     "graphite2": {
       "baseline": "1.3.14",
diff --git a/versions/g-/graphicsmagick.json b/versions/g-/graphicsmagick.json
index a370d7b85fa61d..5676d7a129b87d 100644
--- a/versions/g-/graphicsmagick.json
+++ b/versions/g-/graphicsmagick.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4b45ceaa24dce170b8bf9ae142f628162a32e448",
+      "version": "1.3.37",
+      "port-version": 0
+    },
     {
       "git-tree": "a6c8562f7ec58b04278fb8985f9c7bbd5143158e",
       "version-string": "1.3.36",

From 6bc621acb085f9359ec4c2987afdc1e3806cc5bd Mon Sep 17 00:00:00 2001
From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Date: Fri, 17 Dec 2021 07:47:16 +0100
Subject: [PATCH 26/48] [meson] fix windows linker detection (#22032)

* fix meson linker detection .....

* bit of code cleanup in vcpkg_configure_meson

* forgot the version stuff

* put cmake back on path because meson is buggy as hell
---
 .../fix_linker_detection.patch                |  25 ++++
 ports/vcpkg-tool-meson/portfile.cmake         |   1 +
 ports/vcpkg-tool-meson/vcpkg.json             |   1 +
 scripts/cmake/vcpkg_configure_meson.cmake     | 109 +++++++-----------
 versions/baseline.json                        |   2 +-
 versions/v-/vcpkg-tool-meson.json             |   5 +
 6 files changed, 77 insertions(+), 66 deletions(-)
 create mode 100644 ports/vcpkg-tool-meson/fix_linker_detection.patch

diff --git a/ports/vcpkg-tool-meson/fix_linker_detection.patch b/ports/vcpkg-tool-meson/fix_linker_detection.patch
new file mode 100644
index 00000000000000..89e6dfa214b850
--- /dev/null
+++ b/ports/vcpkg-tool-meson/fix_linker_detection.patch
@@ -0,0 +1,25 @@
+diff --git a/tools/meson/mesonbuild/compilers/detect.py b/tools/meson/mesonbuild/compilers/detect.py
+index 1eacecfa8..74668da1a 100644
+--- a/tools/meson/mesonbuild/compilers/detect.py
++++ b/tools/meson/mesonbuild/compilers/detect.py
+@@ -292,7 +292,7 @@ def detect_static_linker(env: 'Environment', compiler: Compiler) -> StaticLinker
+             linkers = default_linkers
+     popen_exceptions = {}
+     for linker in linkers:
+-        if not {'lib', 'lib.exe', 'llvm-lib', 'llvm-lib.exe', 'xilib', 'xilib.exe'}.isdisjoint(linker):
++        if any(os.path.basename(x) in {'lib', 'lib.exe', 'llvm-lib', 'llvm-lib.exe', 'xilib', 'xilib.exe'} for x in linker):
+             arg = '/?'
+         elif not {'ar2000', 'ar2000.exe'}.isdisjoint(linker):
+             arg = '?'
+diff --git a/tools/meson/mesonbuild/linkers/detect.py b/tools/meson/mesonbuild/linkers/detect.py
+index 0bfd7083b..323801d9a 100644
+--- a/tools/meson/mesonbuild/linkers/detect.py
++++ b/tools/meson/mesonbuild/linkers/detect.py
+@@ -72,6 +72,7 @@ def guess_win_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty
+     override = []  # type: T.List[str]
+     value = env.lookup_binary_entry(for_machine, comp_class.language + '_ld')
+     if value is not None:
++        compiler = value
+         override = comp_class.use_linker_args(value[0])
+         check_args += override
+ 
diff --git a/ports/vcpkg-tool-meson/portfile.cmake b/ports/vcpkg-tool-meson/portfile.cmake
index a858c5f45d9c25..fd0110847ccfa5 100644
--- a/ports/vcpkg-tool-meson/portfile.cmake
+++ b/ports/vcpkg-tool-meson/portfile.cmake
@@ -47,6 +47,7 @@ if(NOT "${program}")
     z_vcpkg_apply_patches(
         SOURCE_PATH "${CURRENT_PACKAGES_DIR}"
         PATCHES meson-intl.patch
+                fix_linker_detection.patch
     )
 endif()
 
diff --git a/ports/vcpkg-tool-meson/vcpkg.json b/ports/vcpkg-tool-meson/vcpkg.json
index 418753714e4b88..ec48241bd25769 100644
--- a/ports/vcpkg-tool-meson/vcpkg.json
+++ b/ports/vcpkg-tool-meson/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "vcpkg-tool-meson",
   "version": "0.60.2",
+  "port-version": 1,
   "description": "Meson build system",
   "homepage": "https://github.com/mesonbuild/meson",
   "supports": "native"
diff --git a/scripts/cmake/vcpkg_configure_meson.cmake b/scripts/cmake/vcpkg_configure_meson.cmake
index 88f0abc81ad667..02e189b3140dad 100644
--- a/scripts/cmake/vcpkg_configure_meson.cmake
+++ b/scripts/cmake/vcpkg_configure_meson.cmake
@@ -40,45 +40,72 @@ This command supplies many common arguments to Meson. To see the full list, exam
 * [libepoxy](https://github.com/Microsoft/vcpkg/blob/master/ports/libepoxy/portfile.cmake)
 #]===]
 
-function(z_vcpkg_meson_generate_native_file additional_binaries) #https://mesonbuild.com/Native-environments.html
-    set(native_config "[binaries]\n")
-    #set(proglist AR RANLIB STRIP NM OBJDUMP DLLTOOL MT)
+function(z_vcpkg_append_proglist var_to_append additional_binaries)
+    string(APPEND "${var_to_append}" "[binaries]\n")
     if(VCPKG_TARGET_IS_WINDOWS)
-        set(proglist MT)
+        set(proglist MT AR)
     else()
         set(proglist AR RANLIB STRIP NM OBJDUMP DLLTOOL MT)
     endif()
     foreach(prog IN LISTS proglist)
         if(VCPKG_DETECTED_CMAKE_${prog})
-            string(TOLOWER "${prog}" proglower)
-            string(APPEND native_config "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}}'\n")
+            if(meson_${prog})
+                string(APPEND "${var_to_append}" "${meson_${prog}} = '${VCPKG_DETECTED_CMAKE_${prog}}'\n")
+            else()
+                string(TOLOWER "${prog}" proglower)
+                string(APPEND "${var_to_append}" "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}}'\n")
+            endif()
         endif()
     endforeach()
     set(programs C CXX RC)
+    set(meson_RC windres)
+    set(meson_CXX cpp)
     foreach(prog IN LISTS programs)
         if(VCPKG_DETECTED_CMAKE_${prog}_COMPILER)
-            string(REPLACE "CXX" "CPP" mesonprog "${prog}")
-            string(REPLACE "RC" "windres" mesonprog "${mesonprog}") # https://mesonbuild.com/Windows-module.html
-            string(TOLOWER "${mesonprog}" proglower)
-            string(APPEND native_config "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n")
+            if(meson_${prog})
+                string(APPEND "${var_to_append}" "${meson_${prog}} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n")
+            else()
+                string(TOLOWER "${prog}" proglower)
+                string(APPEND "${var_to_append}" "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n")
+            endif()
         endif()
     endforeach()
     if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS)
         # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456
         if (NOT VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "^(GNU|Intel)$")
-            string(APPEND native_config "c_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n")
+            string(APPEND "${var_to_append}" "c_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n")
         endif()
     endif()
     if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS)
         # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456
         if (NOT VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Intel)$")
-            string(APPEND native_config "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n")
+            string(APPEND "${var_to_append}" "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n")
         endif()
     endif()
-    string(APPEND native_config "cmake = '${CMAKE_COMMAND}'\n")
+
+    get_filename_component(CMAKE_PATH "${CMAKE_COMMAND}" DIRECTORY)
+    vcpkg_add_to_path("${CMAKE_PATH}" PREPEND) # Make CMake invokeable for Meson
+    string(APPEND "${var_to_append}" "cmake = '${CMAKE_COMMAND}'\n")
+
+    vcpkg_find_acquire_program(PYTHON3)
+    get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
+    vcpkg_add_to_path("${PYTHON3_DIR}")
+    string(APPEND "${var_to_append}" "python = '${PYTHON3}'\n")
+
+    vcpkg_find_acquire_program(NINJA)
+    get_filename_component(NINJA_PATH ${NINJA} DIRECTORY)
+    vcpkg_add_to_path(PREPEND "${NINJA_PATH}") # Prepend to use the correct ninja. 
+    # string(APPEND "${var_to_append}" "ninja = '${NINJA}'\n") # This does not work due to meson issues
+    
     foreach(additional_binary IN LISTS additional_binaries)
-        string(APPEND native_config "${additional_binary}\n")
+        string(APPEND "${var_to_append}" "${additional_binary}\n")
     endforeach()
+    set("${var_to_append}" "${${var_to_append}}" PARENT_SCOPE)
+endfunction()
+
+function(z_vcpkg_meson_generate_native_file additional_binaries) #https://mesonbuild.com/Native-environments.html
+    set(native_config "")
+    z_vcpkg_append_proglist(native_config "${additional_binaries}")
 
     string(APPEND native_config "[built-in options]\n") #https://mesonbuild.com/Builtin-options.html
     if(VCPKG_DETECTED_CMAKE_C_COMPILER MATCHES "cl.exe")
@@ -276,43 +303,9 @@ function(z_vcpkg_meson_generate_cross_file additional_binaries) #https://mesonbu
     else()
         message(FATAL_ERROR "Unsupported target architecture ${VCPKG_TARGET_ARCHITECTURE}!" )
     endif()
-    set(cross_file "[binaries]\n")
-    if(VCPKG_TARGET_IS_WINDOWS)
-        set(proglist MT)
-    else()
-        set(proglist AR RANLIB STRIP NM OBJDUMP DLLTOOL MT)
-    endif()
-    foreach(prog IN LISTS proglist)
-        if(VCPKG_DETECTED_CMAKE_${prog})
-            string(TOLOWER "${prog}" proglower)
-            string(APPEND cross_file "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}}'\n")
-        endif()
-    endforeach()
-    set(programs C CXX RC)
-    foreach(prog IN LISTS programs)
-        if(VCPKG_DETECTED_CMAKE_${prog}_COMPILER)
-            string(REPLACE "CXX" "CPP" mesonprog "${prog}")
-            string(REPLACE "RC" "windres" mesonprog "${mesonprog}") # https://mesonbuild.com/Windows-module.html
-            string(TOLOWER "${mesonprog}" proglower)
-            string(APPEND cross_file "${proglower} = '${VCPKG_DETECTED_CMAKE_${prog}_COMPILER}'\n")
-        endif()
-    endforeach()
-    if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS)
-        # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456
-        if (NOT VCPKG_DETECTED_CMAKE_C_COMPILER_ID MATCHES "^(GNU|Intel)$")
-            string(APPEND cross_file "c_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n")
-        endif()
-    endif()
-    if(VCPKG_DETECTED_CMAKE_LINKER AND VCPKG_TARGET_IS_WINDOWS)
-        # for gcc and icc the linker flag -fuse-ld is used. See https://github.com/mesonbuild/meson/issues/8647#issuecomment-878673456
-        if (NOT VCPKG_DETECTED_CMAKE_CXX_COMPILER_ID MATCHES "^(GNU|Intel)$")
-            string(APPEND cross_file "cpp_ld = '${VCPKG_DETECTED_CMAKE_LINKER}'\n")
-        endif()
-    endif()
-    string(APPEND cross_file "cmake = '${CMAKE_COMMAND}'\n")
-    foreach(additional_binary IN LISTS additional_binaries)
-        string(APPEND cross_file "${additional_binary}\n")
-    endforeach()
+
+    set(cross_file "")
+    z_vcpkg_append_proglist(cross_file "${additional_binaries}")
 
     string(APPEND cross_file "[properties]\n")
 
@@ -391,22 +384,8 @@ function(vcpkg_configure_meson)
     debug_message("Including cmake vars from: ${cmake_vars_file}")
     include("${cmake_vars_file}")
 
-    vcpkg_find_acquire_program(PYTHON3)
-    get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
-    vcpkg_add_to_path("${PYTHON3_DIR}")
-    vcpkg_list(APPEND arg_ADDITIONAL_NATIVE_BINARIES "python = '${PYTHON3}'")
-    vcpkg_list(APPEND arg_ADDITIONAL_CROSS_BINARIES "python = '${PYTHON3}'")
-
     vcpkg_find_acquire_program(MESON)
 
-    get_filename_component(CMAKE_PATH ${CMAKE_COMMAND} DIRECTORY)
-    vcpkg_add_to_path("${CMAKE_PATH}") # Make CMake invokeable for Meson
-
-    vcpkg_find_acquire_program(NINJA)
-    get_filename_component(NINJA_PATH ${NINJA} DIRECTORY)
-    vcpkg_add_to_path(PREPEND "${NINJA_PATH}") # Need to prepend so that meson picks up the correct ninja from vcpkg ....
-    # vcpkg_list(APPEND arg_ADDITIONAL_NATIVE_BINARIES "ninja = '${NINJA}'") # This does not work due to meson issues ......
-
     vcpkg_list(APPEND arg_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload)
 
     if(NOT vcpkg_meson_cross_file)
diff --git a/versions/baseline.json b/versions/baseline.json
index 440e8e5ec77f07..e72d13a58715cf 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -7130,7 +7130,7 @@
     },
     "vcpkg-tool-meson": {
       "baseline": "0.60.2",
-      "port-version": 0
+      "port-version": 1
     },
     "vcpkg-tool-nodejs": {
       "baseline": "14.17.4",
diff --git a/versions/v-/vcpkg-tool-meson.json b/versions/v-/vcpkg-tool-meson.json
index cb90b4013dc1f1..69969c8559d818 100644
--- a/versions/v-/vcpkg-tool-meson.json
+++ b/versions/v-/vcpkg-tool-meson.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "932036adfc24dd5fa63787b825974b6938402700",
+      "version": "0.60.2",
+      "port-version": 1
+    },
     {
       "git-tree": "e6ef15a9dc810b4bde53d9b1e3da3a20107e3983",
       "version": "0.60.2",

From df7ead31dc86a930e9f5b54aea7e57f2f40ed3e1 Mon Sep 17 00:00:00 2001
From: Vitaly <v31337@gmail.com>
Date: Fri, 17 Dec 2021 09:48:10 +0300
Subject: [PATCH 27/48] [libgpg-error] Release-only build support (#22036)

* [libgpg-error] Release-only build support

* Update version database

* Fix protfile spaces

* Update version database
---
 ports/libgpg-error/portfile.cmake | 11 +++++++++--
 ports/libgpg-error/vcpkg.json     |  2 +-
 versions/baseline.json            |  2 +-
 versions/l-/libgpg-error.json     |  5 +++++
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ports/libgpg-error/portfile.cmake b/ports/libgpg-error/portfile.cmake
index 17d26617d24996..cc795c59daf03f 100644
--- a/ports/libgpg-error/portfile.cmake
+++ b/ports/libgpg-error/portfile.cmake
@@ -91,8 +91,15 @@ else()
     vcpkg_install_make()
     vcpkg_fixup_pkgconfig() 
     vcpkg_copy_pdbs()
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgpg-error/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..")
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgpg-error/debug/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..")
+	
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgpg-error/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../..")
+    endif()
+
+    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/libgpg-error/debug/bin/gpg-error-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../../..")
+    endif()
+
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/${PORT}/locale" "${CURRENT_PACKAGES_DIR}/debug/share")
     file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 endif()
diff --git a/ports/libgpg-error/vcpkg.json b/ports/libgpg-error/vcpkg.json
index 515330256255c5..8132e6b2d62f55 100644
--- a/ports/libgpg-error/vcpkg.json
+++ b/ports/libgpg-error/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "libgpg-error",
   "version": "1.42",
-  "port-version": 2,
+  "port-version": 3,
   "description": "A common dependency of all GnuPG components",
   "homepage": "https://gnupg.org/software/libgpg-error/index.html",
   "supports": "!(windows & (arm | arm64))"
diff --git a/versions/baseline.json b/versions/baseline.json
index e72d13a58715cf..df60e262930b48 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3502,7 +3502,7 @@
     },
     "libgpg-error": {
       "baseline": "1.42",
-      "port-version": 2
+      "port-version": 3
     },
     "libgpod": {
       "baseline": "2019-08-29",
diff --git a/versions/l-/libgpg-error.json b/versions/l-/libgpg-error.json
index 9d75dd02f4f995..7b6379058fd517 100644
--- a/versions/l-/libgpg-error.json
+++ b/versions/l-/libgpg-error.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1ced42ca6160e2283326366e1c1132fe50acfb97",
+      "version": "1.42",
+      "port-version": 3
+    },
     {
       "git-tree": "f6c78e927a70ff136576abd61f1125861824bfd2",
       "version": "1.42",

From 9202ec01235926d829619fe5c917cc80d026a8e8 Mon Sep 17 00:00:00 2001
From: Clayton Wheeler <cswheeler@gmail.com>
Date: Fri, 17 Dec 2021 00:56:56 -0600
Subject: [PATCH 28/48] [elfutils] provide static or shared libraries correctly
 (#22055)

The logic for keeping the static or shared libraries according to
VCPKG_LIBRARY_LINKAGE was backwards, and it was providing shared
libraries when they should have been static, and vice versa.
---
 ports/elfutils/portfile.cmake | 6 +++---
 ports/elfutils/vcpkg.json     | 2 +-
 versions/baseline.json        | 2 +-
 versions/e-/elfutils.json     | 5 +++++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ports/elfutils/portfile.cmake b/ports/elfutils/portfile.cmake
index 7b7aae50e13240..4dfa7c997caa6d 100644
--- a/ports/elfutils/portfile.cmake
+++ b/ports/elfutils/portfile.cmake
@@ -37,11 +37,11 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/locale)
 
 # Remove files with wrong linkage
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
-    set(_lib_suffix "${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
-else()
     set(_lib_suffix "${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}")
+else()
+    set(_lib_suffix "${VCPKG_TARGET_SHARED_LIBRARY_SUFFIX}")
 endif()
-file(GLOB_RECURSE TO_REMOVE "${CURRENT_PACKAGES_DIR}/lib/*${_lib_suffix}" "${CURRENT_PACKAGES_DIR}/debug/lib/*${_lib_suffix}")
+file(GLOB_RECURSE TO_REMOVE "${CURRENT_PACKAGES_DIR}/lib/*${_lib_suffix}" "${CURRENT_PACKAGES_DIR}/debug/lib/*${_lib_suffix}" "${CURRENT_PACKAGES_DIR}/lib/*${_lib_suffix}.*" "${CURRENT_PACKAGES_DIR}/debug/lib/*${_lib_suffix}.*")
 file(REMOVE ${TO_REMOVE})
  
 # # Handle copyright
diff --git a/ports/elfutils/vcpkg.json b/ports/elfutils/vcpkg.json
index ba686648fb8fd4..1f918e73c2b419 100644
--- a/ports/elfutils/vcpkg.json
+++ b/ports/elfutils/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "elfutils",
   "version-string": "0.182",
-  "port-version": 1,
+  "port-version": 2,
   "description": "elfutils is a collection of utilities and libraries to read, create and modify ELF binary files, find and handle DWARF debug data, symbols, thread state and stacktraces for processes and core files on GNU/Linux.",
   "homepage": "https://sourceware.org/elfutils/",
   "supports": "!windows",
diff --git a/versions/baseline.json b/versions/baseline.json
index df60e262930b48..ce3baa49435ce5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2006,7 +2006,7 @@
     },
     "elfutils": {
       "baseline": "0.182",
-      "port-version": 1
+      "port-version": 2
     },
     "embree2": {
       "baseline": "2.17.7",
diff --git a/versions/e-/elfutils.json b/versions/e-/elfutils.json
index 6c9d614b27222a..bc61bd61dee0c2 100644
--- a/versions/e-/elfutils.json
+++ b/versions/e-/elfutils.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9aa4fefa61893cd4b37c0f1a2f16ab255ab0c4bf",
+      "version-string": "0.182",
+      "port-version": 2
+    },
     {
       "git-tree": "aa738c679581e92da4ec8a1662171ac5608e3744",
       "version-string": "0.182",

From 87a780b0e40f261921e2580ec7638541ec710222 Mon Sep 17 00:00:00 2001
From: Christian Fillion <cfillion@users.noreply.github.com>
Date: Fri, 17 Dec 2021 01:57:45 -0500
Subject: [PATCH 29/48] [gl3w] Use khrplatform.h from the egl-registry port
 (#22056)

* [gl3w] use khrplatform.h from the egl-registry port

The file was changed yesterday, invalidating the hash: KhronosGroup/EGL-Registry@57b4876de0f33677ece92dd9de0ef105ce69139d.

* [gl3w] migrate to new functions from vcpkg-cmake{,-config}

* [gl3w] bump port version
---
 ports/gl3w/portfile.cmake | 16 ++++------------
 ports/gl3w/vcpkg.json     | 13 +++++++++++--
 versions/baseline.json    |  2 +-
 versions/g-/gl3w.json     |  5 +++++
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/ports/gl3w/portfile.cmake b/ports/gl3w/portfile.cmake
index 1cf3e0f2beba9f..2633bf05a48b04 100644
--- a/ports/gl3w/portfile.cmake
+++ b/ports/gl3w/portfile.cmake
@@ -8,16 +8,9 @@ vcpkg_from_github(
       0001-enable-shared-build.patch
 )
 
-# Download khrplatform.h with vcpkg instead of gl3w_gen.py so that our downloader settings are used
-vcpkg_download_distfile(KHRPLATFORM_H
-  URLS "https://www.khronos.org/registry/EGL/api/KHR/khrplatform.h"
-  FILENAME khrplatform.h
-  SHA512 93d9075718eddb69c44482acdc72bbbd3511741272a6124d05ab1ef0702ef03e918501403b6fd334faf2c61f3332f34b7730158aa090db3d448c32b5dd9d9e67
-  )
-
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 file(COPY "${CURRENT_INSTALLED_DIR}/include/GL/glcorearb.h" DESTINATION "${SOURCE_PATH}/include/GL")
-file(COPY "${KHRPLATFORM_H}" DESTINATION "${SOURCE_PATH}/include/KHR")
+file(COPY "${CURRENT_INSTALLED_DIR}/include/KHR/khrplatform.h" DESTINATION "${SOURCE_PATH}/include/KHR")
 
 vcpkg_find_acquire_program(PYTHON3)
 
@@ -27,15 +20,14 @@ vcpkg_execute_required_process(
   LOGNAME gl3w-gen
 )
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
   SOURCE_PATH "${SOURCE_PATH}"
-  PREFER_NINJA
   OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_fixup_cmake_targets()
+vcpkg_cmake_config_fixup()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
   vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/GL/gl3w.h" "#define GL3W_API" "#define GL3W_API __declspec(dllimport)")
diff --git a/ports/gl3w/vcpkg.json b/ports/gl3w/vcpkg.json
index f38702da242839..0963571711e09b 100644
--- a/ports/gl3w/vcpkg.json
+++ b/ports/gl3w/vcpkg.json
@@ -1,10 +1,19 @@
 {
   "name": "gl3w",
   "version-date": "2018-05-31",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Simple OpenGL core profile loading",
   "homepage": "https://github.com/skaslev/gl3w",
   "dependencies": [
-    "opengl-registry"
+    "egl-registry",
+    "opengl-registry",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index ce3baa49435ce5..4c756152b56c63 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2450,7 +2450,7 @@
     },
     "gl3w": {
       "baseline": "2018-05-31",
-      "port-version": 3
+      "port-version": 4
     },
     "glad": {
       "baseline": "0.1.34",
diff --git a/versions/g-/gl3w.json b/versions/g-/gl3w.json
index a718bca62bd5d1..a5cb2544dca59d 100644
--- a/versions/g-/gl3w.json
+++ b/versions/g-/gl3w.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "618626b6f1118dc2c80fa7bd2aae497c0d83b7c1",
+      "version-date": "2018-05-31",
+      "port-version": 4
+    },
     {
       "git-tree": "bbd82479631534cfe954646d63d29734c3b7728f",
       "version-date": "2018-05-31",

From a222dc6a0d57c72c19af499a466b8f07ef03d975 Mon Sep 17 00:00:00 2001
From: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
Date: Fri, 17 Dec 2021 15:03:43 +0800
Subject: [PATCH 30/48] [caf] Update to 0.18.5 (#22046)

* [caf] Update to 0.18.5

* Remove setting of BUILD_SHARED_LIBS already handled by vcpkg_cmake_configure.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
---
 ports/caf/fix_dependency.patch           | 11 +++++
 ports/caf/openssl-version-override.patch | 14 -------
 ports/caf/portfile.cmake                 | 51 ++++++++++--------------
 ports/caf/usage                          |  5 ---
 ports/caf/vcpkg-cmake-wrapper.cmake      |  6 ---
 ports/caf/vcpkg.json                     | 15 +++++--
 versions/baseline.json                   |  4 +-
 versions/c-/caf.json                     |  5 +++
 8 files changed, 50 insertions(+), 61 deletions(-)
 create mode 100644 ports/caf/fix_dependency.patch
 delete mode 100644 ports/caf/openssl-version-override.patch
 delete mode 100644 ports/caf/usage
 delete mode 100644 ports/caf/vcpkg-cmake-wrapper.cmake

diff --git a/ports/caf/fix_dependency.patch b/ports/caf/fix_dependency.patch
new file mode 100644
index 00000000000000..10636ba71bac1c
--- /dev/null
+++ b/ports/caf/fix_dependency.patch
@@ -0,0 +1,11 @@
+diff --git a/cmake/CAFConfig.cmake.in b/cmake/CAFConfig.cmake.in
+index 1a2348c..6c0d0b2 100644
+--- a/cmake/CAFConfig.cmake.in
++++ b/cmake/CAFConfig.cmake.in
+@@ -5,5 +5,6 @@ include(CMakeFindDependencyMacro)
+ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+ set(THREADS_PREFER_PTHREAD_FLAG TRUE)
+ find_dependency(Threads)
++find_dependency(OpenSSL REQUIRED)
+ 
+ include("${CMAKE_CURRENT_LIST_DIR}/CAFTargets.cmake")
diff --git a/ports/caf/openssl-version-override.patch b/ports/caf/openssl-version-override.patch
deleted file mode 100644
index 5a03371341754e..00000000000000
--- a/ports/caf/openssl-version-override.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2d908e8..d270297 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -495,6 +495,9 @@ if(NOT CAF_NO_OPENSSL)
-       message(STATUS
-               "Disable OpenSSL. Required >= 1.0.1 due to TLSv1.2 support.")
-       set(CAF_NO_OPENSSL yes)
-+    elseif(CAF_OPENSSL_VERSION_OVERRIDE)
-+        include_directories(BEFORE ${OPENSSL_INCLUDE_DIR})
-+        add_optional_caf_lib(openssl)
-     else()
-       if(NOT CMAKE_CROSSCOMPILING)
-         # Check if openssl headers and library versions match
diff --git a/ports/caf/portfile.cmake b/ports/caf/portfile.cmake
index 1c40312af350d3..128eb5bee5b150 100644
--- a/ports/caf/portfile.cmake
+++ b/ports/caf/portfile.cmake
@@ -1,45 +1,36 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO actor-framework/actor-framework
-    REF f7d4fc7ac679e18ba385f64434f8015c3cea9cb5 # 0.17.6
-    SHA512 8b4719c26dfad68eed6f2528263702e42f9865bb7a9f2d40909dc6c3fc20bb7259fe44a5f89390ba714c7f9359db2d171ff44685641962c24a70f4e2aa3f3f65
+    REF c2be26e7f9e3e84ef14730590fc4e7b25fb9d29a # 0.18.5
+    SHA512 e8d1e9417ea71c4f92f51f4f7dbb7bcc9d0468623d2202be9b4ed4411406a3b6f6fc903309b74bb130e7cf1c7a0ec349d8bc2ac8f216a28216d1c808c1bde039
     HEAD_REF master
     PATCHES
-        openssl-version-override.patch
+        fix_dependency.patch
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
-        -DCAF_BUILD_STATIC=ON
-        -DCAF_BUILD_STATIC_ONLY=ON
-        -DCAF_NO_TOOLS=ON
-        -DCAF_NO_EXAMPLES=ON
-        -DCAF_NO_BENCHMARKS=ON
-        -DCAF_NO_UNIT_TESTS=ON
-        -DCAF_NO_PROTOBUF_EXAMPLES=ON
-        -DCAF_NO_QT_EXAMPLES=ON
-        -DCAF_NO_OPENCL=ON
-        -DCAF_NO_OPENSSL=OFF
-        -DCAF_NO_CURL_EXAMPLES=ON
-        -DCAF_OPENSSL_VERSION_OVERRIDE=ON
+        -DCAF_ENABLE_CURL_EXAMPLES=OFF
+        -DCAF_ENABLE_PROTOBUF_EXAMPLES=OFF
+        -DCAF_ENABLE_QT6_EXAMPLES=OFF
+        -DCAF_ENABLE_RUNTIME_CHECKS=OFF
+        -DCAF_ENABLE_ACTOR_PROFILER=OFF
+        -DCAF_ENABLE_EXAMPLES=OFF
+        -DCAF_ENABLE_TESTING=OFF
+        -DCAF_ENABLE_TOOLS=OFF
+        -DCAF_ENABLE_IO_MODULE=ON
+        -DCAF_ENABLE_EXCEPTIONS=ON
         -DCAF_ENABLE_UTILITY_TARGETS=OFF
 )
 
-vcpkg_install_cmake()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
+vcpkg_cmake_install()
 
-file(INSTALL
-    ${SOURCE_PATH}/LICENSE
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-    
-file(COPY ${SOURCE_PATH}/cmake/FindCAF.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+vcpkg_cmake_config_fixup(PACKAGE_NAME CAF CONFIG_PATH lib/cmake/CAF)
 
 vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/caf/usage b/ports/caf/usage
deleted file mode 100644
index 10083d8de8fdf7..00000000000000
--- a/ports/caf/usage
+++ /dev/null
@@ -1,5 +0,0 @@
-The package caf provides CMake targets:
-
-    find_package(CAF REQUIRED COMPONENTS core io)
-    target_include_directories(main PRIVATE ${CAF_INCLUDE_DIRS})
-    target_link_libraries(main PRIVATE ${CAF_LIBRARIES})
\ No newline at end of file
diff --git a/ports/caf/vcpkg-cmake-wrapper.cmake b/ports/caf/vcpkg-cmake-wrapper.cmake
deleted file mode 100644
index b01e408550c646..00000000000000
--- a/ports/caf/vcpkg-cmake-wrapper.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-set(CAF_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
-
-_find_package(${ARGS})
-
-set(CMAKE_MODULE_PATH ${CAF_PREV_MODULE_PATH})
diff --git a/ports/caf/vcpkg.json b/ports/caf/vcpkg.json
index fea50a3a51c0b8..71bb3846858999 100644
--- a/ports/caf/vcpkg.json
+++ b/ports/caf/vcpkg.json
@@ -1,10 +1,17 @@
 {
   "name": "caf",
-  "version-string": "0.17.6",
-  "port-version": 2,
-  "description": "an open source C++11 actor model implementation featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.",
+  "version": "0.18.5",
+  "description": "an open source implementation of the actor model for C++ featuring lightweight & fast actor implementations, pattern matching for messages, network transparent messaging, and more.",
   "homepage": "https://github.com/actor-framework/actor-framework",
   "dependencies": [
-    "openssl"
+    "openssl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 4c756152b56c63..727e1a96f2f5e6 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1205,8 +1205,8 @@
       "port-version": 1
     },
     "caf": {
-      "baseline": "0.17.6",
-      "port-version": 2
+      "baseline": "0.18.5",
+      "port-version": 0
     },
     "caffe2": {
       "baseline": "0.8.1",
diff --git a/versions/c-/caf.json b/versions/c-/caf.json
index c92bc3b28e9ca0..7e81e9e8fc9dd2 100644
--- a/versions/c-/caf.json
+++ b/versions/c-/caf.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6f4b297fc5ad4bd021fa9d72787b27e69a558237",
+      "version": "0.18.5",
+      "port-version": 0
+    },
     {
       "git-tree": "d520e997ef25f386431e32cb6bec32ba12a78339",
       "version-string": "0.17.6",

From a941c14ee04a0efe8325d9aa2a2cbce16dd39c8e Mon Sep 17 00:00:00 2001
From: "X.ZhaoMa" <ma@arch.ethz.ch>
Date: Fri, 17 Dec 2021 08:22:33 +0100
Subject: [PATCH 31/48] [gmsh] Add new port (#21896)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add: gmsh

* add: versioning for gmsh.

* [gmsh] Re-factory code

* Fix install, remove some features due to lack required dependencies.

* version

* Do not support uwp officially

* version

* Update ports/gmsh/portfile.cmake

* Update versions/g-/gmsh.json

* Group the options

* version

* version

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
---
 ports/gmsh/fix-install.patch |  38 ++++++++++++
 ports/gmsh/portfile.cmake    | 111 +++++++++++++++++++++++++++++++++++
 ports/gmsh/vcpkg.json        |  46 +++++++++++++++
 versions/baseline.json       |   4 ++
 versions/g-/gmsh.json        |   9 +++
 5 files changed, 208 insertions(+)
 create mode 100644 ports/gmsh/fix-install.patch
 create mode 100644 ports/gmsh/portfile.cmake
 create mode 100644 ports/gmsh/vcpkg.json
 create mode 100644 versions/g-/gmsh.json

diff --git a/ports/gmsh/fix-install.patch b/ports/gmsh/fix-install.patch
new file mode 100644
index 00000000000000..2f4510240781de
--- /dev/null
+++ b/ports/gmsh/fix-install.patch
@@ -0,0 +1,38 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7040709..a4b8c61 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1872,12 +1872,30 @@ endif()
+ 
+ # mark targets as optional so we can install them separately if needed
+ # (e.g. "make lib" or "make shared" followed by "make install/fast")
+-install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
++install(
++  TARGETS gmsh
++  RUNTIME DESTINATION bin
++  LIBRARY DESTINATION lib
++  ARCHIVE DESTINATION lib
++  OPTIONAL
++)
+ if(ENABLE_BUILD_LIB)
+-  install(TARGETS lib DESTINATION ${GMSH_LIB} OPTIONAL)
++  install(
++    TARGETS lib
++    RUNTIME DESTINATION bin
++    LIBRARY DESTINATION lib
++    ARCHIVE DESTINATION lib
++    OPTIONAL
++  )
+ endif()
+ if(ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC)
+-  install(TARGETS shared DESTINATION ${GMSH_LIB} OPTIONAL)
++  install(
++    TARGETS shared
++    RUNTIME DESTINATION bin
++    LIBRARY DESTINATION lib
++    ARCHIVE DESTINATION lib
++    OPTIONAL
++  )
+ endif()
+ 
+ if(ENABLE_ONELAB AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/contrib/onelab)
diff --git a/ports/gmsh/portfile.cmake b/ports/gmsh/portfile.cmake
new file mode 100644
index 00000000000000..78f9194a191135
--- /dev/null
+++ b/ports/gmsh/portfile.cmake
@@ -0,0 +1,111 @@
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.onelab.info
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO gmsh/gmsh
+    REF gmsh_4_9_0
+    SHA512 e70a09741a86a9131094e77742078aec1cc94517e1d7c855c257bc93c21c057e25c7ac5168d31ec4d905d78f31d5704faf63bfd3a81b4b9e2ebbcfacf2fdaa8b
+    HEAD_REF master
+    PATCHES fix-install.patch
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_LIB)
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED)
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_RUNTIME)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        opencascade ENABLE_OCC
+        opencascade ENABLE_OCC_CAF
+        opencascade ENABLE_OCC_TBB
+        mpi         ENABLE_MPI
+        zipper      ENABLE_ZIPPER
+)
+
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
+    OPTIONS
+        ${FEATURE_OPTIONS}
+        -DENABLE_BUILD_LIB=${BUILD_LIB}
+        -DENABLE_BUILD_SHARED=${BUILD_SHARED}
+        -DENABLE_MSVC_STATIC_RUNTIME=${STATIC_RUNTIME}
+        -DGMSH_RELEASE=ON
+        -DENABLE_PACKAGE_STRIP=ON
+        -DENABLE_SYSTEM_CONTRIB=ON
+        # Not implement
+        -DENABLE_GRAPHICS=OFF # Requires mesh, post, plugins and onelab
+        -DENABLE_POST=OFF
+        -DENABLE_PLUGINS=OFF
+        -DENABLE_MESH=OFF
+        -DENABLE_PARSER=OFF
+        -DENABLE_PROFILE=OFF
+        -DENABLE_PRIVATE_API=OFF
+        -DENABLE_QUADMESHINGTOOLS=OFF
+        -DENABLE_PRO=OFF
+        -DENABLE_TOUCHBAR=OFF
+        -DENABLE_VISUDEV=OFF
+        -DENABLE_BLAS_LAPACK=OFF
+        -DENABLE_CAIRO=OFF
+        -DENABLE_CGNS=OFF
+        -DENABLE_CGNS_CPEX0045=OFF
+        -DENABLE_EIGEN=OFF
+        -DENABLE_GMP=OFF
+        -DENABLE_OPENMP=OFF
+        -DENABLE_POPPLER=OFF
+        -DENABLE_WRAP_JAVA=OFF
+        -DENABLE_WRAP_PYTHON=OFF
+        # Requies dependencies which not included in vcpkg yet
+        -DENABLE_3M=OFF
+        -DENABLE_ALGLIB=OFF
+        -DENABLE_ANN=OFF
+        -DENABLE_BAMG=OFF
+        -DENABLE_BLOSSOM=OFF
+        -DENABLE_BUILD_DYNAMIC=OFF # Needs gfortran
+        -DENABLE_FLTK=OFF # Needs executable fltk-config
+        -DENABLE_DINTEGRATION=OFF
+        -DENABLE_GEOMETRYCENTRAL=OFF
+        -DENABLE_DOMHEX=OFF
+        -DENABLE_GETDP=OFF
+        -DENABLE_GMM=OFF
+        -DENABLE_HXT=OFF
+        -DENABLE_KBIPACK=OFF
+        -DENABLE_MATHEX=OFF
+        -DENABLE_MED=OFF
+        -DENABLE_METIS=OFF
+        -DENABLE_MMG=OFF
+        -DENABLE_MPEG_ENCODE=OFF
+        -DENABLE_MUMPS=OFF
+        -DENABLE_NUMPY=OFF
+        -DENABLE_NETGEN=OFF
+        -DENABLE_PETSC4PY=OFF
+        -DENABLE_ONELAB_METAMODEL=OFF
+        -DENABLE_ONELAB=OFF
+        -DENABLE_OPENACC=OFF
+        -DENABLE_OPTHOM=OFF
+        -DENABLE_OSMESA=OFF
+        -DENABLE_P4EST=OFF
+        -DENABLE_PETSC=OFF
+        -DENABLE_QUADTRI=OFF
+        -DENABLE_REVOROPT=OFF
+        -DENABLE_SLEPC=OFF
+        -DENABLE_SOLVER=OFF
+        -DENABLE_TCMALLOC=OFF
+        -DENABLE_VOROPP=OFF
+        -DENABLE_WINSLOWUNTANGLER=OFF
+        # experimental
+        -DENABLE_BUILD_ANDROID=OFF
+        -DENABLE_BUILD_IOS=OFF
+
+        -DENABLE_OS_SPECIFIC_INSTALL=OFF # Needs system permission
+        -DENABLE_RPATH=OFF # Should use dependencies in vcpkg
+        -DENABLE_TESTS=OFF
+)
+
+vcpkg_cmake_install()
+
+vcpkg_copy_tools(TOOL_NAMES gmsh AUTO_CLEAN)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/gmsh/vcpkg.json b/ports/gmsh/vcpkg.json
new file mode 100644
index 00000000000000..70b1d266ec9cec
--- /dev/null
+++ b/ports/gmsh/vcpkg.json
@@ -0,0 +1,46 @@
+{
+  "name": "gmsh",
+  "version": "4.9.0",
+  "description": "Gmsh is an open source 3D finite element mesh generator with a built-in CAD engine and post-processor.",
+  "homepage": "https://gmsh.info",
+  "supports": "!uwp",
+  "dependencies": [
+    "blas",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ],
+  "features": {
+    "graphics": {
+      "description": "Enable building graphics lib even without GUI (advanced)",
+      "dependencies": [
+        "libjpeg-turbo",
+        "libpng",
+        "opengl",
+        "zlib"
+      ]
+    },
+    "mpi": {
+      "description": "Enable MPI (experimental, not used for meshing)",
+      "dependencies": [
+        "openmpi"
+      ]
+    },
+    "occ": {
+      "description": "Enable OpenCASCADE modules",
+      "dependencies": [
+        "caf",
+        "freetype",
+        "opencascade",
+        "tbb"
+      ]
+    },
+    "zipper": {
+      "description": "Enable Zip file compression/decompression",
+      "dependencies": [
+        "zlib"
+      ]
+    }
+  }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 727e1a96f2f5e6..1c228e59dc31a2 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2516,6 +2516,10 @@
       "baseline": "6.2.1",
       "port-version": 7
     },
+    "gmsh": {
+      "baseline": "4.9.0",
+      "port-version": 0
+    },
     "google-cloud-cpp": {
       "baseline": "1.34.1",
       "port-version": 0
diff --git a/versions/g-/gmsh.json b/versions/g-/gmsh.json
new file mode 100644
index 00000000000000..1b357c663e8528
--- /dev/null
+++ b/versions/g-/gmsh.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "d01377e2003c3ea5ef7a6b9fb215a086e5f75eed",
+      "version": "4.9.0",
+      "port-version": 0
+    }
+  ]
+}

From d416206ddde055ca761ce7d822eecbb0d935bd79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= <me@dawidwrobel.com>
Date: Fri, 17 Dec 2021 01:29:39 -0600
Subject: [PATCH 32/48] [kf5] upgrade to 5.89 (#21890)

* [kf5*] Update to 5.89

* [kf5*] Update versions

* [kf5kio] update tag to rc2

* [kf5kio] update versions

* [kf5*] final 5.89 released

* [kf5*] update versions

* Clean up trailing whitespace and add quotes when naming .clang-format.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
---
 ports/ecm/portfile.cmake                      |   4 +-
 ports/ecm/vcpkg.json                          |   2 +-
 ports/kf5archive/portfile.cmake               |  78 +++++-----
 ports/kf5archive/vcpkg.json                   |   2 +-
 ports/kf5attica/portfile.cmake                |  60 ++++----
 ports/kf5attica/vcpkg.json                    |   2 +-
 ports/kf5auth/portfile.cmake                  |   8 +-
 ports/kf5auth/vcpkg.json                      |   2 +-
 ports/kf5bookmarks/portfile.cmake             |   9 +-
 ports/kf5bookmarks/vcpkg.json                 |   2 +-
 ports/kf5codecs/portfile.cmake                |   9 +-
 ports/kf5codecs/vcpkg.json                    |   2 +-
 ports/kf5completion/portfile.cmake            |  61 ++++----
 ports/kf5completion/vcpkg.json                |   2 +-
 ports/kf5config/portfile.cmake                |  98 +++++++------
 ports/kf5config/vcpkg.json                    |   2 +-
 ports/kf5configwidgets/portfile.cmake         |   7 +-
 ports/kf5configwidgets/vcpkg.json             |   2 +-
 ports/kf5coreaddons/portfile.cmake            |  75 +++++-----
 ports/kf5coreaddons/vcpkg.json                |   2 +-
 ports/kf5crash/portfile.cmake                 |   8 +-
 ports/kf5crash/vcpkg.json                     |   2 +-
 ports/kf5dbusaddons/portfile.cmake            |   9 +-
 ports/kf5dbusaddons/vcpkg.json                |   2 +-
 .../kf5dbusaddons/x11_private_dependency.diff |  16 ---
 ports/kf5declarative/portfile.cmake           |  10 +-
 ports/kf5declarative/vcpkg.json               |   2 +-
 ports/kf5globalaccel/portfile.cmake           |  68 +++++----
 ports/kf5globalaccel/vcpkg.json               |   2 +-
 ports/kf5globalaccel/xcb_xtest_optional.diff  |  13 --
 ports/kf5guiaddons/portfile.cmake             |  90 ++++++------
 ports/kf5guiaddons/vcpkg.json                 |   2 +-
 ports/kf5holidays/portfile.cmake              |  61 ++++----
 ports/kf5holidays/vcpkg.json                  |   2 +-
 ports/kf5i18n/portfile.cmake                  |  77 +++++-----
 ports/kf5i18n/vcpkg.json                      |   2 +-
 ports/kf5iconthemes/portfile.cmake            |   7 +-
 ports/kf5iconthemes/vcpkg.json                |   2 +-
 ports/kf5itemmodels/portfile.cmake            |  60 ++++----
 ports/kf5itemmodels/vcpkg.json                |   2 +-
 ports/kf5itemviews/portfile.cmake             |  60 ++++----
 ports/kf5itemviews/vcpkg.json                 |   2 +-
 ports/kf5jobwidgets/portfile.cmake            |  62 ++++----
 ports/kf5jobwidgets/vcpkg.json                |   2 +-
 ports/kf5kcmutils/portfile.cmake              |   8 +-
 ports/kf5kcmutils/vcpkg.json                  |   2 +-
 ports/kf5kio/portfile.cmake                   |   7 +-
 ports/kf5kio/vcpkg.json                       |   2 +-
 ports/kf5newstuff/portfile.cmake              |   7 +-
 ports/kf5newstuff/vcpkg.json                  |   2 +-
 ports/kf5notifications/portfile.cmake         |   7 +-
 ports/kf5notifications/vcpkg.json             |   2 +-
 ports/kf5package/portfile.cmake               |  65 +++++----
 ports/kf5package/vcpkg.json                   |   2 +-
 ports/kf5plotting/portfile.cmake              |   9 +-
 ports/kf5plotting/vcpkg.json                  |   2 +-
 ports/kf5service/portfile.cmake               | 119 ++++++++-------
 ports/kf5service/vcpkg.json                   |   2 +-
 ports/kf5solid/portfile.cmake                 | 136 +++++++++---------
 ports/kf5solid/vcpkg.json                     |   2 +-
 ports/kf5sonnet/portfile.cmake                |  96 ++++++-------
 ports/kf5sonnet/vcpkg.json                    |   2 +-
 ports/kf5syntaxhighlighting/portfile.cmake    |  79 +++++-----
 ports/kf5syntaxhighlighting/vcpkg.json        |   2 +-
 ports/kf5textwidgets/portfile.cmake           |   7 +-
 ports/kf5textwidgets/vcpkg.json               |   2 +-
 ports/kf5wallet/portfile.cmake                |  63 ++++----
 ports/kf5wallet/vcpkg.json                    |   2 +-
 ports/kf5widgetsaddons/portfile.cmake         |  62 ++++----
 ports/kf5widgetsaddons/vcpkg.json             |   2 +-
 ports/kf5windowsystem/portfile.cmake          |  68 +++++----
 ports/kf5windowsystem/vcpkg.json              |   2 +-
 ports/kf5xmlgui/portfile.cmake                |  13 +-
 ports/kf5xmlgui/vcpkg.json                    |   2 +-
 versions/baseline.json                        |  72 +++++-----
 versions/e-/ecm.json                          |   5 +
 versions/k-/kf5archive.json                   |   5 +
 versions/k-/kf5attica.json                    |   5 +
 versions/k-/kf5auth.json                      |   5 +
 versions/k-/kf5bookmarks.json                 |   5 +
 versions/k-/kf5codecs.json                    |   5 +
 versions/k-/kf5completion.json                |   5 +
 versions/k-/kf5config.json                    |   5 +
 versions/k-/kf5configwidgets.json             |   5 +
 versions/k-/kf5coreaddons.json                |   5 +
 versions/k-/kf5crash.json                     |   5 +
 versions/k-/kf5dbusaddons.json                |   5 +
 versions/k-/kf5declarative.json               |   5 +
 versions/k-/kf5globalaccel.json               |   5 +
 versions/k-/kf5guiaddons.json                 |   5 +
 versions/k-/kf5holidays.json                  |   5 +
 versions/k-/kf5i18n.json                      |   5 +
 versions/k-/kf5iconthemes.json                |   5 +
 versions/k-/kf5itemmodels.json                |   5 +
 versions/k-/kf5itemviews.json                 |   5 +
 versions/k-/kf5jobwidgets.json                |   5 +
 versions/k-/kf5kcmutils.json                  |   5 +
 versions/k-/kf5kio.json                       |   5 +
 versions/k-/kf5newstuff.json                  |   5 +
 versions/k-/kf5notifications.json             |   5 +
 versions/k-/kf5package.json                   |   5 +
 versions/k-/kf5plotting.json                  |   5 +
 versions/k-/kf5service.json                   |   5 +
 versions/k-/kf5solid.json                     |   5 +
 versions/k-/kf5sonnet.json                    |   5 +
 versions/k-/kf5syntaxhighlighting.json        |   5 +
 versions/k-/kf5textwidgets.json               |   5 +
 versions/k-/kf5wallet.json                    |   5 +
 versions/k-/kf5widgetsaddons.json             |   5 +
 versions/k-/kf5windowsystem.json              |   5 +
 versions/k-/kf5xmlgui.json                    |   5 +
 111 files changed, 1061 insertions(+), 959 deletions(-)
 delete mode 100644 ports/kf5dbusaddons/x11_private_dependency.diff
 delete mode 100644 ports/kf5globalaccel/xcb_xtest_optional.diff

diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake
index 0c71dc80493773..63ab654f93d92e 100644
--- a/ports/ecm/portfile.cmake
+++ b/ports/ecm/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/extra-cmake-modules
-    REF v5.88.0
-    SHA512 976c83b155c92bdab639752ad44046722dbc363b0341533a51b2123a36cdfb82b0ddefa4886e1def9b7f236b8569dc9f9c2b26c0ea83debb631e574d531c30df
+    REF v5.89.0
+    SHA512 1c3f6ad5dbe1485d1602e297989d6cd53e7646aa99dc28ac1159d0aa22134c97efd74b2c01923e74732f59c861ce05486adb7cff7de050237a35b0980e92cbcf
     HEAD_REF master
     PATCHES
         fix_canberra.patch         # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/187
diff --git a/ports/ecm/vcpkg.json b/ports/ecm/vcpkg.json
index 9b0a66dcc012f9..a744a9bcfdf2e0 100644
--- a/ports/ecm/vcpkg.json
+++ b/ports/ecm/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "ecm",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Extra CMake Modules (ECM), extra modules and scripts for CMake",
   "homepage": "https://github.com/KDE/extra-cmake-modules",
   "dependencies": [
diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake
index 325889a690937c..ec03f9f0440c11 100644
--- a/ports/kf5archive/portfile.cmake
+++ b/ports/kf5archive/portfile.cmake
@@ -1,40 +1,38 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/karchive
-    REF v5.88.0
-    SHA512 233ea884aafc70a186698fece376727cac5ae79daa6396752a375c8b66c6bbf9ea952ee14cd48b54fcf58af2f931d9c96a83f3d01c8e2c29ab618ee961285762
-    HEAD_REF master
-    PATCHES
-        use_cmake_to_find_zstd.patch # https://invent.kde.org/frameworks/karchive/-/merge_requests/24
-)
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    INVERTED_FEATURES
-        "lzma"  CMAKE_DISABLE_FIND_PACKAGE_LibLZMA
-        "zstd"  CMAKE_DISABLE_FIND_PACKAGE_ZSTD
-)
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DBUILD_TESTING=OFF
-        ${FEATURE_OPTIONS}
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Archive CONFIG_PATH lib/cmake/KF5Archive)
-vcpkg_copy_pdbs()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
-
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/karchive
+    REF v5.89.0
+    SHA512 e77d5233b6549332f180be3dcf0459688d6565c24e1af409814aab92d415ebb2b8a04ad720dfa9ed6f017f3ab86fab766b909e30a860bb83c5ddd51def7c3e5f
+    HEAD_REF master
+    PATCHES
+        use_cmake_to_find_zstd.patch # https://invent.kde.org/frameworks/karchive/-/merge_requests/24
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    INVERTED_FEATURES
+        "lzma"  CMAKE_DISABLE_FIND_PACKAGE_LibLZMA
+        "zstd"  CMAKE_DISABLE_FIND_PACKAGE_ZSTD
+)
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        ${FEATURE_OPTIONS}
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Archive CONFIG_PATH lib/cmake/KF5Archive)
+vcpkg_copy_pdbs()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5archive/vcpkg.json b/ports/kf5archive/vcpkg.json
index 766a596c3c4ca0..8caa55f6f85aeb 100644
--- a/ports/kf5archive/vcpkg.json
+++ b/ports/kf5archive/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5archive",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "File compression",
   "homepage": "https://api.kde.org/frameworks/karchive/html/index.html",
   "dependencies": [
diff --git a/ports/kf5attica/portfile.cmake b/ports/kf5attica/portfile.cmake
index a0ae19fb84c81b..d658095bdc7a34 100644
--- a/ports/kf5attica/portfile.cmake
+++ b/ports/kf5attica/portfile.cmake
@@ -1,31 +1,29 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/attica
-    REF v5.88.0
-    SHA512 09c04ae1572a165c8208c09db9bc3591584b7f327b56f78fcd7f9beb088a13ae69e41c593d4903b539ae52739a1c649359b668cfe8775bb2c61210152cb7be3f
-    HEAD_REF master
-)
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DBUILD_TESTING=OFF
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Attica CONFIG_PATH lib/cmake/KF5Attica)
-vcpkg_copy_pdbs()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
-
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/attica
+    REF v5.89.0
+    SHA512 46f4cb550a13032da2e48861916356f3dfa47de0e1c0672ffeea19bad813dfb5cdf1b45b1a25ff35adc07e622486b37d7a65ddf3d39c2b214114d916f09577bb
+    HEAD_REF master
+)
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Attica CONFIG_PATH lib/cmake/KF5Attica)
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5attica/vcpkg.json b/ports/kf5attica/vcpkg.json
index 55076103dd06f3..38c6c8b88b3464 100644
--- a/ports/kf5attica/vcpkg.json
+++ b/ports/kf5attica/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5attica",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "A Qt library that implements the Open Collaboration Services API",
   "homepage": "https://api.kde.org/frameworks/attica/html/index.html",
   "dependencies": [
diff --git a/ports/kf5auth/portfile.cmake b/ports/kf5auth/portfile.cmake
index eeb16ff453d2d1..2c75a4bfcbee35 100644
--- a/ports/kf5auth/portfile.cmake
+++ b/ports/kf5auth/portfile.cmake
@@ -1,13 +1,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kauth
-    REF v5.88.0
-    SHA512 f4db5c5ff1f1f72c27fd80ed4f2206fc9f17ac1eaff2486530884be989eaeaae77eff6f536909d961060ee4bed33498ef49ca22b5b22f90cc0bf6c5b8cb5bed0
+    REF v5.89.0
+    SHA512 815672fc572b22c51761476da9c82bc128a6a66ede39b5b9e09592c415908064d2b2f0c39674b702f503eeb48f33d0d4443d200bc2830b63b5f4468db66b0d8f
     HEAD_REF master
 )
 
 # Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
@@ -28,5 +28,3 @@ endif()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
-
diff --git a/ports/kf5auth/vcpkg.json b/ports/kf5auth/vcpkg.json
index fb0885215acee2..e821fee90fd084 100644
--- a/ports/kf5auth/vcpkg.json
+++ b/ports/kf5auth/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5auth",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Execute actions as privileged user",
   "homepage": "https://api.kde.org/frameworks/kauth/html/index.html",
   "dependencies": [
diff --git a/ports/kf5bookmarks/portfile.cmake b/ports/kf5bookmarks/portfile.cmake
index fd167c08221ed5..159f79ffa67066 100644
--- a/ports/kf5bookmarks/portfile.cmake
+++ b/ports/kf5bookmarks/portfile.cmake
@@ -1,17 +1,17 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kbookmarks
-    REF v5.88.0
-    SHA512 cb5ed71cf802b0bb9ccc94e65450cc7541fc90e14fe3b07780ffcfc72706fecfa887a41d90d7d56cf9bac7ef4d39cfd803a0d1f6b3bf139f5f09b6c54b88d89b
+    REF v5.89.0
+    SHA512 590b95c049600745995c76c2c7b8033eb591f8b7c1a2b832068a0e0d668858e04b1ed4a1fc8d2ef3c7fe43c5f3b7b311a7d0626a1053706fd46cbc5506c222b8
     HEAD_REF master
 )
 
 # Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
+    OPTIONS
         -DBUILD_TESTING=OFF
 )
 
@@ -27,4 +27,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
diff --git a/ports/kf5bookmarks/vcpkg.json b/ports/kf5bookmarks/vcpkg.json
index b7bbd1d22748f1..5064aa9eebca3d 100644
--- a/ports/kf5bookmarks/vcpkg.json
+++ b/ports/kf5bookmarks/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5bookmarks",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Bookmarks management library",
   "homepage": "https://api.kde.org/frameworks/kbookmarks/html/index.html",
   "dependencies": [
diff --git a/ports/kf5codecs/portfile.cmake b/ports/kf5codecs/portfile.cmake
index 00bf32de99b33d..538664fa9ec6e6 100644
--- a/ports/kf5codecs/portfile.cmake
+++ b/ports/kf5codecs/portfile.cmake
@@ -1,13 +1,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kcodecs
-    REF v5.88.0
-    SHA512 b7554fa98f98eed76d3b41e15a51e632c90eafb9547969d0394b09315cbed13c43a3e2c50e766d874f28a28df54526de921f70189c054dbb91500ae423931fdf
+    REF v5.89.0
+    SHA512 77104ab234d0b0baf00c2d3a37d366dc36c6f831c0fa011cb5ad965310e5317bbca3b569d9202123ed23b70137fe61ffec1689f51cccf8d60cc750913d36856f
     HEAD_REF master
 )
 
 # Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
 
 find_program(GPERF_EXE NAMES gperf PATHS "${CURRENT_HOST_INSTALLED_DIR}/tools" NO_DEFAULT_PATH)
 
@@ -23,7 +23,7 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Codecs CONFIG_PATH lib/cmake/KF5Codecs)
 
 vcpkg_copy_pdbs()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")	
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
@@ -31,4 +31,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
diff --git a/ports/kf5codecs/vcpkg.json b/ports/kf5codecs/vcpkg.json
index 246278a5f18c2e..3e53561c2509bc 100644
--- a/ports/kf5codecs/vcpkg.json
+++ b/ports/kf5codecs/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5codecs",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "String encoding library",
   "homepage": "https://api.kde.org/frameworks/kcodecs/html/index.html",
   "dependencies": [
diff --git a/ports/kf5completion/portfile.cmake b/ports/kf5completion/portfile.cmake
index 182d9bb35c8210..a66913e1ab4a49 100644
--- a/ports/kf5completion/portfile.cmake
+++ b/ports/kf5completion/portfile.cmake
@@ -1,31 +1,30 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/kcompletion
-    REF v5.88.0
-    SHA512 fc9dc7dde3d515523417308b8c73717c1ae628b3cb6276ac7e229a300ff61231d06bf02caba1d5ac77f2a1a85d21705e2a0830963390870baa58417d124aaa1b
-    HEAD_REF master
-)
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DBUILD_TESTING=OFF
-        -DBUILD_DESIGNERPLUGIN=OFF
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Completion CONFIG_PATH lib/cmake/KF5Completion)
-vcpkg_copy_pdbs()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/kcompletion
+    REF v5.89.0
+    SHA512 26211e45497bfc324503213fdc31acc062fca9c203a192b92e06cd41385df6d207c592fb84bbed1e55627418685ff99347129704f09f98302d03e9ef57c4ed78
+    HEAD_REF master
+)
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DBUILD_DESIGNERPLUGIN=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Completion CONFIG_PATH lib/cmake/KF5Completion)
+vcpkg_copy_pdbs()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5completion/vcpkg.json b/ports/kf5completion/vcpkg.json
index abb130f80d6981..a5619c4b036310 100644
--- a/ports/kf5completion/vcpkg.json
+++ b/ports/kf5completion/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5completion",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Text completion helpers and widgets",
   "homepage": "https://api.kde.org/frameworks/kcompletion/html/index.html",
   "dependencies": [
diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake
index d572b212a23ca9..3abf465951cb2b 100644
--- a/ports/kf5config/portfile.cmake
+++ b/ports/kf5config/portfile.cmake
@@ -1,50 +1,48 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/kconfig
-    REF v5.88.0
-    SHA512 c38d40bf132868ba8e152aba043580cff137db2d752b5d218e29a71defd5a3f8f681aa56ced3873def7423c429377106ff4a049abaa4721a83df2b83c7fbc2a6
-    HEAD_REF master
-)
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DBUILD_TESTING=OFF
-        -DKDE_INSTALL_LIBEXECDIR=bin
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Config CONFIG_PATH lib/cmake/KF5Config)
-vcpkg_copy_pdbs()
-
-vcpkg_copy_tools(
-    TOOL_NAMES kreadconfig5 kwriteconfig5
-    AUTO_CLEAN
-)
-
-if(NOT VCPKG_TARGET_IS_WINDOWS)
-    set(LIBEXEC_SUBFOLDER "kf5/")
-endif()
-
-vcpkg_copy_tools(
-    TOOL_NAMES kconf_update kconfig_compiler_kf5
-    SEARCH_DIR "${CURRENT_PACKAGES_DIR}/bin/${LIBEXEC_SUBFOLDER}"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${LIBEXEC_SUBFOLDER}"
-    AUTO_CLEAN
-)
-
-file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ../../share")
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")	
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")	
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
-
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/kconfig
+    REF v5.89.0
+    SHA512 5b61812cd8b1d4cbbcc97e4ae350f5e46de9e7d73e3c68e3fbea3a2bad6a6be104c111ddcab9696593b60d34f74f3d4d7f828f54ad8d1f7b3408925b4bc51640
+    HEAD_REF master
+)
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DKDE_INSTALL_LIBEXECDIR=bin
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Config CONFIG_PATH lib/cmake/KF5Config)
+vcpkg_copy_pdbs()
+
+vcpkg_copy_tools(
+    TOOL_NAMES kreadconfig5 kwriteconfig5
+    AUTO_CLEAN
+)
+
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+    set(LIBEXEC_SUBFOLDER "kf5/")
+endif()
+
+vcpkg_copy_tools(
+    TOOL_NAMES kconf_update kconfig_compiler_kf5
+    SEARCH_DIR "${CURRENT_PACKAGES_DIR}/bin/${LIBEXEC_SUBFOLDER}"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${LIBEXEC_SUBFOLDER}"
+    AUTO_CLEAN
+)
+
+file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ../../share")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5config/vcpkg.json b/ports/kf5config/vcpkg.json
index b663bd312862ac..2e3c6fe3b6aa7c 100644
--- a/ports/kf5config/vcpkg.json
+++ b/ports/kf5config/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5config",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Configuration system",
   "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html",
   "dependencies": [
diff --git a/ports/kf5configwidgets/portfile.cmake b/ports/kf5configwidgets/portfile.cmake
index b8f5b7a79349a1..e314320d7f04cb 100644
--- a/ports/kf5configwidgets/portfile.cmake
+++ b/ports/kf5configwidgets/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kconfigwidgets
-    REF v5.88.0
-    SHA512 7272510a2df3a74bab5c4defca7dc6a4d7bdde4205ae75f9c22938f9458ad5fc5dbdc71fbe7d536b9dd96404fde5da3dbf098d400e03b48cb9906ec1d7a9bd4d
+    REF v5.89.0
+    SHA512 4dfc69c9b6126509df95d89172da0dfaaaa38cb497a3fda34b96a9fd25503998ab8124308a11e6894aed08feab4a122af775c2d375d0cac0736f85779e4d772e
     HEAD_REF master
 )
 
@@ -13,7 +13,7 @@ vcpkg_check_features(
 )
 
 # Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
@@ -37,4 +37,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
diff --git a/ports/kf5configwidgets/vcpkg.json b/ports/kf5configwidgets/vcpkg.json
index cf80167fc51bd1..a844fb52151121 100644
--- a/ports/kf5configwidgets/vcpkg.json
+++ b/ports/kf5configwidgets/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5configwidgets",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Widgets for configuration dialogs",
   "homepage": "https://api.kde.org/frameworks/kconfigwidgets/html/index.html",
   "dependencies": [
diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake
index 1fcfad8482e502..36cb5cc9b14e88 100644
--- a/ports/kf5coreaddons/portfile.cmake
+++ b/ports/kf5coreaddons/portfile.cmake
@@ -1,38 +1,37 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/kcoreaddons
-    REF v5.88.0
-    SHA512 2fd95d3f24341af52338ad8a1b88c53270fe41fce03a5c9f5bba45ba1516ff23fa7adda118d8f231c8d6ef6bb01c34e334da779ae84f16238128acbc9c01e7e8
-    PATCHES
-        fix_cmake_config.patch # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/129
-)
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DBUILD_TESTING=OFF
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5CoreAddons CONFIG_PATH lib/cmake/KF5CoreAddons)
-vcpkg_copy_pdbs()
-
-vcpkg_copy_tools( 
-    TOOL_NAMES desktoptojson
-    AUTO_CLEAN
-)
-
-file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../share")
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")	
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/kcoreaddons
+    REF v5.89.0
+    SHA512 60b3ffdc69ff39e9d7edf23458d5ed5d063a55cae90d63ced18dc5db16eab027aa39d14a3a8507e7330dfc768e5ab8f77c1770874ad76807ec31a9ee4e0491a4
+    PATCHES
+        fix_cmake_config.patch # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/129
+)
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5CoreAddons CONFIG_PATH lib/cmake/KF5CoreAddons)
+vcpkg_copy_pdbs()
+
+vcpkg_copy_tools(
+    TOOL_NAMES desktoptojson
+    AUTO_CLEAN
+)
+
+file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../share")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5coreaddons/vcpkg.json b/ports/kf5coreaddons/vcpkg.json
index f1552681f49f45..7ea1f782b3cb3c 100644
--- a/ports/kf5coreaddons/vcpkg.json
+++ b/ports/kf5coreaddons/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5coreaddons",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Addons to QtCore",
   "homepage": "https://api.kde.org/frameworks/kcoreaddons/html/index.html",
   "dependencies": [
diff --git a/ports/kf5crash/portfile.cmake b/ports/kf5crash/portfile.cmake
index 0037a15bf4722c..8cf3567ad47047 100644
--- a/ports/kf5crash/portfile.cmake
+++ b/ports/kf5crash/portfile.cmake
@@ -1,13 +1,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kcrash
-    REF v5.88.0
-    SHA512 1b5a3ed1d0728973ce47a17a5d3ff6d66759dbfffbc000c7f4fcc0bbaded801e7eb89298dce406ca32977c9043d6aa3f870e07194906ea40b8a106287663803a
+    REF v5.89.0
+    SHA512 8493f9264e7844eefadd7bfa1700fa25baec2db9fd3cc8c85069d8a3c6452982d00ec1bb8e870ff9011391866e94cf63dfc8207d27d87b1b9b76e14b6ad5943d
     HEAD_REF master
 )
 
 # Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
@@ -27,5 +27,3 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()
 
 file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
-
diff --git a/ports/kf5crash/vcpkg.json b/ports/kf5crash/vcpkg.json
index be0c6bb674e961..f4588397ed7648 100644
--- a/ports/kf5crash/vcpkg.json
+++ b/ports/kf5crash/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5crash",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "KCrash provides support for intercepting and handling application crashes.",
   "homepage": "https://api.kde.org/frameworks/kcrash/html/index.html",
   "dependencies": [
diff --git a/ports/kf5dbusaddons/portfile.cmake b/ports/kf5dbusaddons/portfile.cmake
index ee837db299691b..c3e125188e1a75 100644
--- a/ports/kf5dbusaddons/portfile.cmake
+++ b/ports/kf5dbusaddons/portfile.cmake
@@ -1,15 +1,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kdbusaddons
-    REF v5.88.0
-    SHA512 2ec44db614de6c705dbf43915d28afd2f945cb71d12c5a1dac6d2f76592970c067a354b9e81dc5a05a676b5e33ef78172687b3ec0e895041d72d4b7cf06925bb
+    REF v5.89.0
+    SHA512 83f748690efe8024f603057cc97ab713f82ba6fbdb4462bb6052a8e89945e4117d6b1f030e0064120ae7e34a9b06860ba77d56617d5663578f0ac11a74dba2db
     HEAD_REF master
-    PATCHES
-        x11_private_dependency.diff
 )
 
 # Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
@@ -33,4 +31,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
diff --git a/ports/kf5dbusaddons/vcpkg.json b/ports/kf5dbusaddons/vcpkg.json
index aa3a2c8672d423..6249aa2e08a24c 100644
--- a/ports/kf5dbusaddons/vcpkg.json
+++ b/ports/kf5dbusaddons/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5dbusaddons",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Convenience classes for D-Bus",
   "homepage": "https://api.kde.org/frameworks/kdbusaddons/html/index.html",
   "dependencies": [
diff --git a/ports/kf5dbusaddons/x11_private_dependency.diff b/ports/kf5dbusaddons/x11_private_dependency.diff
deleted file mode 100644
index 1054028bf47425..00000000000000
--- a/ports/kf5dbusaddons/x11_private_dependency.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/KF5DBusAddonsConfig.cmake.in b/KF5DBusAddonsConfig.cmake.in
-index 36f55e452635a8edc3a883fe58ac69d490e5e596..2f6f02fc4f3f70052b7206156e74d94f10037936 100644
---- a/KF5DBusAddonsConfig.cmake.in
-+++ b/KF5DBusAddonsConfig.cmake.in
-@@ -3,6 +3,11 @@
- include(CMakeFindDependencyMacro)
- find_dependency(Qt5DBus @REQUIRED_QT_VERSION@)
- 
-+if(NOT @BUILD_SHARED_LIBS@)
-+    if(@Qt5X11Extras_FOUND@)
-+        find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@)
-+    endif()
-+endif()
- 
- include("${CMAKE_CURRENT_LIST_DIR}/KF5DBusAddonsTargets.cmake")
- @PACKAGE_INCLUDE_QCHTARGETS@
diff --git a/ports/kf5declarative/portfile.cmake b/ports/kf5declarative/portfile.cmake
index 5754ade9f7a35e..07b1b54e2e8418 100644
--- a/ports/kf5declarative/portfile.cmake
+++ b/ports/kf5declarative/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kdeclarative
-    REF v5.88.0
-    SHA512 3f65c7a7574be75eeca1248e9756810dc9302570f7f2469271ef5537f264ef9772b7926102a2f076f9e70aa510db691abf0ebf9d15e858e2dc9712d138c97821
+    REF v5.89.0
+    SHA512 baad15ef1288e215a269c7b69d2de3659508ce16f91e7f20ec9255ed07810b22ea7e04f7446c50715f7b4abe2809c22d9911f03a5cc0791f7b9e5298f9e2ac59
     HEAD_REF master
 )
 
@@ -12,17 +12,17 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 )
 
 # Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
+    OPTIONS
         -DBUILD_TESTING=OFF
         -DKDE_INSTALL_QTPLUGINDIR=plugins
         -DBUNDLE_INSTALL_DIR=bin
         -DKDE_INSTALL_QMLDIR=qml
         ${FEATURE_OPTIONS}
-    MAYBE_UNUSED_VARIABLES 
+    MAYBE_UNUSED_VARIABLES
         CMAKE_DISABLE_FIND_PACKAGE_EPOXY
         BUNDLE_INSTALL_DIR
 )
diff --git a/ports/kf5declarative/vcpkg.json b/ports/kf5declarative/vcpkg.json
index ef02aed918ab3b..5407b3989f70a2 100644
--- a/ports/kf5declarative/vcpkg.json
+++ b/ports/kf5declarative/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5declarative",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Integration of QML and KDE work spaces",
   "homepage": "https://api.kde.org/frameworks/kdeclarative/html/index.html",
   "dependencies": [
diff --git a/ports/kf5globalaccel/portfile.cmake b/ports/kf5globalaccel/portfile.cmake
index f1e5866409b2ec..3b0b1d070dcc0e 100644
--- a/ports/kf5globalaccel/portfile.cmake
+++ b/ports/kf5globalaccel/portfile.cmake
@@ -1,35 +1,33 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/kglobalaccel
-    REF v5.88.0
-    SHA512 cf0e9c2414944efc0e612ef9db171ac861a7fb686bd1f5ba2eb8e6e4bbc96b4970b41bb3811bc11145124f5ec3ad3b87d2b7933b482d5240413b355cb47a3306
-    HEAD_REF master
-    PATCHES
-        xcb_xtest_optional.diff # https://invent.kde.org/frameworks/kglobalaccel/-/merge_requests/30
-)
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DBUILD_TESTING=OFF
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5GlobalAccel CONFIG_PATH lib/cmake/KF5GlobalAccel)
-vcpkg_copy_pdbs()
-
-vcpkg_copy_tools(
-    TOOL_NAMES kglobalaccel5
-    AUTO_CLEAN
- )
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/kglobalaccel
+    REF v5.89.0
+    SHA512 824e4d6204189290dcc542ef3004ad2e2e2f83620dbf381ab78edbef996f412996709b9b49b72aad7c23deeeb6be274906b4cbbbd49498be081330e89c5674de
+    HEAD_REF master
+)
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5GlobalAccel CONFIG_PATH lib/cmake/KF5GlobalAccel)
+vcpkg_copy_pdbs()
+
+vcpkg_copy_tools(
+    TOOL_NAMES kglobalaccel5
+    AUTO_CLEAN
+ )
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5globalaccel/vcpkg.json b/ports/kf5globalaccel/vcpkg.json
index 67fe74c0255016..dbc60bfaa6460e 100644
--- a/ports/kf5globalaccel/vcpkg.json
+++ b/ports/kf5globalaccel/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5globalaccel",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "lobal desktop keyboard shortcuts",
   "homepage": "https://api.kde.org/frameworks/kglobalaccel/html/index.html",
   "dependencies": [
diff --git a/ports/kf5globalaccel/xcb_xtest_optional.diff b/ports/kf5globalaccel/xcb_xtest_optional.diff
deleted file mode 100644
index affb39e4d5eb1d..00000000000000
--- a/ports/kf5globalaccel/xcb_xtest_optional.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b5b58f6..17eaed8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -49,7 +49,7 @@ find_package(KF5WindowSystem ${KF_DEP_VERSION} REQUIRED)
- 
- # no X11 stuff on mac
- if (NOT APPLE)
--    find_package(XCB MODULE COMPONENTS XCB KEYSYMS XTEST XKB)
-+    find_package(XCB MODULE COMPONENTS XCB KEYSYMS XKB OPTIONAL_COMPONENTS XTEST)
-     set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding"
-                        URL "http://xcb.freedesktop.org"
-                        TYPE OPTIONAL
diff --git a/ports/kf5guiaddons/portfile.cmake b/ports/kf5guiaddons/portfile.cmake
index d622f9a4c41827..07048be6d09779 100644
--- a/ports/kf5guiaddons/portfile.cmake
+++ b/ports/kf5guiaddons/portfile.cmake
@@ -1,46 +1,44 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/kguiaddons
-    REF v5.88.0
-    SHA512 91aeb4da44814c574016205f2684fc41a41a5c54c0ee1c1cdb15e4b089abc025877e1bae6a3504240bd7561ab6eb766e40d1ae29b1411f43256cad5c68625aa1
-    HEAD_REF master
-    PATCHES
-        fix_cmake.patch # https://github.com/microsoft/vcpkg/issues/17607#issuecomment-831518812
-)
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-    FEATURES
-        wayland   WITH_WAYLAND
-)
-
-if("wayland" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_LINUX)
-    message(FATAL_ERROR "Feature wayland is only supported on Linux.")
-endif()
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DBUILD_TESTING=OFF
-        -DQtWaylandScanner_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/qt5-wayland/bin/qtwaylandscanner
-        ${FEATURE_OPTIONS}
-    MAYBE_UNUSED_VARIABLES
-        QtWaylandScanner_EXECUTABLE
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5GuiAddons CONFIG_PATH lib/cmake/KF5GuiAddons)
-vcpkg_copy_pdbs()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
-
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/kguiaddons
+    REF v5.89.0
+    SHA512 062a8da3a5d3f9da3288031f8e694fd6adb5b4f404071f2d66c7f4d5b15cbf10fedff58d9db928e45a052b69abbe38d7de57349638d8bb9a229798a553e3b9ed
+    HEAD_REF master
+    PATCHES
+        fix_cmake.patch # https://github.com/microsoft/vcpkg/issues/17607#issuecomment-831518812
+)
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
+        wayland   WITH_WAYLAND
+)
+
+if("wayland" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_LINUX)
+    message(FATAL_ERROR "Feature wayland is only supported on Linux.")
+endif()
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DQtWaylandScanner_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/qt5-wayland/bin/qtwaylandscanner
+        ${FEATURE_OPTIONS}
+    MAYBE_UNUSED_VARIABLES
+        QtWaylandScanner_EXECUTABLE
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5GuiAddons CONFIG_PATH lib/cmake/KF5GuiAddons)
+vcpkg_copy_pdbs()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5guiaddons/vcpkg.json b/ports/kf5guiaddons/vcpkg.json
index c01c96aff0f049..ca00997c9017a2 100644
--- a/ports/kf5guiaddons/vcpkg.json
+++ b/ports/kf5guiaddons/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5guiaddons",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Addons to QtGui",
   "homepage": "https://api.kde.org/frameworks/kguiaddons/html/index.html",
   "dependencies": [
diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake
index 27d811ced12d86..df9d162c8ce21d 100644
--- a/ports/kf5holidays/portfile.cmake
+++ b/ports/kf5holidays/portfile.cmake
@@ -1,31 +1,30 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/kholidays
-    REF v5.88.0
-    SHA512 21f2ac98f5596d830e93057d468389c6bb6b4b03346cf220e2271fa72d53df4eaba2ae2052fda6ddd7b264481cdd4118248ae2a5655cdfa5ee2777ec016dedb2
-    HEAD_REF master
-)
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DBUILD_TESTING=OFF
-        -DKDE_INSTALL_QMLDIR=qml
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Holidays CONFIG_PATH lib/cmake/KF5Holidays)
-vcpkg_copy_pdbs()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/kholidays
+    REF v5.89.0
+    SHA512 df5a68c9faf2c05b30b161f2e9f363f252be2efd9ec89787a88952fecb91d36b0187e9c88bdedde6887086f5ead4aa5d6ff627c9ea267cd447d5d7ad938b5d65
+    HEAD_REF master
+)
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DKDE_INSTALL_QMLDIR=qml
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Holidays CONFIG_PATH lib/cmake/KF5Holidays)
+vcpkg_copy_pdbs()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5holidays/vcpkg.json b/ports/kf5holidays/vcpkg.json
index 10ee0eccaa59b3..5055e2a83a030e 100644
--- a/ports/kf5holidays/vcpkg.json
+++ b/ports/kf5holidays/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5holidays",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Holiday calculation library",
   "dependencies": [
     "ecm",
diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake
index 5a0fd5e21e5c7d..078c5a5adce54f 100644
--- a/ports/kf5i18n/portfile.cmake
+++ b/ports/kf5i18n/portfile.cmake
@@ -1,39 +1,38 @@
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
-     list(APPEND PATCHES fix_static_builds.patch)
-endif()
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/ki18n
-    REF v5.88.0
-    SHA512 211b7dd18f5063908042e418ede0845fb3fe1a4ef42a3a1e0e31c118fddfb5e59408a49ba37bde445b5adf85b0c3f75a346391fb3e960d6eb703b760083ec6f5
-    PATCHES ${PATCHES}
-)
-
-vcpkg_find_acquire_program(PYTHON3)
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DBUILD_TESTING=OFF
-        -DKDE_INSTALL_PLUGINDIR=plugins
-        -DKDE_INSTALL_QMLDIR=qml
-        -DPYTHON_EXECUTABLE=${PYTHON3}
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5I18n CONFIG_PATH lib/cmake/KF5I18n)
-vcpkg_copy_pdbs()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+     list(APPEND PATCHES fix_static_builds.patch)
+endif()
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/ki18n
+    REF v5.89.0
+    SHA512 f83d8b9ef51cc05a2eccb175e602fd0530d0cb6bb0c21e582a82fdd2897d9f988c2d927f2dc986faaf7482ec1c81e8cea4a9e74fc557c88be9958393db71c2a9
+    PATCHES ${PATCHES}
+)
+
+vcpkg_find_acquire_program(PYTHON3)
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DKDE_INSTALL_PLUGINDIR=plugins
+        -DKDE_INSTALL_QMLDIR=qml
+        -DPYTHON_EXECUTABLE=${PYTHON3}
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5I18n CONFIG_PATH lib/cmake/KF5I18n)
+vcpkg_copy_pdbs()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5i18n/vcpkg.json b/ports/kf5i18n/vcpkg.json
index 783be2ed61933a..6aeeada8055c83 100644
--- a/ports/kf5i18n/vcpkg.json
+++ b/ports/kf5i18n/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5i18n",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Advanced internationalization framework",
   "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html",
   "dependencies": [
diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake
index ab037950aba121..9486d26fb45522 100644
--- a/ports/kf5iconthemes/portfile.cmake
+++ b/ports/kf5iconthemes/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kiconthemes
-    REF v5.88.0
-    SHA512 197fa4bfeabb459e22c7522d5358bf37c0bf5adc7b6a0605e1ef884dee8d1a02df7fb988b0e2d4821e5c889cd4de2c2fe0d9b7da0266f0869f6779edf57aa5be
+    REF v5.89.0
+    SHA512 d876f4a67d667a881820280c51fac8ddcdb99414f8c810422dd20be370173c036abcec3168495009242d479520a379be0c8ee4bea637023584e52c9452d9b3b7
     HEAD_REF master
 )
 
@@ -13,7 +13,7 @@ vcpkg_check_features(
  )
 
 # Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
@@ -47,4 +47,3 @@ endif()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
diff --git a/ports/kf5iconthemes/vcpkg.json b/ports/kf5iconthemes/vcpkg.json
index 6882a7c1dc545b..a7e496cd052e92 100644
--- a/ports/kf5iconthemes/vcpkg.json
+++ b/ports/kf5iconthemes/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5iconthemes",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Icon GUI utilities",
   "homepage": "https://api.kde.org/frameworks/kiconthemes/html/index.html",
   "dependencies": [
diff --git a/ports/kf5itemmodels/portfile.cmake b/ports/kf5itemmodels/portfile.cmake
index 224aae766a6a10..04c74eda41912d 100644
--- a/ports/kf5itemmodels/portfile.cmake
+++ b/ports/kf5itemmodels/portfile.cmake
@@ -1,31 +1,29 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/kitemmodels
-    REF v5.88.0
-    SHA512 dba2760da81de9c8e48b67bec2edb3b376b05328afec213190ffbc678918cea6b13b96afbe6300a7c1dc3b956dd82419f1de70fea60a587155ac278ce5e33b1f
-)
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DBUILD_TESTING=OFF
-        -DKDE_INSTALL_QMLDIR=qml
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5ItemModels CONFIG_PATH lib/cmake/KF5ItemModels)
-vcpkg_copy_pdbs()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
-
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/kitemmodels
+    REF v5.89.0
+    SHA512 4d7730994f935bd0929e8ceacfaed945e784cebdc86642c6148ce21108c4ffe792774196613c8b3215354069db85d276a30c6608445961f67aeb1b420a579007
+)
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DKDE_INSTALL_QMLDIR=qml
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5ItemModels CONFIG_PATH lib/cmake/KF5ItemModels)
+vcpkg_copy_pdbs()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5itemmodels/vcpkg.json b/ports/kf5itemmodels/vcpkg.json
index ffa88e7025ee88..f289009c755b88 100644
--- a/ports/kf5itemmodels/vcpkg.json
+++ b/ports/kf5itemmodels/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5itemmodels",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Models for Qt Model/View system",
   "homepage": "https://api.kde.org/frameworks/kitemmodels/html/index.html",
   "dependencies": [
diff --git a/ports/kf5itemviews/portfile.cmake b/ports/kf5itemviews/portfile.cmake
index 769876bb14e8d3..f1efb9e1c8047c 100644
--- a/ports/kf5itemviews/portfile.cmake
+++ b/ports/kf5itemviews/portfile.cmake
@@ -1,31 +1,29 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/kitemviews
-    REF v5.88.0
-    SHA512 585cd6446951b57eb44b460179f14fcd75da20be4648d01c1ac3d1670b7a8b32fcd887700500264ef7f3568d57f0375ae929aaf502f0286152c21af708c1ed87
-)
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DBUILD_TESTING=OFF
-        -DBUILD_DESIGNERPLUGIN=OFF
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5ItemViews CONFIG_PATH lib/cmake/KF5ItemViews)
-vcpkg_copy_pdbs()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
-
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/kitemviews
+    REF v5.89.0
+    SHA512 c96cb1204d5e9d0b1206eac93f36b06c94b7fcf63c7a75938e50783af1e7d3fe48617fadd264f55f2ac31c3d316a062b9200053a582ccf2e7c927659b7e1b442
+)
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DBUILD_DESIGNERPLUGIN=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5ItemViews CONFIG_PATH lib/cmake/KF5ItemViews)
+vcpkg_copy_pdbs()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5itemviews/vcpkg.json b/ports/kf5itemviews/vcpkg.json
index 1cfc792207b340..444aa1f79ae6f7 100644
--- a/ports/kf5itemviews/vcpkg.json
+++ b/ports/kf5itemviews/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5itemviews",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Widget addons for Qt Model/View",
   "homepage": "https://api.kde.org/frameworks/kitemviews/html/index.html",
   "dependencies": [
diff --git a/ports/kf5jobwidgets/portfile.cmake b/ports/kf5jobwidgets/portfile.cmake
index 2a53c1d423c59e..e34c97193e8df0 100644
--- a/ports/kf5jobwidgets/portfile.cmake
+++ b/ports/kf5jobwidgets/portfile.cmake
@@ -1,32 +1,30 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/kjobwidgets
-    REF v5.88.0
-    SHA512 9d945adc0194a8f5cfea702c5f60b2046f5b350094959fa67a648a8dc23d3445304e96f5a75e03ec33281e63e606fb0e0893ac79a3cc438c5b302c37b7882838
-    HEAD_REF master
-)
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DBUILD_TESTING=OFF
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5JobWidgets CONFIG_PATH lib/cmake/KF5JobWidgets)
-
-vcpkg_copy_pdbs()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
-
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/kjobwidgets
+    REF v5.89.0
+    SHA512 6fcc1fbef4de8adde1577739a28b5a3671829b24d4d8885a6b22f7b99662f058502183ab7d4f8c47f2c69f02a1932ac94a55be93bd6245fe97d8819644b1e708
+    HEAD_REF master
+)
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5JobWidgets CONFIG_PATH lib/cmake/KF5JobWidgets)
+
+vcpkg_copy_pdbs()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5jobwidgets/vcpkg.json b/ports/kf5jobwidgets/vcpkg.json
index 42b20f0086d496..8a616421286493 100644
--- a/ports/kf5jobwidgets/vcpkg.json
+++ b/ports/kf5jobwidgets/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5jobwidgets",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Widgets for showing progress of asynchronous jobs",
   "homepage": "https://api.kde.org/frameworks/kjobwidgets/html/index.html",
   "dependencies": [
diff --git a/ports/kf5kcmutils/portfile.cmake b/ports/kf5kcmutils/portfile.cmake
index 320e14fb115bac..da0a49637c96f9 100644
--- a/ports/kf5kcmutils/portfile.cmake
+++ b/ports/kf5kcmutils/portfile.cmake
@@ -1,17 +1,17 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kcmutils
-    REF v5.88.0
-    SHA512 7a2adee5bc2d8665173512e41917a7b8628444ca928150f7d3fc4766efef198fde5d3a81c28efc302dacca99124966dc1789609fd62ba4f9e307819a6523441c
+    REF v5.89.0
+    SHA512 9f12e906d9bd763906d6c9a0ebbefec1b7d1e958a217de5ed7ea418c8fcda1dbaccd8df89a849019aa81303fc4540b26872d205e7215285c4f312e8bbfcb97d0
     HEAD_REF master
 )
 
 # Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
+    OPTIONS
         -DBUILD_TESTING=OFF
 )
 
diff --git a/ports/kf5kcmutils/vcpkg.json b/ports/kf5kcmutils/vcpkg.json
index 5e13a3953a8b1a..85309cd383b92a 100644
--- a/ports/kf5kcmutils/vcpkg.json
+++ b/ports/kf5kcmutils/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5kcmutils",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Utilities for KDE System Settings modules",
   "homepage": "https://api.kde.org/frameworks/kcmutils/html/index.html",
   "dependencies": [
diff --git a/ports/kf5kio/portfile.cmake b/ports/kf5kio/portfile.cmake
index ebd668869b84e2..12fdb59163db1e 100644
--- a/ports/kf5kio/portfile.cmake
+++ b/ports/kf5kio/portfile.cmake
@@ -5,8 +5,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kio
-    REF v5.88.0
-    SHA512 c2f98b7286c4e9cef6e63a620077273630ea01cc74266170008731c080dde73dff9cbe289a0a2fe3c1423014ed2627cec3ead332ba90321b43b6a287a85ed5d9
+    REF v5.89.0-rc2
+    SHA512 08df36c08b028998884983fa233aad5bfc05d4e9e5899ed85390015daa7e0703272edabc59189579957e9971435887c4486796061878ce0f252ac2259b78a799
     HEAD_REF master
     PATCHES
         ${PATCHES}
@@ -19,7 +19,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 )
 
 # Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
@@ -63,4 +63,3 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()
 
 file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
diff --git a/ports/kf5kio/vcpkg.json b/ports/kf5kio/vcpkg.json
index 045378a304125a..3f06846fc6d12f 100644
--- a/ports/kf5kio/vcpkg.json
+++ b/ports/kf5kio/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5kio",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Network transparent access to files and data",
   "homepage": "https://api.kde.org/frameworks/kio/html/index.html",
   "dependencies": [
diff --git a/ports/kf5newstuff/portfile.cmake b/ports/kf5newstuff/portfile.cmake
index a4ca74a8d5d891..ddb0527c2ec06f 100644
--- a/ports/kf5newstuff/portfile.cmake
+++ b/ports/kf5newstuff/portfile.cmake
@@ -1,13 +1,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/knewstuff
-    REF v5.88.0
-    SHA512 7ed98ec253a35b10694964ecdbfd77afa640032536d189eeef52a5e32fb0b591baeced6d163f469183dd1515f9ebd26bc60952066d4a884834e572682f5ff393
+    REF v5.89.0
+    SHA512 e031fc985ad29be177b438667c624c6706a45edd7029b8144d712e04b9b3f5c8bc7aebea9e2a09afe2a2f28db078f58969cb63bf7dccd5d2e1e05dcbc456766b
     HEAD_REF master
 )
 
 # Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
@@ -36,4 +36,3 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()
 
 file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
diff --git a/ports/kf5newstuff/vcpkg.json b/ports/kf5newstuff/vcpkg.json
index ad5292d0b173b0..a435e8b05215de 100644
--- a/ports/kf5newstuff/vcpkg.json
+++ b/ports/kf5newstuff/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5newstuff",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Framework for downloading and sharing additional application data",
   "homepage": "https://api.kde.org/frameworks/knewstuff/html/index.html",
   "dependencies": [
diff --git a/ports/kf5notifications/portfile.cmake b/ports/kf5notifications/portfile.cmake
index bc93cf6afa43d7..e44c59b76485b5 100644
--- a/ports/kf5notifications/portfile.cmake
+++ b/ports/kf5notifications/portfile.cmake
@@ -1,13 +1,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/knotifications
-    REF v5.88.0
-    SHA512 d805853d4cbc5652a28270210e9b09706f5e630287478caf3ad745692318c4ebe734b89eeb7d4aaa178fea850669afb136ead1aadb9e97442a84f7fd09d2655d
+    REF v5.89.0
+    SHA512 58e9fe34b29e0f6d7507a3a783918bcfbc8a191ddc7bb287c793628a97a2a203347971849100ae9a98d9f8a23c27ba184b509c11caf00517d8c6422ae91ac310
     HEAD_REF master
 )
 
 # Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
@@ -28,4 +28,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
diff --git a/ports/kf5notifications/vcpkg.json b/ports/kf5notifications/vcpkg.json
index 48b903da1f075d..1299e13af8ded6 100644
--- a/ports/kf5notifications/vcpkg.json
+++ b/ports/kf5notifications/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5notifications",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Desktop notifications",
   "homepage": "https://api.kde.org/frameworks/knotifications/html/index.html",
   "dependencies": [
diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake
index 0a355747b8336b..f58344ed04013c 100644
--- a/ports/kf5package/portfile.cmake
+++ b/ports/kf5package/portfile.cmake
@@ -1,33 +1,32 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/kpackage
-    REF v5.88.0
-    SHA512 e5d633c09482f977f11fc98894cd9e13d01ffe7166faac036d0d02e67d637604a752870e5fa3b639dada3b5869e72350d8e15e89e025d68184f7335588aa44f7
-    HEAD_REF master
-)
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DBUILD_TESTING=OFF
-        -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Package CONFIG_PATH lib/cmake/KF5Package)
-vcpkg_copy_pdbs()
-
-vcpkg_copy_tools(TOOL_NAMES kpackagetool5 AUTO_CLEAN)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/kpackage
+    REF v5.89.0
+    SHA512 0f008129d2675fb8faa274bc9d1389be6a4acee0be95eb06973762933a7306749742e852a83144c54523aacdd10e5a808c8c06834ff533719a6e66ccc62f7186
+    HEAD_REF master
+)
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Package CONFIG_PATH lib/cmake/KF5Package)
+vcpkg_copy_pdbs()
+
+vcpkg_copy_tools(TOOL_NAMES kpackagetool5 AUTO_CLEAN)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5package/vcpkg.json b/ports/kf5package/vcpkg.json
index 90a6c1587a8333..30d6ea179bd4fb 100644
--- a/ports/kf5package/vcpkg.json
+++ b/ports/kf5package/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5package",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Installation and loading of additional content (ex: scripts, images...) as packages",
   "homepage": "https://api.kde.org/frameworks/kpackage/html/index.html",
   "dependencies": [
diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake
index 1149cde8086f91..cd05b7ff557d72 100644
--- a/ports/kf5plotting/portfile.cmake
+++ b/ports/kf5plotting/portfile.cmake
@@ -1,17 +1,17 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kplotting
-    REF v5.88.0
-    SHA512 490eb410fada9c6a830464b309db77d231d0e06b19ac4e99a07b50d0cdc3bdfb13deb8d60863e47f3ccc350c72320f0515c7a52513892fb2bceea9e4f2fb35a4
+    REF v5.89.0
+    SHA512 4499f1820d2314041d78e48130f5f8ee30c677302c9a34a1f7e797d4ebd0ba4286278622c113907d9c224e753c528adc85cb55abd2d3132187553a5d7fbe382a
     HEAD_REF master
 )
 
 # Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
+    OPTIONS
         -DBUILD_TESTING=OFF
 )
 
@@ -24,4 +24,3 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/plugins" "${CURRENT_PACKAGES_DIR}
 file(RENAME "${CURRENT_PACKAGES_DIR}/lib/plugins" "${CURRENT_PACKAGES_DIR}/plugins")
 
 file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
diff --git a/ports/kf5plotting/vcpkg.json b/ports/kf5plotting/vcpkg.json
index 08457d4596a859..6a085aacc18510 100644
--- a/ports/kf5plotting/vcpkg.json
+++ b/ports/kf5plotting/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5plotting",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Lightweight plotting framework",
   "homepage": "https://api.kde.org/frameworks/kplotting/html/index.html",
   "dependencies": [
diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake
index 7b60f26cb4c2f2..afaebd0eb39cbd 100644
--- a/ports/kf5service/portfile.cmake
+++ b/ports/kf5service/portfile.cmake
@@ -1,60 +1,59 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/kservice
-    REF v5.88.0
-    SHA512 ffdd6564a28ffbc3724875df278064896a1cb1c8db1edda32a2543c352dbfeb6f5a6fec6b0c5effb714866c185e37d0a097f36ff4d03a1aa5625dba1585df6a6
-    HEAD_REF master
-)
-
-if(VCPKG_TARGET_IS_OSX)
-    # On Darwin platform, the bundled version of 'bison' may be too old (< 3.0).
-    vcpkg_find_acquire_program(BISON)
-    execute_process(
-        COMMAND ${BISON} --version
-        OUTPUT_VARIABLE BISON_OUTPUT
-    )
-    string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}")
-    set(BISON_MAJOR ${CMAKE_MATCH_1})
-    set(BISON_MINOR ${CMAKE_MATCH_2})
-    message(STATUS "Using bison: ${BISON_MAJOR}.${BISON_MINOR}.${CMAKE_MATCH_3}")
-    if(NOT (BISON_MAJOR GREATER_EQUAL 3 AND BISON_MINOR GREATER_EQUAL 0))
-        message(WARNING "${PORT} requires bison version greater than one provided by macOS, please use \`brew install bison\` to install a newer bison.")
-    endif()
-endif()
-
-vcpkg_find_acquire_program(BISON)
-vcpkg_find_acquire_program(FLEX)
-
-get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY)
-get_filename_component(BISON_DIR "${BISON}" DIRECTORY)
-
-vcpkg_add_to_path(PREPEND "${FLEX_DIR}")
-vcpkg_add_to_path(PREPEND "${BISON_DIR}")
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DBUILD_TESTING=OFF
-        -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Service CONFIG_PATH lib/cmake/KF5Service)
-vcpkg_copy_pdbs()
-
-vcpkg_copy_tools(
-     TOOL_NAMES kbuildsycoca5
-     AUTO_CLEAN
-)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")	
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/kservice
+    REF v5.89.0
+    SHA512 9809b7cb05b3164575e4f92cc979b34dad63945648e054621248fd92ce1c5885a048704ed11b1292446bb55940ed2c11e982a434bb0983c25de9938514b53c6d
+    HEAD_REF master
+)
+
+if(VCPKG_TARGET_IS_OSX)
+    # On Darwin platform, the bundled version of 'bison' may be too old (< 3.0).
+    vcpkg_find_acquire_program(BISON)
+    execute_process(
+        COMMAND ${BISON} --version
+        OUTPUT_VARIABLE BISON_OUTPUT
+    )
+    string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}")
+    set(BISON_MAJOR ${CMAKE_MATCH_1})
+    set(BISON_MINOR ${CMAKE_MATCH_2})
+    message(STATUS "Using bison: ${BISON_MAJOR}.${BISON_MINOR}.${CMAKE_MATCH_3}")
+    if(NOT (BISON_MAJOR GREATER_EQUAL 3 AND BISON_MINOR GREATER_EQUAL 0))
+        message(WARNING "${PORT} requires bison version greater than one provided by macOS, please use \`brew install bison\` to install a newer bison.")
+    endif()
+endif()
+
+vcpkg_find_acquire_program(BISON)
+vcpkg_find_acquire_program(FLEX)
+
+get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY)
+get_filename_component(BISON_DIR "${BISON}" DIRECTORY)
+
+vcpkg_add_to_path(PREPEND "${FLEX_DIR}")
+vcpkg_add_to_path(PREPEND "${BISON_DIR}")
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Service CONFIG_PATH lib/cmake/KF5Service)
+vcpkg_copy_pdbs()
+
+vcpkg_copy_tools(
+     TOOL_NAMES kbuildsycoca5
+     AUTO_CLEAN
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5service/vcpkg.json b/ports/kf5service/vcpkg.json
index 11fc9cc9ccb0f7..a7f375e6125f4a 100644
--- a/ports/kf5service/vcpkg.json
+++ b/ports/kf5service/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5service",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Plugin framework for desktop services",
   "homepage": "https://api.kde.org/frameworks/kservice/html/index.html",
   "dependencies": [
diff --git a/ports/kf5solid/portfile.cmake b/ports/kf5solid/portfile.cmake
index efabda9e37e877..cc4f0358ab3a94 100644
--- a/ports/kf5solid/portfile.cmake
+++ b/ports/kf5solid/portfile.cmake
@@ -1,69 +1,67 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/solid
-    REF v5.88.0
-    SHA512 2d39bac7ff1d5202c494b400974f454041b34aaa56a203340de2ef390e14c29131aaaf9a32766062c826aee7484f75047bacd87894c3ccf9289ec9b2272721f1
-    HEAD_REF master
-    PATCHES
-        fix-libmount.patch
-)
-
-if(VCPKG_TARGET_IS_OSX)
-    # On Darwin platform, the bundled version of 'bison' may be too old (< 3.0).
-    vcpkg_find_acquire_program(BISON)
-    execute_process(
-        COMMAND ${BISON} --version
-        OUTPUT_VARIABLE BISON_OUTPUT
-    )
-    string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}")
-    set(BISON_MAJOR ${CMAKE_MATCH_1})
-    set(BISON_MINOR ${CMAKE_MATCH_2})
-    message(STATUS "Using bison: ${BISON_MAJOR}.${BISON_MINOR}.${CMAKE_MATCH_3}")
-    if(NOT (BISON_MAJOR GREATER_EQUAL 3 AND BISON_MINOR GREATER_EQUAL 0))
-        message(WARNING "${PORT} requires bison version greater than one provided by macOS, please use \`brew install bison\` to install a newer bison.")
-    endif()
-endif()
-
-vcpkg_find_acquire_program(BISON)
-vcpkg_find_acquire_program(FLEX)
-
-get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY )
-get_filename_component(BISON_DIR "${BISON}" DIRECTORY )
-
-vcpkg_add_to_path(PREPEND "${FLEX_DIR}")
-vcpkg_add_to_path(PREPEND "${BISON_DIR}")
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
-  INVERTED_FEATURES
-    "libmount"          CMAKE_DISABLE_FIND_PACKAGE_LibMount
-)
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -DBUILD_TESTING=OFF
-        -DKDE_INSTALL_QMLDIR=qml
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Solid CONFIG_PATH lib/cmake/KF5Solid)
-vcpkg_copy_pdbs()
-
-vcpkg_copy_tools(
-    TOOL_NAMES solid-hardware5
-    AUTO_CLEAN
- )
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
-
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/solid
+    REF v5.89.0
+    SHA512 18d3c709756476870b6495bd5a99d70ec291a71a2f79dae954ce434953fb6299033c2dc85c68adf81031b03b70bf2e4798b7428da99c2ac28ddd6070cc413592
+    HEAD_REF master
+    PATCHES
+        fix-libmount.patch
+)
+
+if(VCPKG_TARGET_IS_OSX)
+    # On Darwin platform, the bundled version of 'bison' may be too old (< 3.0).
+    vcpkg_find_acquire_program(BISON)
+    execute_process(
+        COMMAND ${BISON} --version
+        OUTPUT_VARIABLE BISON_OUTPUT
+    )
+    string(REGEX MATCH "([0-9]+)\\.([0-9]+)\\.([0-9]+)" BISON_VERSION "${BISON_OUTPUT}")
+    set(BISON_MAJOR ${CMAKE_MATCH_1})
+    set(BISON_MINOR ${CMAKE_MATCH_2})
+    message(STATUS "Using bison: ${BISON_MAJOR}.${BISON_MINOR}.${CMAKE_MATCH_3}")
+    if(NOT (BISON_MAJOR GREATER_EQUAL 3 AND BISON_MINOR GREATER_EQUAL 0))
+        message(WARNING "${PORT} requires bison version greater than one provided by macOS, please use \`brew install bison\` to install a newer bison.")
+    endif()
+endif()
+
+vcpkg_find_acquire_program(BISON)
+vcpkg_find_acquire_program(FLEX)
+
+get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY )
+get_filename_component(BISON_DIR "${BISON}" DIRECTORY )
+
+vcpkg_add_to_path(PREPEND "${FLEX_DIR}")
+vcpkg_add_to_path(PREPEND "${BISON_DIR}")
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+  INVERTED_FEATURES
+    "libmount"          CMAKE_DISABLE_FIND_PACKAGE_LibMount
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DKDE_INSTALL_QMLDIR=qml
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Solid CONFIG_PATH lib/cmake/KF5Solid)
+vcpkg_copy_pdbs()
+
+vcpkg_copy_tools(
+    TOOL_NAMES solid-hardware5
+    AUTO_CLEAN
+ )
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5solid/vcpkg.json b/ports/kf5solid/vcpkg.json
index f0434e865d59ca..ec477c5b450ef1 100644
--- a/ports/kf5solid/vcpkg.json
+++ b/ports/kf5solid/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5solid",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Desktop hardware abstraction",
   "homepage": "https://api.kde.org/frameworks/solid/html/index.html",
   "dependencies": [
diff --git a/ports/kf5sonnet/portfile.cmake b/ports/kf5sonnet/portfile.cmake
index a2d1adfccea64b..f981c077c191a7 100644
--- a/ports/kf5sonnet/portfile.cmake
+++ b/ports/kf5sonnet/portfile.cmake
@@ -1,49 +1,47 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/sonnet
-    REF v5.88.0
-    SHA512 bfd56c43cd0bfefd0d12635aaca5a520d834ad7507c4d4a1a9dc6a0cb1271d1bc466cb8286aea57991f7a5cb10d9c10dddd8b4406be7e6eb79e26a46190527b2
-    HEAD_REF master
-)
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DBUILD_TESTING=OFF
-        -DBUILD_EXAMPLES=OFF
-        -DKDE_INSTALL_PLUGINDIR=plugins
-        -DKDE_INSTALL_QTPLUGINDIR=plugins
-        -DKDE_INSTALL_QMLDIR=qml
-)
-
-vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin")
-vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin")
-
-vcpkg_cmake_install()
-
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Sonnet CONFIG_PATH lib/cmake/KF5Sonnet)
-
-vcpkg_copy_tools(
-    TOOL_NAMES gentrigrams parsetrigrams
-    AUTO_CLEAN
-)
-
-file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../share")
-
-vcpkg_copy_pdbs()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/gentrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}")
-file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/parsetrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}")
-
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
-
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/sonnet
+    REF v5.89.0
+    SHA512 18e2b9f9553229853952e2b0e3e6fac9c87417014f607144419bfe10b9d40cf5b542b253a43e5305d75ccef525f8cce36c112e1bad9398365847d5ec2996e8e4
+    HEAD_REF master
+)
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DBUILD_EXAMPLES=OFF
+        -DKDE_INSTALL_PLUGINDIR=plugins
+        -DKDE_INSTALL_QTPLUGINDIR=plugins
+        -DKDE_INSTALL_QMLDIR=qml
+)
+
+vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin")
+vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin")
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Sonnet CONFIG_PATH lib/cmake/KF5Sonnet)
+
+vcpkg_copy_tools(
+    TOOL_NAMES gentrigrams parsetrigrams
+    AUTO_CLEAN
+)
+
+file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../share")
+
+vcpkg_copy_pdbs()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/gentrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/parsetrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5sonnet/vcpkg.json b/ports/kf5sonnet/vcpkg.json
index 3778971b1a8f3f..194bb46b22abef 100644
--- a/ports/kf5sonnet/vcpkg.json
+++ b/ports/kf5sonnet/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5sonnet",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Multi-language spell checker",
   "homepage": "https://api.kde.org/frameworks/sonnet/html/index.html",
   "dependencies": [
diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake
index 9ddc89ec504ab8..9cb527951225d1 100644
--- a/ports/kf5syntaxhighlighting/portfile.cmake
+++ b/ports/kf5syntaxhighlighting/portfile.cmake
@@ -1,40 +1,39 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/syntax-highlighting
-    REF v5.88.0
-    SHA512 0a7a108a3efc48e1aae1b62f9a03629949e82140f9b1f31408ba530310228a81205324e258cf4085358a00e1aa0db3e3e2608dfcfd8880b1cd402b9e796e2ac7
-    HEAD_REF master
-)
-
-vcpkg_find_acquire_program(PERL)
-get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
-vcpkg_add_to_path("${PERL_EXE_PATH}")
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DBUILD_TESTING=OFF
-        -DKDE_INSTALL_QMLDIR=qml
-)
-
-vcpkg_cmake_install(ADD_BIN_TO_PATH)
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5SyntaxHighlighting CONFIG_PATH lib/cmake/KF5SyntaxHighlighting)
-vcpkg_copy_pdbs()
-
-vcpkg_copy_tools(
-    TOOL_NAMES kate-syntax-highlighter
-    AUTO_CLEAN
-)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/syntax-highlighting
+    REF v5.89.0
+    SHA512 c92df10d236d736f3f944f25efac796636ef857049732c0359edb900a1686839c55303917ab2286935024e7e6f19a0797fc38b417a1bd60d5dfb8c9c45ca6e66
+    HEAD_REF master
+)
+
+vcpkg_find_acquire_program(PERL)
+get_filename_component(PERL_EXE_PATH ${PERL} DIRECTORY)
+vcpkg_add_to_path("${PERL_EXE_PATH}")
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DKDE_INSTALL_QMLDIR=qml
+)
+
+vcpkg_cmake_install(ADD_BIN_TO_PATH)
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5SyntaxHighlighting CONFIG_PATH lib/cmake/KF5SyntaxHighlighting)
+vcpkg_copy_pdbs()
+
+vcpkg_copy_tools(
+    TOOL_NAMES kate-syntax-highlighter
+    AUTO_CLEAN
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5syntaxhighlighting/vcpkg.json b/ports/kf5syntaxhighlighting/vcpkg.json
index 9a4fcbef18af9f..51784515b5e9dc 100644
--- a/ports/kf5syntaxhighlighting/vcpkg.json
+++ b/ports/kf5syntaxhighlighting/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5syntaxhighlighting",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Syntax highlighting engine for Kate syntax definitions",
   "homepage": "https://github.com/KDE/syntax-highlighting",
   "dependencies": [
diff --git a/ports/kf5textwidgets/portfile.cmake b/ports/kf5textwidgets/portfile.cmake
index 8552b4a958a906..bf3e1ad9033bba 100644
--- a/ports/kf5textwidgets/portfile.cmake
+++ b/ports/kf5textwidgets/portfile.cmake
@@ -1,13 +1,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/ktextwidgets
-    REF v5.88.0
-    SHA512 7851ce4c8df4020633b79d4cd83a9a0b94094474f4b65a5c372b8825ea936166577c3e23bcef995c25f7b999822f83131ecfae104f9506fe4109fdedb3e285ce
+    REF v5.89.0
+    SHA512 5f57e20bc2e865499b4ef5c701baa17f492c5cd48b89f3add4e9fec29664a87ad6e69496c4e91f3a1192fbc4d244758a753ee250731a79b464f6af63f9abbde0
     HEAD_REF master
 )
 
 # Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
@@ -28,4 +28,3 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
diff --git a/ports/kf5textwidgets/vcpkg.json b/ports/kf5textwidgets/vcpkg.json
index 794a114ee85fd9..82b0da989e6f9e 100644
--- a/ports/kf5textwidgets/vcpkg.json
+++ b/ports/kf5textwidgets/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5textwidgets",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Text editing widgets",
   "homepage": "https://api.kde.org/frameworks/ktextwidgets/html/index.html",
   "dependencies": [
diff --git a/ports/kf5wallet/portfile.cmake b/ports/kf5wallet/portfile.cmake
index d3607292ee0bb7..61db39fa173fa0 100644
--- a/ports/kf5wallet/portfile.cmake
+++ b/ports/kf5wallet/portfile.cmake
@@ -1,32 +1,31 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/kwallet
-    REF v5.88.0
-    SHA512 11a56e8d6a54197d2aa2555ba2d84001d489e252dfd08e005d6cf1c56a80903093e84b96dd4214137c21ad98a31a022c0b44ab1b09cd4bbce754cca5e3c61ab5
-    HEAD_REF master
-)
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DBUILD_TESTING=OFF
-        -DBUILD_KWALLETD=OFF
-        -DBUILD_KWALLET_QUERY=OFF
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Wallet CONFIG_PATH lib/cmake/KF5Wallet)
-vcpkg_copy_pdbs()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/kwallet
+    REF v5.89.0
+    SHA512 83bf40e5bfa9129ecfdaecebaf16c289542867337daf29be664aeb562e7c6bc32af4c59b71fcfae3cbbf70438872426b5981844c3c275b311340e5b48deac021
+    HEAD_REF master
+)
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DBUILD_KWALLETD=OFF
+        -DBUILD_KWALLET_QUERY=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Wallet CONFIG_PATH lib/cmake/KF5Wallet)
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5wallet/vcpkg.json b/ports/kf5wallet/vcpkg.json
index d8ed1628b418d4..eaf4d12538135e 100644
--- a/ports/kf5wallet/vcpkg.json
+++ b/ports/kf5wallet/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5wallet",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Safe desktop-wide storage for passwords",
   "homepage": "https://api.kde.org/frameworks/kwallet/html/index.html",
   "dependencies": [
diff --git a/ports/kf5widgetsaddons/portfile.cmake b/ports/kf5widgetsaddons/portfile.cmake
index bc64afe0c93b0c..dacd9aab55007f 100644
--- a/ports/kf5widgetsaddons/portfile.cmake
+++ b/ports/kf5widgetsaddons/portfile.cmake
@@ -1,32 +1,30 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/kwidgetsaddons
-    REF v5.88.0
-    SHA512 cfeb0905c807d7ac71de022405587dc192e8fde6d99e0144e4261389626fbb0e96aa7faf38069c9a947ddcf72f8d7b4abed52fe0bc11de9f99d1a183f4c936b5
-    HEAD_REF master
-)
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DBUILD_TESTING=OFF
-        -DBUILD_DESIGNERPLUGIN=OFF
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5WidgetsAddons CONFIG_PATH lib/cmake/KF5WidgetsAddons)
-vcpkg_copy_pdbs()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
-
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/kwidgetsaddons
+    REF v5.89.0
+    SHA512 5e83ffeefe3130f3a43768cbc777a81be9e43c029598f12ee48353f787e5ab4a97d0a92f6f3c41987fe021f1e92ac01a05601c642bbd508fbbd780925dd6c03b
+    HEAD_REF master
+)
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DBUILD_DESIGNERPLUGIN=OFF
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5WidgetsAddons CONFIG_PATH lib/cmake/KF5WidgetsAddons)
+vcpkg_copy_pdbs()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5widgetsaddons/vcpkg.json b/ports/kf5widgetsaddons/vcpkg.json
index a11d2289ddda5f..7dd41877e72a4c 100644
--- a/ports/kf5widgetsaddons/vcpkg.json
+++ b/ports/kf5widgetsaddons/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5widgetsaddons",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Addons to QtWidgets",
   "homepage": "https://api.kde.org/frameworks/kwidgetsaddons/html/index.html",
   "dependencies": [
diff --git a/ports/kf5windowsystem/portfile.cmake b/ports/kf5windowsystem/portfile.cmake
index 300b0b514d4d43..e4ba1cad14271a 100644
--- a/ports/kf5windowsystem/portfile.cmake
+++ b/ports/kf5windowsystem/portfile.cmake
@@ -1,35 +1,33 @@
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO KDE/kwindowsystem
-    REF v5.88.0
-    SHA512 6187074644df7b2386c569e3f4ade7fb718da11a63e92608c8ed507ddccf5e3fef9e66bdec6852b20a0ea781248f833a2a265ad6d59fe88f7e26a7914c784b17
-)
-
-if (VCPKG_TARGET_IS_LINUX)
-    message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n    libxcb-res0-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxcb-res0-dev")
-endif()
-
-# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
-
-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
-        -DBUILD_TESTING=OFF
-        -DKDE_INSTALL_PLUGINDIR=plugins
-)
-
-vcpkg_cmake_install()
-vcpkg_cmake_config_fixup(PACKAGE_NAME KF5WindowSystem CONFIG_PATH lib/cmake/KF5WindowSystem)
-vcpkg_copy_pdbs()
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
-
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO KDE/kwindowsystem
+    REF v5.89.0
+    SHA512 8cdb177b5dff487c0039f6243a8652e8e0aaae5cd55f299f8ad4cd2c66651fc0be36328998807398b53803989881b511f0ee472359c6129ff809e9b50283b66a
+)
+
+if (VCPKG_TARGET_IS_LINUX)
+    message(WARNING "${PORT} currently requires the following libraries from the system package manager:\n    libxcb-res0-dev\n\nThese can be installed on Ubuntu systems via apt-get install libxcb-res0-dev")
+endif()
+
+# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_TESTING=OFF
+        -DKDE_INSTALL_PLUGINDIR=plugins
+)
+
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(PACKAGE_NAME KF5WindowSystem CONFIG_PATH lib/cmake/KF5WindowSystem)
+vcpkg_copy_pdbs()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
diff --git a/ports/kf5windowsystem/vcpkg.json b/ports/kf5windowsystem/vcpkg.json
index 17ee3fb49196d2..21ceb54e762712 100644
--- a/ports/kf5windowsystem/vcpkg.json
+++ b/ports/kf5windowsystem/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5windowsystem",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Access to the windowing system",
   "homepage": "https://api.kde.org/frameworks/kwindowsystem/html/",
   "dependencies": [
diff --git a/ports/kf5xmlgui/portfile.cmake b/ports/kf5xmlgui/portfile.cmake
index a4193b8b05a5fb..d3a9143db63724 100644
--- a/ports/kf5xmlgui/portfile.cmake
+++ b/ports/kf5xmlgui/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kxmlgui
-    REF v5.88.0
-    SHA512 ad8cd77de2fdd41cc7a918e8eefed9efd815ca68fc51ba15b222fcb862bff02a29894b241fbab6dea0050d0d93f0ba8aacffb028c4dc72cad96c1c49bdc06355
+    REF v5.89.0
+    SHA512 6180089ff84456830ceddec564014c75127be1bcb996dd5458f86e5d1dfaa3e3b0267e0605dc8a799abe9aa3d3c0f48c805e5f58e754e19a44a20637dbb95044
     HEAD_REF master
 )
 
@@ -13,11 +13,11 @@ vcpkg_check_features(
  )
 
 # Prevent KDEClangFormat from writing to source effectively blocking parallel configure
-file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n")
+file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS 
+    OPTIONS
         -DBUILD_TESTING=OFF
         -DKDE_INSTALL_PLUGINDIR=plugins
         -DKDE_INSTALL_QTPLUGINDIR=plugins
@@ -35,11 +35,10 @@ if (VCPKG_TARGET_IS_WINDOWS)
     )
 endif()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")	
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")	
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
-
diff --git a/ports/kf5xmlgui/vcpkg.json b/ports/kf5xmlgui/vcpkg.json
index f60945694ca082..72fe1dcd737ee2 100644
--- a/ports/kf5xmlgui/vcpkg.json
+++ b/ports/kf5xmlgui/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5xmlgui",
-  "version": "5.88.0",
+  "version": "5.89.0",
   "description": "Framework for managing menu and toolbar actions",
   "homepage": "https://api.kde.org/frameworks/kxmlgui/html/index.html",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 1c228e59dc31a2..94bc5ca5fd48a5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1965,7 +1965,7 @@
       "port-version": 0
     },
     "ecm": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "ecos": {
@@ -3045,51 +3045,51 @@
       "port-version": 1
     },
     "kf5archive": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5attica": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5auth": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5bookmarks": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5codecs": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5completion": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5config": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5configwidgets": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5coreaddons": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5crash": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5dbusaddons": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5declarative": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5diagram": {
@@ -3097,95 +3097,95 @@
       "port-version": 0
     },
     "kf5globalaccel": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5guiaddons": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5holidays": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5i18n": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5iconthemes": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5itemmodels": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5itemviews": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5jobwidgets": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5kcmutils": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5kio": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5newstuff": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5notifications": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5package": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5plotting": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5service": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5solid": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5sonnet": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5syntaxhighlighting": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5textwidgets": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5wallet": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5widgetsaddons": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5windowsystem": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kf5xmlgui": {
-      "baseline": "5.88.0",
+      "baseline": "5.89.0",
       "port-version": 0
     },
     "kfr": {
diff --git a/versions/e-/ecm.json b/versions/e-/ecm.json
index 7fe6ddac081068..dada9a3c91e752 100644
--- a/versions/e-/ecm.json
+++ b/versions/e-/ecm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "563a564f43f7e1c096cd7819531a6eece87ddcde",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4cd5223b0a590ec5f428aa83cd4e0d3f486ad273",
       "version": "5.88.0",
diff --git a/versions/k-/kf5archive.json b/versions/k-/kf5archive.json
index 1add326d86b384..93892b042747ec 100644
--- a/versions/k-/kf5archive.json
+++ b/versions/k-/kf5archive.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "55574a9d2677a48ae7f69740641f5fdbc5b0e068",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "ac6edcd19fdca524303279786a9b5672a3a05c36",
       "version": "5.88.0",
diff --git a/versions/k-/kf5attica.json b/versions/k-/kf5attica.json
index 94c9fd412a12e6..78a1ed518e2a7c 100644
--- a/versions/k-/kf5attica.json
+++ b/versions/k-/kf5attica.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7d2b92c0e01ddccefac1907485d8d515a4e9a682",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "503565f7fa61ae49645a58970967409963928a70",
       "version": "5.88.0",
diff --git a/versions/k-/kf5auth.json b/versions/k-/kf5auth.json
index 7bc3a34e147b40..e965941bd32082 100644
--- a/versions/k-/kf5auth.json
+++ b/versions/k-/kf5auth.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e2f603c61a444935527c7c0a3e6f3871dc8de3df",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "9703f64179e4ae9387400c5e5a003c796c4de920",
       "version": "5.88.0",
diff --git a/versions/k-/kf5bookmarks.json b/versions/k-/kf5bookmarks.json
index 03eb656f60661f..35c965c0a88ba4 100644
--- a/versions/k-/kf5bookmarks.json
+++ b/versions/k-/kf5bookmarks.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4d1a01a9c81b7126f63ac11f2729498f93d56903",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "c37b551cf242aad93b0d8e335358df3caf51f2b3",
       "version": "5.88.0",
diff --git a/versions/k-/kf5codecs.json b/versions/k-/kf5codecs.json
index bb575560df35f5..05b772b73895fa 100644
--- a/versions/k-/kf5codecs.json
+++ b/versions/k-/kf5codecs.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "689fa05db3db3ea404ccec181b0a8bba8e614562",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "707f03a5be73f39f93010cf6c7445722555d3d85",
       "version": "5.88.0",
diff --git a/versions/k-/kf5completion.json b/versions/k-/kf5completion.json
index 3c8e8bfa783c21..c7674970547040 100644
--- a/versions/k-/kf5completion.json
+++ b/versions/k-/kf5completion.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "883845542162455b20188292bdf1cbcad36615ef",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "36d73d2ef882b596ba4735efff2327e24c4192a0",
       "version": "5.88.0",
diff --git a/versions/k-/kf5config.json b/versions/k-/kf5config.json
index b9a307fd849632..7f60f58102afb3 100644
--- a/versions/k-/kf5config.json
+++ b/versions/k-/kf5config.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "b8cf3131bfc3810be865d269b9873e08b36ed0ca",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b61e44190301d0de14095a1c3022bd484680e315",
       "version": "5.88.0",
diff --git a/versions/k-/kf5configwidgets.json b/versions/k-/kf5configwidgets.json
index 6f95e1e2448389..9a78dc93180b4f 100644
--- a/versions/k-/kf5configwidgets.json
+++ b/versions/k-/kf5configwidgets.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "321b0a6c4261d5a3bcf760d5010e388b6297e3d5",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "6d32f1ae808824f97ae385668b430dbec9bbafcc",
       "version": "5.88.0",
diff --git a/versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json
index b4cdb324227224..f89e710d9efa48 100644
--- a/versions/k-/kf5coreaddons.json
+++ b/versions/k-/kf5coreaddons.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6431d962993955c520f26f0c6d28f4cdaf5cfdea",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d1d07dcbee5c9b56c7109f5a7bfb66eea766570f",
       "version": "5.88.0",
diff --git a/versions/k-/kf5crash.json b/versions/k-/kf5crash.json
index 701beaec440ca7..6c4dc8cc924f0c 100644
--- a/versions/k-/kf5crash.json
+++ b/versions/k-/kf5crash.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "09f21ea5657354bd2e6a725f7c6b9e8e6b47af68",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "1e7f3c7f919bd8f77fd51c51fef599019c784db3",
       "version": "5.88.0",
diff --git a/versions/k-/kf5dbusaddons.json b/versions/k-/kf5dbusaddons.json
index b38f66a768d2e1..236a730e656bce 100644
--- a/versions/k-/kf5dbusaddons.json
+++ b/versions/k-/kf5dbusaddons.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "86fe61a2bf5e56705d1c90e61f355a08328d2886",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "59f07d9d616712ace1051e0b9bfb60429685932a",
       "version": "5.88.0",
diff --git a/versions/k-/kf5declarative.json b/versions/k-/kf5declarative.json
index d8d769472fb03d..6892e7ecf58d49 100644
--- a/versions/k-/kf5declarative.json
+++ b/versions/k-/kf5declarative.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0e7f25daab01ec329e68aafcb705359e9c341bee",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "ca1926847cdb48836c8ee9cbca02178d0df38384",
       "version": "5.88.0",
diff --git a/versions/k-/kf5globalaccel.json b/versions/k-/kf5globalaccel.json
index a6b12d0810fc36..96495715516251 100644
--- a/versions/k-/kf5globalaccel.json
+++ b/versions/k-/kf5globalaccel.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "186e5eaf6182ee6c12a1543aad61a2d317dbe90b",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "65f39c2fb121a2604a848e219bc50d8a0a11e4ee",
       "version": "5.88.0",
diff --git a/versions/k-/kf5guiaddons.json b/versions/k-/kf5guiaddons.json
index 8b096a9c324f4f..5b8edfdee9e210 100644
--- a/versions/k-/kf5guiaddons.json
+++ b/versions/k-/kf5guiaddons.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "1d532e40b86e82f54d1cec8ea0752168dac149b0",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "cac4485ad81812b3ecb5b73b2ded808e2b4d01f8",
       "version": "5.88.0",
diff --git a/versions/k-/kf5holidays.json b/versions/k-/kf5holidays.json
index b7de159d98e5e1..82a72f220e5c53 100644
--- a/versions/k-/kf5holidays.json
+++ b/versions/k-/kf5holidays.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "91ecdfa6bebbaf14e316af8763d3a355eb2d5108",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "1de63f997d7e1f2a5986d980bde5f79b5dc9dfcc",
       "version": "5.88.0",
diff --git a/versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json
index 0f6395b7a6e1f7..81f997bcd2d9c7 100644
--- a/versions/k-/kf5i18n.json
+++ b/versions/k-/kf5i18n.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "714138715b9030eceab63caba6085c4c9cd2e6d5",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "e215c70cf4c900ca8510ae07c4f3cd65587f35e8",
       "version": "5.88.0",
diff --git a/versions/k-/kf5iconthemes.json b/versions/k-/kf5iconthemes.json
index 6487671166ed95..bc60ee1346e6b5 100644
--- a/versions/k-/kf5iconthemes.json
+++ b/versions/k-/kf5iconthemes.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6ff2f989294b0c0487ff5049498efb10571334eb",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "815937b5586d05475d7291f270b14359197f3e04",
       "version": "5.88.0",
diff --git a/versions/k-/kf5itemmodels.json b/versions/k-/kf5itemmodels.json
index ef8f2a2915fd50..e55f871fd10a95 100644
--- a/versions/k-/kf5itemmodels.json
+++ b/versions/k-/kf5itemmodels.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a97d6d3556bddd30d108f13e831789b8cc9c1de9",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "4cdd3b6ba6e4699193512aeebb851dddcf0da092",
       "version": "5.88.0",
diff --git a/versions/k-/kf5itemviews.json b/versions/k-/kf5itemviews.json
index 2a025b97d10abe..22853ab6c9a7fd 100644
--- a/versions/k-/kf5itemviews.json
+++ b/versions/k-/kf5itemviews.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8cdccbe27ce997559f69d74f6267c3cbfd294e1e",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "f9f8bdd3d499bbec3575a898e162127c9ab32fba",
       "version": "5.88.0",
diff --git a/versions/k-/kf5jobwidgets.json b/versions/k-/kf5jobwidgets.json
index a668a31cdf4a14..18cf0763e166ce 100644
--- a/versions/k-/kf5jobwidgets.json
+++ b/versions/k-/kf5jobwidgets.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f608e47e7f8135de9e7c172bc168e8a444801e66",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "70eee0ea3cb787f5b956923a31002843c14b56aa",
       "version": "5.88.0",
diff --git a/versions/k-/kf5kcmutils.json b/versions/k-/kf5kcmutils.json
index 0e6314334d5cd0..9671fe9550966f 100644
--- a/versions/k-/kf5kcmutils.json
+++ b/versions/k-/kf5kcmutils.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e57e3f3eda8ac0230b4f7e7bb31abd02c766398c",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "25d48af54dcfad173913cb5c3d2032105b3ef915",
       "version": "5.88.0",
diff --git a/versions/k-/kf5kio.json b/versions/k-/kf5kio.json
index c18e7e8c63aeff..b868ba249f49d5 100644
--- a/versions/k-/kf5kio.json
+++ b/versions/k-/kf5kio.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "644d4ef87d5683404a3b034195c07a982fc45979",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "20edff8d66b9094cb80eb228a29cef566aad3538",
       "version": "5.88.0",
diff --git a/versions/k-/kf5newstuff.json b/versions/k-/kf5newstuff.json
index 2d59671bfeb0ab..368f1e2bc6411d 100644
--- a/versions/k-/kf5newstuff.json
+++ b/versions/k-/kf5newstuff.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7295ad1e62fd07e6aa74fb1d4fe0562e4f6b5ecb",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "a9b4c5ce1b701619de83591e564e2bbeec14e471",
       "version": "5.88.0",
diff --git a/versions/k-/kf5notifications.json b/versions/k-/kf5notifications.json
index bc634495ce518b..4916ba0c550a74 100644
--- a/versions/k-/kf5notifications.json
+++ b/versions/k-/kf5notifications.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "86baef519df4a14115be8d39ddac5b3c9df751cb",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "fd7593fd4f8ad80faf6d2111ffffe16bf0dd76d1",
       "version": "5.88.0",
diff --git a/versions/k-/kf5package.json b/versions/k-/kf5package.json
index 8d0f7d40e949de..1dbec4e0b1cd5a 100644
--- a/versions/k-/kf5package.json
+++ b/versions/k-/kf5package.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0c7ba772f4a36a4bec3f1a573c124cc812cce788",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "32c1d3baa7c7050b78d08f06abbca8791b048622",
       "version": "5.88.0",
diff --git a/versions/k-/kf5plotting.json b/versions/k-/kf5plotting.json
index 17b680f7488fec..a5fd11df74079b 100644
--- a/versions/k-/kf5plotting.json
+++ b/versions/k-/kf5plotting.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "18344c8d460769664a1644a9c0bbca283766b2aa",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "9cafd336220df951a4e0054d8b7f469a6408b161",
       "version": "5.88.0",
diff --git a/versions/k-/kf5service.json b/versions/k-/kf5service.json
index 770c0647bfd5c3..bf52e5fb23b83a 100644
--- a/versions/k-/kf5service.json
+++ b/versions/k-/kf5service.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8c834b6365035b2fcdd1996f3105456474f1b8a7",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "ca748c2c5f5b929cd099c699342bfe887581386a",
       "version": "5.88.0",
diff --git a/versions/k-/kf5solid.json b/versions/k-/kf5solid.json
index 367d99b6f0f193..5fe748f913ba5b 100644
--- a/versions/k-/kf5solid.json
+++ b/versions/k-/kf5solid.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "769197391a9b8b1f614405d61e05361915dffdc2",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "7f02dd0891311813d9efad69bbdd2e9dc918a470",
       "version": "5.88.0",
diff --git a/versions/k-/kf5sonnet.json b/versions/k-/kf5sonnet.json
index 43daed0cd45a62..1e8eb71d052d81 100644
--- a/versions/k-/kf5sonnet.json
+++ b/versions/k-/kf5sonnet.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4befb84624256110ee9b61eef7b2a38bed809274",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "460773f08b8524e7534b6f94a37a7488988e00a8",
       "version": "5.88.0",
diff --git a/versions/k-/kf5syntaxhighlighting.json b/versions/k-/kf5syntaxhighlighting.json
index 1fa05bc9941c7f..2354bb6ee09d32 100644
--- a/versions/k-/kf5syntaxhighlighting.json
+++ b/versions/k-/kf5syntaxhighlighting.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "604681b0df59a2cc8cf1d69d8a355a9eecf59328",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "2ca26437f934ea26968d1dc10871a31be10a460e",
       "version": "5.88.0",
diff --git a/versions/k-/kf5textwidgets.json b/versions/k-/kf5textwidgets.json
index 64eb4edf0f3852..fb59ad5cd49d81 100644
--- a/versions/k-/kf5textwidgets.json
+++ b/versions/k-/kf5textwidgets.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5010e707b462a2d020694963f2e6d9affdea6db2",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "3307e348e202593b08cd227f68d7ca7fd57ffcfa",
       "version": "5.88.0",
diff --git a/versions/k-/kf5wallet.json b/versions/k-/kf5wallet.json
index efd8175c5a014e..879900175b59b2 100644
--- a/versions/k-/kf5wallet.json
+++ b/versions/k-/kf5wallet.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7cdf30cbdbee449144de7e7f145e7e91ebd3aecb",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "949ceec510758be184c8ed99a4409920e6b0aaa7",
       "version": "5.88.0",
diff --git a/versions/k-/kf5widgetsaddons.json b/versions/k-/kf5widgetsaddons.json
index 78f9d6ad2a2eb1..d274e7fe555c10 100644
--- a/versions/k-/kf5widgetsaddons.json
+++ b/versions/k-/kf5widgetsaddons.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "82e07e830a46ae869835ac36c61a1c4ea05542d3",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d7fb921418e65921e96e81147d9f7f830b471ab5",
       "version": "5.88.0",
diff --git a/versions/k-/kf5windowsystem.json b/versions/k-/kf5windowsystem.json
index e42df1b53209f7..7d6bd10f3c03f1 100644
--- a/versions/k-/kf5windowsystem.json
+++ b/versions/k-/kf5windowsystem.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "7d201f83e6272c570a9662ac56ca67bffe2fe0e8",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "9e617f8991e09cd526860b7a312330098cbcbb54",
       "version": "5.88.0",
diff --git a/versions/k-/kf5xmlgui.json b/versions/k-/kf5xmlgui.json
index 279211b328d07e..358cc452a86461 100644
--- a/versions/k-/kf5xmlgui.json
+++ b/versions/k-/kf5xmlgui.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "ef8256a376b36bf9971b1788e88f4332146a1558",
+      "version": "5.89.0",
+      "port-version": 0
+    },
     {
       "git-tree": "b6f435038615c416b7893e2e0524c1c486daccf5",
       "version": "5.88.0",

From 4f1784aca0c13fbe1c8204d32463717a6b7e8570 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Fri, 17 Dec 2021 15:30:54 +0800
Subject: [PATCH 33/48] [ompl] Add vcpkg_check_linkage (#21659)

* [ompl] Add vcpkg_check_linkage

* version

* version
---
 ports/ompl/portfile.cmake | 7 +++++++
 ports/ompl/vcpkg.json     | 2 +-
 versions/baseline.json    | 2 +-
 versions/o-/ompl.json     | 5 +++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ports/ompl/portfile.cmake b/ports/ompl/portfile.cmake
index 04d55d7f4427e5..5f32ad49982f4d 100644
--- a/ports/ompl/portfile.cmake
+++ b/ports/ompl/portfile.cmake
@@ -1,5 +1,12 @@
 vcpkg_buildpath_length_warning(37)
 
+# See https://github.com/ompl/ompl/blob/main/src/ompl/CMakeLists.txt#L49-L54
+if (VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
+    vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+else()
+    vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
+endif()
+
 set(OMPL_VERSION 1.5.1)
 
 vcpkg_from_github(
diff --git a/ports/ompl/vcpkg.json b/ports/ompl/vcpkg.json
index 702604f872bbe3..5b8be4e388cc33 100644
--- a/ports/ompl/vcpkg.json
+++ b/ports/ompl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ompl",
   "version": "1.5.1",
-  "port-version": 4,
+  "port-version": 5,
   "description": "The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms",
   "homepage": "https://ompl.kavrakilab.org/",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 94bc5ca5fd48a5..540e9a6edd48b6 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4874,7 +4874,7 @@
     },
     "ompl": {
       "baseline": "1.5.1",
-      "port-version": 4
+      "port-version": 5
     },
     "omplapp": {
       "baseline": "1.5.1",
diff --git a/versions/o-/ompl.json b/versions/o-/ompl.json
index 6e2fbc5e4c1054..bf7d5c30f4dff0 100644
--- a/versions/o-/ompl.json
+++ b/versions/o-/ompl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "262729470ab00b469cfb9d63e196ebf4006d35cd",
+      "version": "1.5.1",
+      "port-version": 5
+    },
     {
       "git-tree": "cde8f8a96e5fc3c5764ca85632efa1b828868e26",
       "version": "1.5.1",

From ba42f4c76a8dddf13745e56e56fc6fcfa49511f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Sat, 18 Dec 2021 01:07:21 +0800
Subject: [PATCH 34/48] [pcl] Add feature apps, visualization, simulation,
 examples and add usage (#21788)

* [pcl] Add feature apps, visualization and examples

* version

* Add simulation

* Enable more apps, install examples, add usage

* format manifest file

* version

* set feature vtk as a alias for feature visualization

* version
---
 ports/pcl/install-examples.patch | 13 ++++++++
 ports/pcl/portfile.cmake         | 34 ++++++++++++++-------
 ports/pcl/usage                  |  4 +++
 ports/pcl/vcpkg.json             | 52 ++++++++++++++++++++++++++++++--
 versions/baseline.json           |  2 +-
 versions/p-/pcl.json             |  5 +++
 6 files changed, 95 insertions(+), 15 deletions(-)
 create mode 100644 ports/pcl/install-examples.patch
 create mode 100644 ports/pcl/usage

diff --git a/ports/pcl/install-examples.patch b/ports/pcl/install-examples.patch
new file mode 100644
index 00000000000000..136a4ce3675c1e
--- /dev/null
+++ b/ports/pcl/install-examples.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/pcl_targets.cmake b/cmake/pcl_targets.cmake
+index 91f2404..18f5a24 100644
+--- a/cmake/pcl_targets.cmake
++++ b/cmake/pcl_targets.cmake
+@@ -473,6 +473,8 @@ macro(PCL_ADD_EXAMPLE _name)
+   # add target to list of example targets created at the parent scope
+   list(APPEND PCL_EXAMPLES_ALL_TARGETS ${_name})
+   set(PCL_EXAMPLES_ALL_TARGETS "${PCL_EXAMPLES_ALL_TARGETS}" PARENT_SCOPE)
++
++  install(TARGETS ${_name} RUNTIME DESTINATION ${BIN_INSTALL_DIR})
+ endmacro()
+ 
+ ###############################################################################
diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake
index 5780a8b10870a2..cb11edf143065a 100644
--- a/ports/pcl/portfile.cmake
+++ b/ports/pcl/portfile.cmake
@@ -15,6 +15,7 @@ vcpkg_from_github(
         fix-cmake_find_library_suffixes.patch
         fix-pkgconfig.patch # Remove this patch in the next update
         fix-find-libusb.patch
+        install-examples.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/cmake/Modules/FindQhull.cmake"
@@ -32,16 +33,26 @@ endif()
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
     FEATURES
-        openni2 WITH_OPENNI2
-        qt      WITH_QT
-        pcap    WITH_PCAP
-        cuda    WITH_CUDA
-        cuda    BUILD_CUDA
-        cuda    BUILD_GPU
-        tools   BUILD_tools
-        opengl  WITH_OPENGL
-        vtk     WITH_VTK
-        libusb  WITH_LIBUSB
+        openni2         WITH_OPENNI2
+        qt              WITH_QT
+        pcap            WITH_PCAP
+        cuda            WITH_CUDA
+        cuda            BUILD_CUDA
+        cuda            BUILD_GPU
+        tools           BUILD_tools
+        opengl          WITH_OPENGL
+        vtk             WITH_VTK
+        libusb          WITH_LIBUSB
+        visualization   BUILD_visualization
+        examples        BUILD_examples
+        apps            BUILD_apps
+        apps            BUILD_apps_cloud_composer
+        apps            BUILD_apps_modeler
+        apps            BUILD_apps_point_cloud_editor
+        # These 2 apps need openni1
+        #apps            BUILD_apps_in_hand_scanner
+        #apps            BUILD_apps_3d_rec_framework
+        simulation      BUILD_simulation
 )
 
 vcpkg_cmake_configure(
@@ -103,7 +114,7 @@ vcpkg_fixup_pkgconfig()
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-if("tools" IN_LIST FEATURES) 
+if(BUILD_tools OR BUILD_apps OR BUILD_examples)
     file(GLOB EXEFILES_RELEASE "${CURRENT_PACKAGES_DIR}/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
     file(GLOB EXEFILES_DEBUG "${CURRENT_PACKAGES_DIR}/debug/bin/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
     file(COPY ${EXEFILES_RELEASE} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/pcl")
@@ -111,4 +122,5 @@ if("tools" IN_LIST FEATURES)
     vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/pcl")
 endif()
 
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/pcl/usage b/ports/pcl/usage
new file mode 100644
index 00000000000000..60aecd4943902f
--- /dev/null
+++ b/ports/pcl/usage
@@ -0,0 +1,4 @@
+The package pcl provides CMake targets:
+
+    find_package(PCL CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE ${PCL_LIBRARIES})
diff --git a/ports/pcl/vcpkg.json b/ports/pcl/vcpkg.json
index f5db2beb7ffd12..f50381e733d5ae 100644
--- a/ports/pcl/vcpkg.json
+++ b/ports/pcl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "pcl",
   "version": "1.12.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.",
   "homepage": "https://github.com/PointCloudLibrary/pcl",
   "supports": "!(arm64 & windows)",
@@ -37,12 +37,33 @@
     }
   ],
   "features": {
+    "apps": {
+      "description": "Build application examples/samples that show how PCL works",
+      "dependencies": [
+        {
+          "name": "pcl",
+          "default-features": false,
+          "features": [
+            "opengl",
+            "openni2",
+            "qt",
+            "vtk"
+          ]
+        }
+      ]
+    },
     "cuda": {
       "description": "CUDA support for PCL",
       "dependencies": [
         "cuda"
       ]
     },
+    "examples": {
+      "description": "Build PCL examples",
+      "dependencies": [
+        "vtk"
+      ]
+    },
     "libusb": {
       "description": "Build USB RGBD-Camera drivers",
       "dependencies": [
@@ -90,17 +111,42 @@
         }
       ]
     },
+    "simulation": {
+      "description": "Build Point Cloud Library Simulation",
+      "dependencies": [
+        "glew",
+        {
+          "name": "pcl",
+          "default-features": false,
+          "features": [
+            "opengl"
+          ]
+        }
+      ]
+    },
     "tools": {
       "description": "Build PCL utilities",
       "dependencies": [
         "boost-accumulators"
       ]
     },
-    "vtk": {
-      "description": "VTK-Visualizations support for PCL",
+    "visualization": {
+      "description": "Build visualization",
       "dependencies": [
         "vtk"
       ]
+    },
+    "vtk": {
+      "description": "An alias for visualization",
+      "dependencies": [
+        {
+          "name": "pcl",
+          "default-features": false,
+          "features": [
+            "visualization"
+          ]
+        }
+      ]
     }
   }
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 540e9a6edd48b6..a1be547ad9b43c 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5186,7 +5186,7 @@
     },
     "pcl": {
       "baseline": "1.12.0",
-      "port-version": 1
+      "port-version": 2
     },
     "pcre": {
       "baseline": "8.45",
diff --git a/versions/p-/pcl.json b/versions/p-/pcl.json
index 609b71c7d53b24..71cc6775476132 100644
--- a/versions/p-/pcl.json
+++ b/versions/p-/pcl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "5d02740fc9422f1b520ae322cda71e8e6e5323cf",
+      "version": "1.12.0",
+      "port-version": 2
+    },
     {
       "git-tree": "a2eb47fa4d7f959d9c8712f0d0925c2af94bcc80",
       "version": "1.12.0",

From a32e32461434b1fa008dad879415fb240393544d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 17 Dec 2021 09:09:39 -0800
Subject: [PATCH 35/48] [activemq-cpp] Added missing libuuid dependency
 (#22059)

This is a mandatory dependency according to
https://github.com/apache/activemq-cpp/blob/master/README.txt
---
 ports/activemq-cpp/vcpkg.json | 5 +++--
 versions/a-/activemq-cpp.json | 5 +++++
 versions/baseline.json        | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json
index 9a804bf4bf7487..eeae19017e9a6c 100644
--- a/ports/activemq-cpp/vcpkg.json
+++ b/ports/activemq-cpp/vcpkg.json
@@ -1,10 +1,11 @@
 {
   "name": "activemq-cpp",
   "version-semver": "3.9.5",
-  "port-version": 5,
+  "port-version": 6,
   "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.",
   "supports": "!(uwp | osx)",
   "dependencies": [
-    "apr"
+    "apr",
+    "libuuid"
   ]
 }
diff --git a/versions/a-/activemq-cpp.json b/versions/a-/activemq-cpp.json
index e08320929ec621..6497a5edd27458 100644
--- a/versions/a-/activemq-cpp.json
+++ b/versions/a-/activemq-cpp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0d1c131172bea536490960f632ac287b3db73edb",
+      "version-semver": "3.9.5",
+      "port-version": 6
+    },
     {
       "git-tree": "bce9f87e7df6f4e8a9c3121018ffc032e3d2603e",
       "version-semver": "3.9.5",
diff --git a/versions/baseline.json b/versions/baseline.json
index a1be547ad9b43c..08f37c67de7212 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -22,7 +22,7 @@
     },
     "activemq-cpp": {
       "baseline": "3.9.5",
-      "port-version": 5
+      "port-version": 6
     },
     "ade": {
       "baseline": "0.1.1f",

From 503614c16a5b61740e446eaed51fb60012efa21c Mon Sep 17 00:00:00 2001
From: Vitaly <v31337@gmail.com>
Date: Fri, 17 Dec 2021 21:21:55 +0300
Subject: [PATCH 36/48] [optimus-cpp] New port: ID hashing and Obfuscation
 using Knuth's Algorithm for C++ (#22025)

* [optimus-cpp] New port: ID hashing and Obfuscation using Knuth's Algorithm for C++

* Changed reference

* Update version database

* Fix hash

* Update version database

* Review changes and update lib version

* fixver

* Update version database

* Update version database 2

* Fix vcpkg deps

* Update version database
---
 ports/optimus-cpp/portfile.cmake | 17 +++++++++++++++++
 ports/optimus-cpp/vcpkg.json     | 13 +++++++++++++
 versions/baseline.json           |  4 ++++
 versions/o-/optimus-cpp.json     |  9 +++++++++
 4 files changed, 43 insertions(+)
 create mode 100644 ports/optimus-cpp/portfile.cmake
 create mode 100644 ports/optimus-cpp/vcpkg.json
 create mode 100644 versions/o-/optimus-cpp.json

diff --git a/ports/optimus-cpp/portfile.cmake b/ports/optimus-cpp/portfile.cmake
new file mode 100644
index 00000000000000..4692f4f56ae92f
--- /dev/null
+++ b/ports/optimus-cpp/portfile.cmake
@@ -0,0 +1,17 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO kafeg/optimus-cpp
+    REF 0.3.0
+    SHA512 93abd13d4552a896f61e32dfebcc9037e7255f3fa86b230c03905df3148b9cc91cec772ec733e83fbcad574fd93fa4dadca9ec88b5836c5a4137d01e16580d6f
+    HEAD_REF main
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+)
+
+vcpkg_cmake_install()
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/optimus-cpp/vcpkg.json b/ports/optimus-cpp/vcpkg.json
new file mode 100644
index 00000000000000..2b8ee879d5077a
--- /dev/null
+++ b/ports/optimus-cpp/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "optimus-cpp",
+  "version": "0.3.0",
+  "description": "ID hashing and Obfuscation using Knuth's Algorithm for C++",
+  "homepage": "https://github.com/kafeg/optimus-cpp",
+  "supports": "!uwp",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 08f37c67de7212..6ee5eb4a824242 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5064,6 +5064,10 @@
       "baseline": "1.0.20",
       "port-version": 0
     },
+    "optimus-cpp": {
+      "baseline": "0.3.0",
+      "port-version": 0
+    },
     "optional-bare": {
       "baseline": "1.1.0",
       "port-version": 1
diff --git a/versions/o-/optimus-cpp.json b/versions/o-/optimus-cpp.json
new file mode 100644
index 00000000000000..d3458510a705a5
--- /dev/null
+++ b/versions/o-/optimus-cpp.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "e180e598e04576e8a6f2e391c72031c360b5a3a2",
+      "version": "0.3.0",
+      "port-version": 0
+    }
+  ]
+}

From 0ec3a8999436a37de53be442448f6030d7610976 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Fri, 17 Dec 2021 10:22:50 -0800
Subject: [PATCH 37/48] [tensorflow-common] remove single quotes from vcpkg
 flags (#21869)

* [vcpkg_acquire_msys] Update bzip2 to 1.0.8-2

* [tensorflow-common] remove single quotes from vcpkg flags

They are escaped like '\'-mtune=native\''  which leads to a compiler error:
cc: error: unrecognized command line option '-mtune=native'
Set via: set(VCPKG_CXX_FLAGS "-mtune=native")
---
 ports/tensorflow-common/tensorflow-common.cmake | 12 ++++++------
 ports/tensorflow-common/vcpkg.json              |  1 +
 scripts/cmake/vcpkg_acquire_msys.cmake          |  4 ++--
 versions/baseline.json                          |  2 +-
 versions/t-/tensorflow-common.json              |  5 +++++
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/ports/tensorflow-common/tensorflow-common.cmake b/ports/tensorflow-common/tensorflow-common.cmake
index c432f141730c6c..225e8fc1767020 100644
--- a/ports/tensorflow-common/tensorflow-common.cmake
+++ b/ports/tensorflow-common/tensorflow-common.cmake
@@ -200,17 +200,17 @@ foreach(BUILD_TYPE dbg rel)
 		separate_arguments(VCPKG_C_FLAGS ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS})
 		separate_arguments(VCPKG_C_FLAGS_DEBUG ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS_DEBUG})
 		foreach(OPT IN LISTS VCPKG_C_FLAGS VCPKG_C_FLAGS_DEBUG)
-			list(APPEND COPTS "--copt='${OPT}'")
+			list(APPEND COPTS "--copt=${OPT}")
 		endforeach()
 		separate_arguments(VCPKG_CXX_FLAGS ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS})
 		separate_arguments(VCPKG_CXX_FLAGS_DEBUG ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS_DEBUG})
 		foreach(OPT IN LISTS VCPKG_CXX_FLAGS VCPKG_CXX_FLAGS_DEBUG)
-			list(APPEND CXXOPTS "--cxxopt='${OPT}'")
+			list(APPEND CXXOPTS "--cxxopt=${OPT}")
 		endforeach()
 		separate_arguments(VCPKG_LINKER_FLAGS ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS})
 		separate_arguments(VCPKG_LINKER_FLAGS_DEBUG ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS_DEBUG})
 		foreach(OPT IN LISTS VCPKG_LINKER_FLAGS VCPKG_LINKER_FLAGS_DEBUG)
-			list(APPEND LINKOPTS "--linkopt='${OPT}'")
+			list(APPEND LINKOPTS "--linkopt=${OPT}")
 		endforeach()
 	else()
 		set(BUILD_OPTS --compilation_mode=opt)
@@ -218,17 +218,17 @@ foreach(BUILD_TYPE dbg rel)
 		separate_arguments(VCPKG_C_FLAGS ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS})
 		separate_arguments(VCPKG_C_FLAGS_RELEASE ${PLATFORM_COMMAND} ${VCPKG_C_FLAGS_RELEASE})
 		foreach(OPT IN LISTS VCPKG_C_FLAGS VCPKG_C_FLAGS_RELEASE)
-			list(APPEND COPTS "--copt='${OPT}'")
+			list(APPEND COPTS "--copt=${OPT}")
 		endforeach()
 		separate_arguments(VCPKG_CXX_FLAGS ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS})
 		separate_arguments(VCPKG_CXX_FLAGS_RELEASE ${PLATFORM_COMMAND} ${VCPKG_CXX_FLAGS_RELEASE})
 		foreach(OPT IN LISTS VCPKG_CXX_FLAGS VCPKG_CXX_FLAGS_RELEASE)
-			list(APPEND CXXOPTS "--cxxopt='${OPT}'")
+			list(APPEND CXXOPTS "--cxxopt=${OPT}")
 		endforeach()
 		separate_arguments(VCPKG_LINKER_FLAGS ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS})
 		separate_arguments(VCPKG_LINKER_FLAGS_RELEASE ${PLATFORM_COMMAND} ${VCPKG_LINKER_FLAGS_RELEASE})
 		foreach(OPT IN LISTS VCPKG_LINKER_FLAGS VCPKG_LINKER_FLAGS_RELEASE)
-			list(APPEND LINKOPTS "--linkopt='${OPT}'")
+			list(APPEND LINKOPTS "--linkopt=${OPT}")
 		endforeach()
 	endif()
 
diff --git a/ports/tensorflow-common/vcpkg.json b/ports/tensorflow-common/vcpkg.json
index dc23ce51725969..18008bbc24aa7f 100644
--- a/ports/tensorflow-common/vcpkg.json
+++ b/ports/tensorflow-common/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "tensorflow-common",
   "version-semver": "2.7.0",
+  "port-version": 1,
   "description": "This meta package holds common files for the C [tensorflow] and the C++ [tensorflow-cc] API version of TensorFlow but is not installable on its own.",
   "homepage": "https://github.com/tensorflow/tensorflow"
 }
diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake
index 90704ca45053e5..b7b0fc3e911bd3 100644
--- a/scripts/cmake/vcpkg_acquire_msys.cmake
+++ b/scripts/cmake/vcpkg_acquire_msys.cmake
@@ -414,8 +414,8 @@ function(vcpkg_acquire_msys out_msys_root)
         DEPS mingw-w64-x86_64-bzip2 mingw-w64-x86_64-expat mingw-w64-x86_64-gcc-libs mingw-w64-x86_64-libffi mingw-w64-x86_64-mpdecimal mingw-w64-x86_64-ncurses mingw-w64-x86_64-openssl mingw-w64-x86_64-sqlite3 mingw-w64-x86_64-tcl mingw-w64-x86_64-tk mingw-w64-x86_64-xz mingw-w64-x86_64-zlib
     )
     z_vcpkg_acquire_msys_declare_package(
-        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-bzip2-1.0.8-1-any.pkg.tar.xz"
-        SHA512 6e01b26a2144f99ca00406dbce5b8c3e928ec8a3ff77e0b741b26aaf9c927e9bea8cb1b5f38cd59118307e10dd4523a0ea2a1ea61f798f99e6d605ef1d100503
+        URL "https://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-bzip2-1.0.8-2-any.pkg.tar.zst"
+        SHA512 4f7ba44189d953d4d00e7bbf5a7697233f759c92847c074f0f2888d2a641c59ce4bd3c39617adac0ad7b53c5836e529f9ffd889f976444016976bb517e5c24a2
         DEPS mingw-w64-x86_64-gcc-libs
     )
     z_vcpkg_acquire_msys_declare_package(
diff --git a/versions/baseline.json b/versions/baseline.json
index 6ee5eb4a824242..9e6c2d5399ecad 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6710,7 +6710,7 @@
     },
     "tensorflow-common": {
       "baseline": "2.7.0",
-      "port-version": 0
+      "port-version": 1
     },
     "tensorpipe": {
       "baseline": "2021-04-26",
diff --git a/versions/t-/tensorflow-common.json b/versions/t-/tensorflow-common.json
index a7797048467249..d46d8d134fa5c1 100644
--- a/versions/t-/tensorflow-common.json
+++ b/versions/t-/tensorflow-common.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4c81239401e4304b124ed215960cdcdf19611e47",
+      "version-semver": "2.7.0",
+      "port-version": 1
+    },
     {
       "git-tree": "eb9e0e1345847b72eccecd5a6b85a441f034e1a7",
       "version-semver": "2.7.0",

From 41126813f51f26b5cec46f58d3648bbb20fd9731 Mon Sep 17 00:00:00 2001
From: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>
Date: Sat, 18 Dec 2021 02:39:42 +0800
Subject: [PATCH 38/48] [sdl2-mixer] Fix link mpg123 error (#22049)

* [sdl2-mixer] Fix link mpg123 error

* update version

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
---
 ports/sdl2-mixer/CMakeLists.txt | 10 ++++++----
 ports/sdl2-mixer/vcpkg.json     |  2 +-
 versions/baseline.json          |  2 +-
 versions/s-/sdl2-mixer.json     |  5 +++++
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/ports/sdl2-mixer/CMakeLists.txt b/ports/sdl2-mixer/CMakeLists.txt
index 338509b90c28d5..2ab5e00ad91cc2 100644
--- a/ports/sdl2-mixer/CMakeLists.txt
+++ b/ports/sdl2-mixer/CMakeLists.txt
@@ -12,8 +12,9 @@ set(SDL_MIXER_DEFINES MUSIC_WAV)
 
 # MP3 support
 if(SDL_MIXER_ENABLE_MP3)
-    find_package(mpg123 CONFIG REQUIRED)
-    set(MPG123_LIBRARY MPG123::libmpg123)
+    find_path(MPG123_INCLUDE_DIR mpg123.h)
+    find_library(MPG123_LIBRARY NAMES libmpg123 mpg123)
+    list(APPEND SDL_MIXER_INCLUDES ${MPG123_INCLUDE_DIR})
     list(APPEND SDL_MIXER_DEFINES MUSIC_MP3_MPG123)
     list(APPEND SDL_MIXER_LIBRARIES ${MPG123_LIBRARY})
     if (SDL_DYNAMIC_LOAD)
@@ -24,8 +25,9 @@ endif()
 
 # FLAC support
 if(SDL_MIXER_ENABLE_FLAC)
-    find_package(flac CONFIG REQUIRED)
-    set(FLAC_LIBRARY FLAC::FLAC)
+    find_path(FLAC_INCLUDE_DIR FLAC/all.h)
+    find_library(FLAC_LIBRARY FLAC)
+    list(APPEND SDL_MIXER_INCLUDES ${FLAC_INCLUDE_DIR})
     list(APPEND SDL_MIXER_DEFINES MUSIC_FLAC)
     list(APPEND SDL_MIXER_LIBRARIES ${FLAC_LIBRARY})
     if (SDL_DYNAMIC_LOAD)
diff --git a/ports/sdl2-mixer/vcpkg.json b/ports/sdl2-mixer/vcpkg.json
index bd56698c397fed..a0286dd919b1d8 100644
--- a/ports/sdl2-mixer/vcpkg.json
+++ b/ports/sdl2-mixer/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "sdl2-mixer",
   "version": "2.0.4",
-  "port-version": 15,
+  "port-version": 16,
   "description": "Multi-channel audio mixer library for SDL.",
   "homepage": "https://www.libsdl.org/projects/SDL_mixer",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 9e6c2d5399ecad..4a36ac7abdca9f 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6226,7 +6226,7 @@
     },
     "sdl2-mixer": {
       "baseline": "2.0.4",
-      "port-version": 15
+      "port-version": 16
     },
     "sdl2-net": {
       "baseline": "2.0.1",
diff --git a/versions/s-/sdl2-mixer.json b/versions/s-/sdl2-mixer.json
index 425451f5d8747d..dc799edf6ae75a 100644
--- a/versions/s-/sdl2-mixer.json
+++ b/versions/s-/sdl2-mixer.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "23eb6562f5153eb39a84eb2673d5dc9bd2ce78aa",
+      "version": "2.0.4",
+      "port-version": 16
+    },
     {
       "git-tree": "981b981d938287223eb7ebbe365cfbb371ba71ef",
       "version": "2.0.4",

From 15cf1cff94b6808b3dd8f7c35466d8a61f1a5ac0 Mon Sep 17 00:00:00 2001
From: jiayuehua <3423893+jiayuehua@users.noreply.github.com>
Date: Mon, 20 Dec 2021 16:10:34 +0800
Subject: [PATCH 39/48] [mvfst]: New port: a client and server implementation
 of IETF QUIC protocol in C++ by Facebook

---
 ports/mvfst/portfile.cmake | 27 +++++++++++++++++++++++++++
 ports/mvfst/vcpkg.json     | 14 ++++++++++++++
 versions/baseline.json     |  4 ++++
 3 files changed, 45 insertions(+)
 create mode 100644 ports/mvfst/portfile.cmake
 create mode 100644 ports/mvfst/vcpkg.json

diff --git a/ports/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake
new file mode 100644
index 00000000000000..ff5897c0b385a4
--- /dev/null
+++ b/ports/mvfst/portfile.cmake
@@ -0,0 +1,27 @@
+vcpkg_fail_port_install(ON_TARGET "Windows")
+set(VCPKG_CONCURRENCY 2)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO facebookincubator/mvfst
+    REF 497f6e4732bf6e95553d70e24f2e6e1a20c26397 
+    SHA512 41bb998f8183839f532c32755572df4a8d38a84ad164011675703a4de73347292b77134fe53359a5622b72c5b1f3fea4b295b8740eda754c860b41f75ba7f751
+    HEAD_REF main
+)
+
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBUILD_TESTS=OFF
+        -DBUILD_EXAMPLES=OFF
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mvfst)
+file(REMOVE_RECURSE
+${CURRENT_PACKAGES_DIR}/debug/include
+)
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json
new file mode 100644
index 00000000000000..ec83557cef892a
--- /dev/null
+++ b/ports/mvfst/vcpkg.json
@@ -0,0 +1,14 @@
+{
+  "name": "mvfst",
+  "version-string": "0.1",
+  "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.",
+  "homepage": "https://github.com/facebookincubator/mvfst",
+  "supports": "!windows",
+  "dependencies": [
+    "boost",
+    "fizz",
+    "fmt",
+    "folly",
+    "glog"
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 4a36ac7abdca9f..889418df952393 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4600,6 +4600,10 @@
       "baseline": "2016-01-09",
       "port-version": 4
     },
+    "mvfst": {
+      "baseline": "0.1",
+      "port-version": 0
+    },
     "mygui": {
       "baseline": "3.4.1",
       "port-version": 0

From 9d7d6816684ee4501397c56d125b336f3c9ec033 Mon Sep 17 00:00:00 2001
From: jiayuehua <3423893+jiayuehua@users.noreply.github.com>
Date: Mon, 20 Dec 2021 16:10:34 +0800
Subject: [PATCH 40/48] [mvfst]: New port: a client and server implementation
 of IETF QUIC protocol in C++ by Facebook

---
 ports/s2geometry/config.patch   | 63 ---------------------------------
 ports/s2geometry/portfile.cmake | 30 ----------------
 ports/s2geometry/vcpkg.json     |  7 ----
 versions/baseline.json          |  4 ---
 versions/m-/mvfst.json          |  9 +++++
 5 files changed, 9 insertions(+), 104 deletions(-)
 delete mode 100644 ports/s2geometry/config.patch
 delete mode 100644 ports/s2geometry/portfile.cmake
 delete mode 100644 ports/s2geometry/vcpkg.json
 create mode 100644 versions/m-/mvfst.json

diff --git a/ports/s2geometry/config.patch b/ports/s2geometry/config.patch
deleted file mode 100644
index cf62250845972d..00000000000000
--- a/ports/s2geometry/config.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5ecd280..1a8367f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -211,7 +211,11 @@ target_link_libraries(
- # list(APPEND CMAKE_MODULE_PATH "<path_to_s2geometry_dir>/third_party/cmake")
- # add_subdirectory(<path_to_s2geometry_dir> s2geometry)
- # target_link_libraries(<target_name> s2)
--target_include_directories(s2 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
-+target_include_directories(s2 PUBLIC 
-+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
-+$<INSTALL_INTERFACE:include>
-+)
-+
- 
- # We don't need to install all headers, only those
- # transitively included by s2 headers we are exporting.
-@@ -407,7 +411,17 @@ install(FILES src/s2/util/math/mathutil.h
- install(FILES src/s2/util/units/length-units.h
-               src/s2/util/units/physical-units.h
-         DESTINATION include/s2/util/units)
--install(TARGETS s2 s2testing DESTINATION lib)
-+ install(TARGETS s2 s2testing
-+         RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
-+         ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+         LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-+install(TARGETS s2 
-+        EXPORT s2Targets
-+        )
-+install(EXPORT s2Targets
-+  FILE s2Targets.cmake
-+  DESTINATION share/s2/
-+)
- 
- message("GTEST_ROOT: ${GTEST_ROOT}")
- if (GTEST_ROOT)
-@@ -534,3 +548,17 @@ endif()
- if (${SWIG_FOUND} AND ${PYTHONLIBS_FOUND})
-   add_subdirectory("src/python" python)
- endif()
-+
-+
-+include(CMakePackageConfigHelpers)
-+# generate the config file that is includes the exports
-+configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
-+  "${CMAKE_CURRENT_BINARY_DIR}/s2Config.cmake"
-+  INSTALL_DESTINATION "share/s2/"
-+  NO_SET_AND_CHECK_MACRO
-+  NO_CHECK_REQUIRED_COMPONENTS_MACRO
-+  )
-+  install(FILES
-+  ${CMAKE_CURRENT_BINARY_DIR}/s2Config.cmake
-+  DESTINATION "share/s2/"
-+  )
-diff --git a/Config.cmake.in b/Config.cmake.in
-new file mode 100644
-index 0000000..ac09b2d
---- /dev/null
-+++ b/Config.cmake.in
-@@ -0,0 +1,3 @@
-+@PACKAGE_INIT@
-+
-+include ( "${CMAKE_CURRENT_LIST_DIR}/s2Targets.cmake" )
diff --git a/ports/s2geometry/portfile.cmake b/ports/s2geometry/portfile.cmake
deleted file mode 100644
index bd41a47dc7e780..00000000000000
--- a/ports/s2geometry/portfile.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-vcpkg_fail_port_install(ON_TARGET "Windows")
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO google/s2geometry
-    REF v0.9.0
-    SHA512 854ec84a54aff036b3092a6233be0f5fc0e4846ac5f882326bbb3f2b9ce88bd5c866a80ae352d8e7d5ae00b9c9a8ab1cff6a95412f990b7bc1fdc5ca3d632b9c
-
-    HEAD_REF main
-      PATCHES
-       config.patch
-)
-
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS
-        -DBUILD_EXAMPLES=OFF
-        -DBUILD_TESTING=OFF
-    MAYBE_UNUSED_VARIABLES BUILD_TESTING
-)
-
-vcpkg_install_cmake()
-  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
diff --git a/ports/s2geometry/vcpkg.json b/ports/s2geometry/vcpkg.json
deleted file mode 100644
index 453b45217da7df..00000000000000
--- a/ports/s2geometry/vcpkg.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "s2geometry",
-  "version-string": "0.9.0",
-  "description": "S2 is a library for spherical geometry that aims to have the same robustness, flexibility, and performance as the very best planar geometry libraries.",
-  "homepage": "https://s2geometry.io",
-  "supports": "!windows"
-}
diff --git a/versions/baseline.json b/versions/baseline.json
index 889418df952393..51480c0e4a7189 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6136,10 +6136,6 @@
       "baseline": "2.0",
       "port-version": 5
     },
-    "s2geometry": {
-      "baseline": "0.9.0",
-      "port-version": 0
-    },
     "s2n": {
       "baseline": "1.3.0",
       "port-version": 0
diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json
new file mode 100644
index 00000000000000..5799dd88213c23
--- /dev/null
+++ b/versions/m-/mvfst.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "f1d022715c453280b7d01d936305a7562083e5f0",
+      "version-string": "0.1",
+      "port-version": 0
+    }
+  ]
+}

From d009c21922b8c6509ea3951d7d6d4f94275af856 Mon Sep 17 00:00:00 2001
From: jiayuehua <3423893+jiayuehua@users.noreply.github.com>
Date: Mon, 20 Dec 2021 16:28:04 +0800
Subject: [PATCH 41/48] [mvfst] new port

---
 versions/s-/s2geometry.json | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 versions/s-/s2geometry.json

diff --git a/versions/s-/s2geometry.json b/versions/s-/s2geometry.json
deleted file mode 100644
index f57546602712e2..00000000000000
--- a/versions/s-/s2geometry.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "versions": [
-    {
-      "git-tree": "3a20b84530470d3051776b36b86fd8fe4cf8a682",
-      "version-string": "0.9.0",
-      "port-version": 0
-    }
-  ]
-}

From 901f86861e127714f4b18dc24680a2670ea2eed5 Mon Sep 17 00:00:00 2001
From: jiayuehua <3423893+jiayuehua@users.noreply.github.com>
Date: Mon, 20 Dec 2021 16:34:05 +0800
Subject: [PATCH 42/48] [mvfst] New port

---
 ports/mvfst/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake
index ff5897c0b385a4..3a2637d9c2b440 100644
--- a/ports/mvfst/portfile.cmake
+++ b/ports/mvfst/portfile.cmake
@@ -1,5 +1,5 @@
 vcpkg_fail_port_install(ON_TARGET "Windows")
-set(VCPKG_CONCURRENCY 2)
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebookincubator/mvfst

From 8c22343c1094d2b56c2b3778fdea7824519dd00d Mon Sep 17 00:00:00 2001
From: "yuehua.jia" <3423893+jiayuehua@users.noreply.github.com>
Date: Mon, 20 Dec 2021 16:54:24 +0800
Subject: [PATCH 43/48] Update ports/mvfst/portfile.cmake

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
---
 ports/mvfst/portfile.cmake | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake
index 3a2637d9c2b440..2f074a9f5519f2 100644
--- a/ports/mvfst/portfile.cmake
+++ b/ports/mvfst/portfile.cmake
@@ -9,9 +9,8 @@ vcpkg_from_github(
 )
 
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_TESTS=OFF
         -DBUILD_EXAMPLES=OFF

From 18929e468b467204affb60b08b27c5334d955c3e Mon Sep 17 00:00:00 2001
From: jiayuehua <3423893+jiayuehua@users.noreply.github.com>
Date: Mon, 20 Dec 2021 17:00:23 +0800
Subject: [PATCH 44/48] [mvfst] new port

---
 ports/mvfst/portfile.cmake | 5 +----
 ports/mvfst/vcpkg.json     | 2 +-
 versions/m-/mvfst.json     | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/ports/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake
index 3a2637d9c2b440..4dab7b41b3c5e0 100644
--- a/ports/mvfst/portfile.cmake
+++ b/ports/mvfst/portfile.cmake
@@ -11,7 +11,6 @@ vcpkg_from_github(
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
     OPTIONS
         -DBUILD_TESTS=OFF
         -DBUILD_EXAMPLES=OFF
@@ -19,9 +18,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mvfst)
-file(REMOVE_RECURSE
-${CURRENT_PACKAGES_DIR}/debug/include
-)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 
diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json
index ec83557cef892a..ffe18e0dae28e6 100644
--- a/ports/mvfst/vcpkg.json
+++ b/ports/mvfst/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "mvfst",
-  "version-string": "0.1",
+  "version": "0.1",
   "description": "mvfst (Pronounced move fast) is a client and server implementation of IETF QUIC protocol in C++ by Facebook.",
   "homepage": "https://github.com/facebookincubator/mvfst",
   "supports": "!windows",
diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json
index 5799dd88213c23..400994db1a455e 100644
--- a/versions/m-/mvfst.json
+++ b/versions/m-/mvfst.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "f1d022715c453280b7d01d936305a7562083e5f0",
+      "git-tree": "a8eaa9a0bab37f50e6e7b9924aecb915fd30ac5b",
       "version-string": "0.1",
       "port-version": 0
     }

From 0c3a00ec69175bae7b10d673e3013bc165f078f0 Mon Sep 17 00:00:00 2001
From: jiayuehua <3423893+jiayuehua@users.noreply.github.com>
Date: Mon, 20 Dec 2021 19:06:00 +0800
Subject: [PATCH 45/48] [mvfst]: new port

---
 ports/s2geometry/config.patch   | 63 +++++++++++++++++++++++++++++++++
 ports/s2geometry/portfile.cmake | 28 +++++++++++++++
 ports/s2geometry/vcpkg.json     |  7 ++++
 3 files changed, 98 insertions(+)
 create mode 100644 ports/s2geometry/config.patch
 create mode 100644 ports/s2geometry/portfile.cmake
 create mode 100644 ports/s2geometry/vcpkg.json

diff --git a/ports/s2geometry/config.patch b/ports/s2geometry/config.patch
new file mode 100644
index 00000000000000..f809322d191972
--- /dev/null
+++ b/ports/s2geometry/config.patch
@@ -0,0 +1,63 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5ecd280..1a8367f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -211,7 +211,11 @@ target_link_libraries(
+ # list(APPEND CMAKE_MODULE_PATH "<path_to_s2geometry_dir>/third_party/cmake")
+ # add_subdirectory(<path_to_s2geometry_dir> s2geometry)
+ # target_link_libraries(<target_name> s2)
+-target_include_directories(s2 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
++target_include_directories(s2 PUBLIC
++  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
++$<INSTALL_INTERFACE:include>
++)
++
+
+ # We don't need to install all headers, only those
+ # transitively included by s2 headers we are exporting.
+@@ -407,7 +411,17 @@ install(FILES src/s2/util/math/mathutil.h
+ install(FILES src/s2/util/units/length-units.h
+               src/s2/util/units/physical-units.h
+         DESTINATION include/s2/util/units)
+-install(TARGETS s2 s2testing DESTINATION lib)
++ install(TARGETS s2 s2testing
++         RUNTIME DESTINATION bin
++         ARCHIVE DESTINATION lib
++         LIBRARY DESTINATION lib)
++install(TARGETS s2
++        EXPORT s2Targets
++        )
++install(EXPORT s2Targets
++  FILE s2Targets.cmake
++  DESTINATION share/s2/
++)
+
+ message("GTEST_ROOT: ${GTEST_ROOT}")
+ if (GTEST_ROOT)
+@@ -534,3 +548,17 @@ endif()
+ if (${SWIG_FOUND} AND ${PYTHONLIBS_FOUND})
+   add_subdirectory("src/python" python)
+ endif()
++
++
++include(CMakePackageConfigHelpers)
++# generate the config file that is includes the exports
++configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
++  "${CMAKE_CURRENT_BINARY_DIR}/s2Config.cmake"
++  INSTALL_DESTINATION "share/s2/"
++  NO_SET_AND_CHECK_MACRO
++  NO_CHECK_REQUIRED_COMPONENTS_MACRO
++  )
++  install(FILES
++  ${CMAKE_CURRENT_BINARY_DIR}/s2Config.cmake
++  DESTINATION "share/s2/"
++  )
+diff --git a/Config.cmake.in b/Config.cmake.in
+new file mode 100644
+index 0000000..ac09b2d
+--- /dev/null
++++ b/Config.cmake.in
+@@ -0,0 +1,3 @@
++@PACKAGE_INIT@
++
++include ( "${CMAKE_CURRENT_LIST_DIR}/s2Targets.cmake" )
diff --git a/ports/s2geometry/portfile.cmake b/ports/s2geometry/portfile.cmake
new file mode 100644
index 00000000000000..f114d70d7d7162
--- /dev/null
+++ b/ports/s2geometry/portfile.cmake
@@ -0,0 +1,28 @@
+vcpkg_fail_port_install(ON_TARGET "Windows")
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO google/s2geometry
+    REF v0.9.0
+    SHA512 854ec84a54aff036b3092a6233be0f5fc0e4846ac5f882326bbb3f2b9ce88bd5c866a80ae352d8e7d5ae00b9c9a8ab1cff6a95412f990b7bc1fdc5ca3d632b9c
+    HEAD_REF main
+    PATCHES
+       config.patch
+)
+
+
+vcpkg_cmake_configure(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        -DBUILD_EXAMPLES=OFF
+        -DBUILD_TESTING=OFF
+    MAYBE_UNUSED_VARIABLES BUILD_TESTING
+)
+
+vcpkg_cmake_install()
+  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
diff --git a/ports/s2geometry/vcpkg.json b/ports/s2geometry/vcpkg.json
new file mode 100644
index 00000000000000..df87a5ca18934b
--- /dev/null
+++ b/ports/s2geometry/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "s2geometry",
+  "version": "0.9.0",
+  "description": "S2 is a library for spherical geometry that aims to have the same robustness, flexibility, and performance as the very best planar geometry libraries.",
+  "homepage": "https://s2geometry.io",
+  "supports": "!windows"
+}

From a6c2c094b00cf47104f80e1b6b4c521f0137cdc4 Mon Sep 17 00:00:00 2001
From: jiayuehua <3423893+jiayuehua@users.noreply.github.com>
Date: Mon, 20 Dec 2021 19:14:10 +0800
Subject: [PATCH 46/48] [mvfst] new port

---
 ports/s2geometry/config.patch   | 63 ---------------------------------
 ports/s2geometry/portfile.cmake | 28 ---------------
 ports/s2geometry/vcpkg.json     |  7 ----
 3 files changed, 98 deletions(-)
 delete mode 100644 ports/s2geometry/config.patch
 delete mode 100644 ports/s2geometry/portfile.cmake
 delete mode 100644 ports/s2geometry/vcpkg.json

diff --git a/ports/s2geometry/config.patch b/ports/s2geometry/config.patch
deleted file mode 100644
index f809322d191972..00000000000000
--- a/ports/s2geometry/config.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5ecd280..1a8367f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -211,7 +211,11 @@ target_link_libraries(
- # list(APPEND CMAKE_MODULE_PATH "<path_to_s2geometry_dir>/third_party/cmake")
- # add_subdirectory(<path_to_s2geometry_dir> s2geometry)
- # target_link_libraries(<target_name> s2)
--target_include_directories(s2 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src)
-+target_include_directories(s2 PUBLIC
-+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
-+$<INSTALL_INTERFACE:include>
-+)
-+
-
- # We don't need to install all headers, only those
- # transitively included by s2 headers we are exporting.
-@@ -407,7 +411,17 @@ install(FILES src/s2/util/math/mathutil.h
- install(FILES src/s2/util/units/length-units.h
-               src/s2/util/units/physical-units.h
-         DESTINATION include/s2/util/units)
--install(TARGETS s2 s2testing DESTINATION lib)
-+ install(TARGETS s2 s2testing
-+         RUNTIME DESTINATION bin
-+         ARCHIVE DESTINATION lib
-+         LIBRARY DESTINATION lib)
-+install(TARGETS s2
-+        EXPORT s2Targets
-+        )
-+install(EXPORT s2Targets
-+  FILE s2Targets.cmake
-+  DESTINATION share/s2/
-+)
-
- message("GTEST_ROOT: ${GTEST_ROOT}")
- if (GTEST_ROOT)
-@@ -534,3 +548,17 @@ endif()
- if (${SWIG_FOUND} AND ${PYTHONLIBS_FOUND})
-   add_subdirectory("src/python" python)
- endif()
-+
-+
-+include(CMakePackageConfigHelpers)
-+# generate the config file that is includes the exports
-+configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
-+  "${CMAKE_CURRENT_BINARY_DIR}/s2Config.cmake"
-+  INSTALL_DESTINATION "share/s2/"
-+  NO_SET_AND_CHECK_MACRO
-+  NO_CHECK_REQUIRED_COMPONENTS_MACRO
-+  )
-+  install(FILES
-+  ${CMAKE_CURRENT_BINARY_DIR}/s2Config.cmake
-+  DESTINATION "share/s2/"
-+  )
-diff --git a/Config.cmake.in b/Config.cmake.in
-new file mode 100644
-index 0000000..ac09b2d
---- /dev/null
-+++ b/Config.cmake.in
-@@ -0,0 +1,3 @@
-+@PACKAGE_INIT@
-+
-+include ( "${CMAKE_CURRENT_LIST_DIR}/s2Targets.cmake" )
diff --git a/ports/s2geometry/portfile.cmake b/ports/s2geometry/portfile.cmake
deleted file mode 100644
index f114d70d7d7162..00000000000000
--- a/ports/s2geometry/portfile.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-vcpkg_fail_port_install(ON_TARGET "Windows")
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO google/s2geometry
-    REF v0.9.0
-    SHA512 854ec84a54aff036b3092a6233be0f5fc0e4846ac5f882326bbb3f2b9ce88bd5c866a80ae352d8e7d5ae00b9c9a8ab1cff6a95412f990b7bc1fdc5ca3d632b9c
-    HEAD_REF main
-    PATCHES
-       config.patch
-)
-
-
-vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS
-        -DBUILD_EXAMPLES=OFF
-        -DBUILD_TESTING=OFF
-    MAYBE_UNUSED_VARIABLES BUILD_TESTING
-)
-
-vcpkg_cmake_install()
-  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-  file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
diff --git a/ports/s2geometry/vcpkg.json b/ports/s2geometry/vcpkg.json
deleted file mode 100644
index df87a5ca18934b..00000000000000
--- a/ports/s2geometry/vcpkg.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "name": "s2geometry",
-  "version": "0.9.0",
-  "description": "S2 is a library for spherical geometry that aims to have the same robustness, flexibility, and performance as the very best planar geometry libraries.",
-  "homepage": "https://s2geometry.io",
-  "supports": "!windows"
-}

From 8cd664baa1cf4af3e6f08ec27b3411927eafb365 Mon Sep 17 00:00:00 2001
From: jiayuehua <3423893+jiayuehua@users.noreply.github.com>
Date: Mon, 20 Dec 2021 19:20:39 +0800
Subject: [PATCH 47/48] [mvfst] new port

---
 ports/mvfst/portfile.cmake | 6 +++---
 versions/m-/mvfst.json     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake
index 4dab7b41b3c5e0..f80931dab49be5 100644
--- a/ports/mvfst/portfile.cmake
+++ b/ports/mvfst/portfile.cmake
@@ -9,15 +9,15 @@ vcpkg_from_github(
 )
 
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS
         -DBUILD_TESTS=OFF
         -DBUILD_EXAMPLES=OFF
 )
 
-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/mvfst)
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mvfst)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json
index f1ee09a725b6ca..0fcaef05eecb72 100644
--- a/versions/m-/mvfst.json
+++ b/versions/m-/mvfst.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "2539cb42f7d8090ccbbd7dc462d55bebc908bcdd",
+      "git-tree": "949f4573f904e57bf7918b823646cbcfa8178325",
       "version": "0.1",
       "port-version": 0
     }

From f7101c6048731c5a27b4faa758385ce9f78b9669 Mon Sep 17 00:00:00 2001
From: jiayuehua <3423893+jiayuehua@users.noreply.github.com>
Date: Tue, 21 Dec 2021 14:25:45 +0800
Subject: [PATCH 48/48] [mvfst]: new port

---
 ports/mvfst/portfile.cmake | 10 +++++-----
 ports/mvfst/vcpkg.json     | 10 +++++++++-
 versions/m-/mvfst.json     |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ports/mvfst/portfile.cmake b/ports/mvfst/portfile.cmake
index f80931dab49be5..16acf66fa5043f 100644
--- a/ports/mvfst/portfile.cmake
+++ b/ports/mvfst/portfile.cmake
@@ -3,14 +3,14 @@ vcpkg_fail_port_install(ON_TARGET "Windows")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO facebookincubator/mvfst
-    REF 497f6e4732bf6e95553d70e24f2e6e1a20c26397 
-    SHA512 41bb998f8183839f532c32755572df4a8d38a84ad164011675703a4de73347292b77134fe53359a5622b72c5b1f3fea4b295b8740eda754c860b41f75ba7f751
+    REF 531b935a  
+    SHA512  47683907e5c19aa7392bffc0f23378636e73e03bbbd598640d20042234a9385ac7ca2fb8202905e1c101713bfb3467df78b12fd1629ca83a3ccf2bae2f58a2e1
     HEAD_REF main
 )
 
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_TESTS=OFF
         -DBUILD_EXAMPLES=OFF
@@ -18,7 +18,7 @@ vcpkg_cmake_configure(
 
 vcpkg_cmake_install()
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/mvfst)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
diff --git a/ports/mvfst/vcpkg.json b/ports/mvfst/vcpkg.json
index ffe18e0dae28e6..7aec0054bd2489 100644
--- a/ports/mvfst/vcpkg.json
+++ b/ports/mvfst/vcpkg.json
@@ -9,6 +9,14 @@
     "fizz",
     "fmt",
     "folly",
-    "glog"
+    "glog",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/versions/m-/mvfst.json b/versions/m-/mvfst.json
index 0fcaef05eecb72..2bf6bed18a48de 100644
--- a/versions/m-/mvfst.json
+++ b/versions/m-/mvfst.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "949f4573f904e57bf7918b823646cbcfa8178325",
+      "git-tree": "9af76c6cd8bea86bff84e5ccddc9f9e39290391e",
       "version": "0.1",
       "port-version": 0
     }