microsoft · BillyONeal · Jun 8, 2023 · May 30, 2023 · May 31, 2023 · Jun 5, 2023
diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake
@@ -38,3 +38,14 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*")
 vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES})
 
+# The following pattern has an absolute path, but is still ultimately relocatable, so skip absolute paths check:
+# share\KF5I18n\KF5I18nMacros.cmake
+# # The Python executable used for building ki18n will be used as a fallback
+# # solution if it cannot be found in $PATH when building applications.
+# set(_KI18N_PYTHON_EXECUTABLE "C:/Dev/vcpkg-downloads/tools/python/python-3.10.7-x64/python.exe")
+# 
+# find_program(KI18N_PYTHON_EXECUTABLE NAMES python3 python2 python)
+# if(NOT KI18N_PYTHON_EXECUTABLE)
+#     set(KI18N_PYTHON_EXECUTABLE "${_KI18N_PYTHON_EXECUTABLE}")
+# endif()
+set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled)
diff --git a/ports/kf5i18n/vcpkg.json b/ports/kf5i18n/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "kf5i18n",
   "version": "5.98.0",
+  "port-version": 1,
   "description": "Advanced internationalization framework",
   "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html",
   "dependencies": [

diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake
@@ -470,3 +470,19 @@ endif()
 if(VCPKG_CROSSCOMPILING)
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6/Qt6Dependencies.cmake" "${CURRENT_HOST_INSTALLED_DIR}" "\${CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}")
 endif()
+
+# The following pattern exists in qt-cmake scripts, but is still relocatable, so disable the absolute paths check.
+# warning: There should be no absolute paths, such as the following, in an installed package:
+# Absolute paths were found in the following files:
+#     packages/qtbase_x64-linux/tools/Qt6/bin/qt-cmake-private
+#     packages/qtbase_x64-linux/tools/Qt6/bin/debug/qt-cmake-private
+#     packages/qtbase_x64-linux/tools/Qt6/bin/debug/qt-cmake
+#     packages/qtbase_x64-linux/tools/Qt6/bin/qt-cmake
+# 
+# # Try to use original cmake, otherwise to make it relocatable, use any cmake found in PATH.
+# original_cmake_path="/home/bion/vcpkg/downloads/tools/cmake-3.25.1-linux/cmake-3.25.1-linux-x86_64/bin/cmake"
+# cmake_path=$original_cmake_path
+# if ! test -f "$cmake_path"; then
+#     cmake_path="cmake"
+# fi
+set(VCPKG_POLICY_SKIP_ABSOLUTE_PATHS_CHECK enabled)
diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qtbase",
   "version": "6.5.1",
+  "port-version": 1,
   "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/redis-plus-plus/portfile.cmake b/ports/redis-plus-plus/portfile.cmake
@@ -29,6 +29,7 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" REDIS_PLUS_PLUS_BUILD_
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DREDIS_PLUS_PLUS_USE_TLS=OFF
         -DREDIS_PLUS_PLUS_BUILD_STATIC=${REDIS_PLUS_PLUS_BUILD_STATIC}

diff --git a/ports/redis-plus-plus/vcpkg.json b/ports/redis-plus-plus/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "redis-plus-plus",
   "version-semver": "1.3.8",
+  "port-version": 1,
   "description": "This is a C++ client for Redis. It's based on hiredis, and written in C++ 11",
   "homepage": "https://github.com/sewenew/redis-plus-plus",
   "license": "Apache-2.0",

diff --git a/ports/vcpkg-cmake/vcpkg.json b/ports/vcpkg-cmake/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "vcpkg-cmake",
-  "version-date": "2022-12-22",
+  "version-date": "2023-05-04",
   "documentation": "https://vcpkg.io/en/docs/maintainers/ports/vcpkg-cmake.html",
   "license": "MIT"
 }
diff --git a/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake b/ports/vcpkg-cmake/vcpkg_cmake_configure.cmake
@@ -132,6 +132,10 @@ function(vcpkg_cmake_configure)
         vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}")
     endif()
 
+    if(DEFINED VCPKG_XBOX_CONSOLE_TARGET)
+        vcpkg_list(APPEND arg_OPTIONS "-DXBOX_CONSOLE_TARGET=${VCPKG_XBOX_CONSOLE_TARGET}")
+    endif()
+
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
         vcpkg_list(APPEND arg_OPTIONS "-DBUILD_SHARED_LIBS=ON")
     elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake
@@ -89,7 +89,9 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/var" "${CURRENT_PACKAGES_DIR}/debug/var")
 
 # RUNDIR is only used for wtfcgi what we don't build. See https://redmine.webtoolkit.eu/issues/9646
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Wt/WConfig.h" "#define RUNDIR \"${CURRENT_PACKAGES_DIR}/var/run/wt\"" "")
+file(READ "${CURRENT_PACKAGES_DIR}/include/Wt/WConfig.h" W_CONFIG_H)
+string(REGEX REPLACE "([\r\n])#define RUNDIR[^\r\n]+" "\\1// RUNDIR intentionally unset by vcpkg" W_CONFIG_H "${W_CONFIG_H}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/include/Wt/WConfig.h" "${W_CONFIG_H}")
 
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 vcpkg_copy_pdbs()
diff --git a/ports/wt/vcpkg.json b/ports/wt/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "wt",
   "version": "4.9.1",
+  "port-version": 1,
   "description": "Wt is a C++ library for developing web applications",
   "homepage": "https://github.com/emweb/wt",
   "license": "GPL-2.0-only",

diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
@@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root"))
 
 Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found"
 
-$versionDate = '2023-04-07'
+$versionDate = '2023-06-07'
 if ($env:PROCESSOR_ARCHITECTURE -eq 'ARM64' -or $env:PROCESSOR_IDENTIFIER -match "ARMv[8,9] \(64-bit\)") {
     & "$scriptsDir/tls12-download-arm64.exe" github.com "/microsoft/vcpkg-tool/releases/download/$versionDate/vcpkg-arm64.exe" "$vcpkgRootDir\vcpkg.exe"
 } else {

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
@@ -128,23 +128,23 @@ fi
 
 # Choose the vcpkg binary to download
 vcpkgDownloadTool="ON"
-vcpkgToolReleaseTag="2023-04-07"
+vcpkgToolReleaseTag="2023-06-07"
 if [ "$UNAME" = "Darwin" ]; then
     echo "Downloading vcpkg-macos..."
-    vcpkgToolReleaseSha="2a2805aa251a9523311c813e9e68896f18805fed4ace301c603f4afac3940b27d4ef1d3b4572c8f93ce4d13ac613720275b9e21e39cc5d19115d2fc849bfe2bb"
+    vcpkgToolReleaseSha="109879edb5e47e329532034afdd7edcc658be790555fe45fee20e0791457e0a42ff930a1450aa1f6faaa98732ed6a6abea2f53f5e5547adce987d8fa0c124df1"
     vcpkgToolName="vcpkg-macos"
 elif [ "$vcpkgUseMuslC" = "ON" ]; then
     echo "Downloading vcpkg-muslc..."
-    vcpkgToolReleaseSha="d8dc48e6dc866f4ebe3919c0bf1377769d6c6f1ad2dab7fc09da9b26f7dac3ab3b06affb585ece7ba72e2fdeacdc77b8df31ad08cff49e4c060b7647fc1cc22a"
+    vcpkgToolReleaseSha="96ed9b3e4ac58b61f54147b2533fd563bebe69721aa972974c0de354a31092c4cc24094372d37d9eb7968433fffa0e29c5e5dfd80cfdf7a76d0db373b0890fad"
     vcpkgToolName="vcpkg-muslc"
 elif [ "$ARCH" = "x86_64" ]; then
     echo "Downloading vcpkg-glibc..."
-    vcpkgToolReleaseSha="f26aaf5f503b9fd0a8b206230df19af966390d7087a9f3342f24c2d5e73f1f1bd81cba2695a89c87015ec822bd41bf836c2a9ef9f0e11acc61d6d9593aa8fae9"
+    vcpkgToolReleaseSha="7bc383231533262b436610ddce21946ff4f558afe2763cac03f186593e4be50c9377ebf8af6ecae5783a0589fa5f2ec540da70544d53f348fc23c731782de629"
     vcpkgToolName="vcpkg-glibc"
 else
     echo "Unable to determine a binary release of vcpkg; attempting to build from source."
     vcpkgDownloadTool="OFF"
-    vcpkgToolReleaseSha="89dc32154e22f6a51fa18a8ea22c16263533546469f73cdb4ee168ab7c68ebc2b2a93177284dc03ecf2d2ca438f9fd583def48844788942e98ea45027e8ec2fa"
+    vcpkgToolReleaseSha="148b85bd92fd9b53f66d0718b9bdf12d1a698cc5b15e491e093c170acd8aa59ae02fd65da0d79901ed9fa179e2bf3d9a1db046bb34e194f6c982ac6e2d7b73a0"
 fi
 
 # Do the download or build.

diff --git a/scripts/cmake/vcpkg_common_definitions.cmake b/scripts/cmake/vcpkg_common_definitions.cmake
@@ -2,6 +2,10 @@ string(COMPARE NOTEQUAL "${TARGET_TRIPLET}" "${HOST_TRIPLET}" VCPKG_CROSSCOMPILI
 #Helper variable to identify the Target system. VCPKG_TARGET_IS_<targetname>
 if (NOT DEFINED VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "")
     set(VCPKG_TARGET_IS_WINDOWS ON)
+
+    if(DEFINED VCPKG_XBOX_CONSOLE_TARGET AND NOT "${VCPKG_XBOX_CONSOLE_TARGET}" STREQUAL "")
+        set(VCPKG_TARGET_IS_XBOX ON)
+    endif()
 elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     set(VCPKG_TARGET_IS_WINDOWS ON)
     set(VCPKG_TARGET_IS_UWP ON)

diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -185,6 +185,10 @@ function(vcpkg_configure_cmake)
         endif()
     endif()
 
+    if(DEFINED VCPKG_XBOX_CONSOLE_TARGET)
+        vcpkg_list(APPEND arg_OPTIONS "-DXBOX_CONSOLE_TARGET=${VCPKG_XBOX_CONSOLE_TARGET}")
+    endif()
+
     if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION)
         vcpkg_list(APPEND arg_OPTIONS "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}")
     endif()

diff --git a/scripts/test_ports/cmake-user/portfile.cmake b/scripts/test_ports/cmake-user/portfile.cmake
@@ -129,6 +129,10 @@ function(test_cmake_project)
             list(APPEND base_options "-DCMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}")
         endif()
     endif()
+
+    if(DEFINED VCPKG_XBOX_CONSOLE_TARGET)
+        list(APPEND arg_OPTIONS "-DXBOX_CONSOLE_TARGET=${VCPKG_XBOX_CONSOLE_TARGET}")
+    endif()
 
     if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
         list(APPEND base_options -DBUILD_SHARED_LIBS=ON)

diff --git a/scripts/toolchains/xbox.cmake b/scripts/toolchains/xbox.cmake
@@ -12,14 +12,12 @@ endif()
 
 if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION)
     set(CMAKE_SYSTEM_VERSION "${VCPKG_CMAKE_SYSTEM_VERSION}" CACHE STRING "" FORCE)
+else()
+    set(CMAKE_SYSTEM_VERSION "10.0" CACHE STRING "" FORCE)
 endif()
 
 set(CMAKE_CROSSCOMPILING ON CACHE STRING "")
 
-if(NOT DEFINED CMAKE_SYSTEM_VERSION)
-    set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "")
-endif()
-
 # Add the Microsoft GDK if present
 if (DEFINED ENV{GRDKLatest})
     cmake_path(SET _vcpkg_grdk "$ENV{GRDKLatest}")

diff --git a/scripts/vcpkg_get_dep_info.cmake b/scripts/vcpkg_get_dep_info.cmake
diff --git a/scripts/vcpkg_get_tags.cmake b/scripts/vcpkg_get_tags.cmake
diff --git a/triplets/community/x64-xbox-scarlett-static.cmake b/triplets/community/x64-xbox-scarlett-static.cmake
@@ -1,10 +1,4 @@
 set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE static)
-set(VCPKG_ENV_PASSTHROUGH GameDKLatest GRDKLatest GXDKLatest)
-set(VCPKG_CMAKE_SYSTEM_VERSION 10.0)
-set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DXBOX_CONSOLE_TARGET=scarlett")
-set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../../scripts/toolchains/xbox.cmake")
-set(VCPKG_LOAD_VCVARS_ENV ON)
-set(VCPKG_TARGET_IS_XBOX ON)
-set(VCPKG_DEP_INFO_OVERRIDE_VARS xbox)
+set(VCPKG_XBOX_CONSOLE_TARGET scarlett)
diff --git a/triplets/community/x64-xbox-scarlett.cmake b/triplets/community/x64-xbox-scarlett.cmake
@@ -1,10 +1,4 @@
 set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE dynamic)
-set(VCPKG_ENV_PASSTHROUGH GameDKLatest GRDKLatest GXDKLatest)
-set(VCPKG_CMAKE_SYSTEM_VERSION 10.0)
-set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DXBOX_CONSOLE_TARGET=scarlett")
-set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../../scripts/toolchains/xbox.cmake")
-set(VCPKG_LOAD_VCVARS_ENV ON)
-set(VCPKG_TARGET_IS_XBOX ON)
-set(VCPKG_DEP_INFO_OVERRIDE_VARS xbox)
+set(VCPKG_XBOX_CONSOLE_TARGET scarlett)
diff --git a/triplets/community/x64-xbox-xboxone-static.cmake b/triplets/community/x64-xbox-xboxone-static.cmake
@@ -1,10 +1,4 @@
 set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE static)
-set(VCPKG_ENV_PASSTHROUGH GameDKLatest GRDKLatest GXDKLatest)
-set(VCPKG_CMAKE_SYSTEM_VERSION 10.0)
-set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DXBOX_CONSOLE_TARGET=xboxone")
-set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../../scripts/toolchains/xbox.cmake")
-set(VCPKG_LOAD_VCVARS_ENV ON)
-set(VCPKG_TARGET_IS_XBOX ON)
-set(VCPKG_DEP_INFO_OVERRIDE_VARS xbox)
+set(VCPKG_XBOX_CONSOLE_TARGET xboxone)
diff --git a/triplets/community/x64-xbox-xboxone.cmake b/triplets/community/x64-xbox-xboxone.cmake
@@ -1,10 +1,4 @@
 set(VCPKG_TARGET_ARCHITECTURE x64)
 set(VCPKG_CRT_LINKAGE dynamic)
 set(VCPKG_LIBRARY_LINKAGE dynamic)
-set(VCPKG_ENV_PASSTHROUGH GameDKLatest GRDKLatest GXDKLatest)
-set(VCPKG_CMAKE_SYSTEM_VERSION 10.0)
-set(VCPKG_CMAKE_CONFIGURE_OPTIONS "-DXBOX_CONSOLE_TARGET=xboxone")
-set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../../scripts/toolchains/xbox.cmake")
-set(VCPKG_LOAD_VCVARS_ENV ON)
-set(VCPKG_TARGET_IS_XBOX ON)
-set(VCPKG_DEP_INFO_OVERRIDE_VARS xbox)
+set(VCPKG_XBOX_CONSOLE_TARGET xboxone)
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -3602,7 +3602,7 @@
     },
     "kf5i18n": {
       "baseline": "5.98.0",
-      "port-version": 0
+      "port-version": 1
     },
     "kf5iconthemes": {
       "baseline": "5.98.0",
@@ -6734,7 +6734,7 @@
     },
     "qtbase": {
       "baseline": "6.5.1",
-      "port-version": 0
+      "port-version": 1
     },
     "qtcharts": {
       "baseline": "6.5.1",
@@ -7066,7 +7066,7 @@
     },
     "redis-plus-plus": {
       "baseline": "1.3.8",
-      "port-version": 0
+      "port-version": 1
     },
     "refl-cpp": {
       "baseline": "0.12.3",
@@ -8365,7 +8365,7 @@
       "port-version": 0
     },
     "vcpkg-cmake": {
-      "baseline": "2022-12-22",
+      "baseline": "2023-05-04",
       "port-version": 0
     },
     "vcpkg-cmake-config": {
@@ -8650,7 +8650,7 @@
     },
     "wt": {
       "baseline": "4.9.1",
-      "port-version": 0
+      "port-version": 1
     },
     "wtl": {
       "baseline": "10.0.10320",

diff --git a/versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f2263f5dbba39bdf456b8f1606f29ab4dc6e66cb",
+      "version": "5.98.0",
+      "port-version": 1
+    },
     {
       "git-tree": "8ce72b628f7998df3f90bcf7f9d313d9242ad5d8",
       "version": "5.98.0",

diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f5e0f416352dc6207bf48ac656e3747140232a31",
+      "version": "6.5.1",
+      "port-version": 1
+    },
     {
       "git-tree": "ce56d3e7af720645f1c4be18d11e659c1d3e48bf",
       "version": "6.5.1",

diff --git a/versions/r-/redis-plus-plus.json b/versions/r-/redis-plus-plus.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6be6c4d075dc736952132603d31f0ca568a0edde",
+      "version-semver": "1.3.8",
+      "port-version": 1
+    },
     {
       "git-tree": "c359e3bd938ceb9f3f5cde1b8aa4e435c9123534",
       "version-semver": "1.3.8",

diff --git a/versions/v-/vcpkg-cmake.json b/versions/v-/vcpkg-cmake.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "88a7058fc7fa73a9c4c99cfcae9d79e2abf87a5a",
+      "version-date": "2023-05-04",
+      "port-version": 0
+    },
     {
       "git-tree": "1913f86defd2140d0a6751be2d51952e4090efa4",
       "version-date": "2022-12-22",

diff --git a/versions/w-/wt.json b/versions/w-/wt.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "9dd116caa8830e2d131b0d3ffbcde1002aa12333",
+      "version": "4.9.1",
+      "port-version": 1
+    },
     {
       "git-tree": "3c2ab01f0b1932d0a5f62632fe26a28ea4a25faa",
       "version": "4.9.1",