Merge remote-tracking branch 'upstream/master' into sync/2024-02-07

.github/ISSUE_TEMPLATE/00-report-package-build-failure.yml

@@ -35,7 +35,7 @@ body:
     id: logs
     attributes:
       label: Failure logs
-      description: The console output and all the logs metioned in the output
+      description: The console output and all the logs mentioned in the output.
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/01-request-a-new-port.yml

@@ -1,5 +1,5 @@
 name: Request a new port
-description: Request a new port/library that vcpkg should support
+description: Request a new port/library that vcpkg should support.
 title: "[New Port Request] <library name here>"
 labels: ["category:new-port", "info:good-first-issue"]
 

.github/ISSUE_TEMPLATE/03-request-a-feature-or-improvement-to-a-port.yml

@@ -1,5 +1,5 @@
 name: Request a feature or improvement to a port
-description: Suggest an improvement to one the the ports/libraries in vcpkg
+description: Suggest an improvement to one the the ports/libraries in vcpkg.
 title: "[<portname>] <short description of feature>"
 labels: ["category:port-feature"]
 body:

.github/ISSUE_TEMPLATE/04-request-a-feature-or-improvement.yml

@@ -1,5 +1,5 @@
 name: Request a feature or improvement
-description: Suggest an improvement to vcpkg
+description: Suggest an improvement to vcpkg.
 title: ''
 labels: ["category:vcpkg-feature"]
 body:

.github/ISSUE_TEMPLATE/05-other-type-of-bug-report.md

@@ -1,6 +1,6 @@
 ---
 name: Other type of bug report
-about: Let us know about an issues that does not fit into any of the other issues
+about: Let us know about an issues that does not fit into any of the other issues.
   types
 title: ''
 labels: ''

.github/pull_request_template.md

@@ -1,12 +1,12 @@
 <!-- If your PR fixes issues, please note that here by adding "Fixes #NNNNNN." for each fixed issue on separate lines. -->
 
-<!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/ -->
+<!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/. -->
 
 <!-- If this PR updates an existing port, please uncomment and fill out this checklist:
 
-- [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md)
-- [ ] SHA512s are updated for each updated download
-- [ ] The "supports" clause reflects platforms that may be fixed by this new version
+- [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
+- [ ] SHA512s are updated for each updated download.
+- [ ] The "supports" clause reflects platforms that may be fixed by this new version.
 - [ ] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.
 - [ ] Any patches that are no longer applied are deleted from the port's directory.
 - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result.
@@ -16,9 +16,9 @@ END OF PORT UPDATE CHECKLIST (delete this line) -->
 
 <!-- If this PR adds a new port, please uncomment and fill out this checklist:
 
-- [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md)
+- [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
 - [ ] The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines.
-- [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html)
+- [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html).
 - [ ] The versioning scheme in `vcpkg.json` matches what upstream says.
 - [ ] The license declaration in `vcpkg.json` matches what upstream says.
 - [ ] The installed as the "copyright" file matches what upstream says.

.github/workflows/check_issues.yml

@@ -11,7 +11,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         with:
           script: |
             let issue_query = {
@@ -42,3 +42,24 @@ jobs:
               await github.rest.issues.createComment({...issue_query, body}); 
               // Close the issue? 
             }
+
+            // Issue text is: Copy issue body from .../issue_body.md
+            reg = /^Copy issue body from .*issue_body.md$/;
+            if (reg.test(issue.data.body)){
+              await github.rest.issues.removeAllLabels(issue_query);
+              await github.rest.issues.setLabels({...issue_query, labels: ["requires:more-information"]});
+              let body = "Please see #30604 for how to report a build failure."
+              await github.rest.issues.createComment({...issue_query, body});
+              await github.rest.issues.update({...issue_query, state: "closed"});
+            }
+
+            // pkg-config/ not found issues like #36011
+            reg = /CMake Error at scripts\/cmake\/vcpkg_find_acquire_program.*\r\n(.*Please install it via your package manager:[\s\S]+)Call Stack/;
+            match = issue.data.body.match(reg)
+            if (match){
+              await github.rest.issues.removeAllLabels(issue_query);
+              await github.rest.issues.setLabels({...issue_query, labels: ["category:question"]});
+              let body = "From the log:\n```\n" + match[1] + "```\n"
+              await github.rest.issues.createComment({...issue_query, body});
+              await github.rest.issues.update({...issue_query, state: "closed"});
+            }

.github/workflows/stale.yml

@@ -7,25 +7,26 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v9
         with:
           stale-issue-message: 'This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 28 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment.'
           any-of-labels: 'category:question,requires:repro,requires:more-information'
           days-before-issue-stale: 28
           days-before-pr-stale: -1
           days-before-close: 14
-      - uses: actions/stale@v6
+      - uses: actions/stale@v9
         with:
           stale-issue-message: "This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 60 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment."
           any-of-labels: 'category:new-port'
           close-issue-label: 'info:new-port-unresolved'
           days-before-issue-stale: 60
           days-before-pr-stale: -1
           days-before-close: 14
-      - uses: actions/stale@v6
+      - uses: actions/stale@v9
         with:
           stale-issue-message: "This is an automated message. Per our repo policy, stale issues get closed if there has been no activity in the past 180 days. The issue will be automatically closed in 14 days. If you wish to keep this issue open, please add a new comment."
           exempt-issue-labels: 'no-stale,category:new-port,category:question,requires:repro,requires:more-information'
           days-before-issue-stale: 180
           days-before-pr-stale: -1
           days-before-close: 14
+          operations-per-run: 50

.github/workflows/untrustedPR.yml

@@ -9,7 +9,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # fetch-depth 50 tries to ensure we capture the whole history of the branch
           fetch-depth: 50
@@ -46,7 +46,7 @@ jobs:
           git reset HEAD~ --mixed
 
       - name: Generate Reply
-        uses: actions/github-script@v6
+        uses: actions/github-script@v7
         with:
           script: |
             const { promises: fs } = require('fs')
@@ -96,7 +96,7 @@ jobs:
             
             if (deprecated_function.length > 0) {
               var deprecated_output = '';
-              deprecated_output += "You have modified or added at least one portfile where deprecated functions are used.\n"
+              deprecated_output += "**You have modified or added at least one portfile where deprecated functions are used**\n"
               deprecated_output += "If you feel able to do so, please consider migrating them to the new functions.\n";
               core.warning(deprecated_output);
 

README.md

@@ -226,16 +226,8 @@ add the path to the vcpkg toolchain file:
 
 ### Vcpkg with CLion
 
-Open the Toolchains settings
-(File > Settings on Windows and Linux, CLion > Preferences on macOS),
-and go to the CMake settings (Build, Execution, Deployment > CMake).
-Finally, in `CMake options`, add the following line:
-
-```
--DCMAKE_TOOLCHAIN_FILE=[vcpkg root]/scripts/buildsystems/vcpkg.cmake
-```
-
-You must add this line to each profile.
+Vcpkg is integrated in the CLion IDE. 
+For details, see the [official documentation](https://www.jetbrains.com/help/clion/package-management.html).
 
 ### Vcpkg as a Submodule with CMake
 

bootstrap-vcpkg.bat

@@ -1,2 +1,2 @@
 @echo off
-powershell.exe -NoProfile -ExecutionPolicy Bypass "& {& '%~dp0scripts\bootstrap.ps1' %*}"
+powershell.exe -NoProfile -ExecutionPolicy Bypass "& {& \"%~dp0scripts\bootstrap.ps1\" %*}"

ports/7zip/CMakeLists.txt

@@ -401,6 +401,7 @@ target_compile_definitions(7zip
 target_include_directories(7zip
     INTERFACE
         $<INSTALL_INTERFACE:include>/7zip/CPP
+        $<INSTALL_INTERFACE:include>/7zip/C
 )
 
 install(

ports/7zip/portfile.cmake

@@ -1,14 +1,9 @@
-set(7ZIP_VERSION "2301")
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.7-zip.org/a/7z${7ZIP_VERSION}-src.7z"
-    FILENAME "7z${7ZIP_VERSION}-src.7z"
-    SHA512 45038fc49b0be8e7435939a79ad9f46f360b43b651148a8cde74fafdb8536f51a4be3b1ea91e06203267e5121267f6601f8ae6678feaf18e4b7a4f79a16730e7
-)
-
-vcpkg_extract_source_archive(
-    SOURCE_PATH
-    ARCHIVE "${ARCHIVE}"
-    NO_REMOVE_ONE_LEVEL
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO ip7z/7zip
+    REF "${VERSION}"
+    SHA512 7c2fb18261ce9185d29b690ccb7694d7926abe3af0619dbe42b7ab43b400ee71c1eb79c31f892aea2fbdb55036225f31ee393287cce91afd17f20cff8f6cb949
+    HEAD_REF main
 )
 
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
@@ -23,10 +18,6 @@ vcpkg_copy_pdbs()
 
 vcpkg_cmake_config_fixup()
 
-file(
-    INSTALL "${SOURCE_PATH}/DOC/License.txt"
-    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"
-    RENAME copyright
-)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/DOC/License.txt")
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

ports/7zip/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "7zip",
   "version-string": "23.01",
+  "port-version": 2,
   "description": "Library for archiving file with a high compression ratio.",
   "homepage": "https://www.7-zip.org",
   "license": "LGPL-2.1-or-later",

ports/ableton-link/portfile.cmake

@@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Ableton/link
-    REF Link-3.0.6
-    SHA512 7dd811d3b7792722a8754cd0875777b8cf4902a0babff2822a6fd997137eb5feac576263169c71fca24358189e56b5106a32ae1313b33fb6148eb845691a6438
+    REF "Link-${VERSION}"
+    SHA512 4c62357b74ed8bed21455d977504787ff4c11a862a0ee583c491742c93f6f4bc44b98df2a35f7811584277456b7580835098bc7b9afdd57caf7bd91f9462d202
     HEAD_REF master
     PATCHES
         replace_local_asiostandalone_by_vcpkg_asio.patch
@@ -76,8 +76,8 @@ vcpkg_apply_patches(
         correct_cmake_include_directory.patch
 )
 
-file(INSTALL "${SOURCE_PATH}/AbletonLinkConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/")
-file(INSTALL "${SOURCE_PATH}/cmake_include/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/cmake_include/")
+file(INSTALL "${SOURCE_PATH}/AbletonLinkConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/abletonlink")
+file(INSTALL "${SOURCE_PATH}/cmake_include/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/abletonlink/cmake_include/")
 file(INSTALL "${SOURCE_PATH}/include/" DESTINATION "${CURRENT_PACKAGES_DIR}/include" PATTERN "CMakeLists.txt" EXCLUDE)
 
 # Handle copyright

ports/ableton-link/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "ableton-link",
-  "version": "3.0.6",
-  "port-version": 1,
+  "version": "3.1.0",
   "description": "Ableton Link, a technology that synchronizes musical beat, tempo, and phase across multiple applications running on one or more devices.",
   "homepage": "https://www.ableton.com/en/link/",
   "documentation": "http://ableton.github.io/link/",

ports/ace/portfile.cmake

@@ -8,14 +8,14 @@ if("tao" IN_LIST FEATURES)
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE%2BTAO-src-${VERSION}.tar.gz"
         FILENAME "ACE-TAO-${VERSION}.tar.gz"
-        SHA512 ab1317e626f1b312cd72e6c10f7b51088e5de4db8fa3bca013a98b07aad4edfb5e1f42a4f58c970f968417852b305f298a34e0fde053a1f52754ebe3761f314c
+        SHA512 afa26e0579ebbac5db82df80a4ce6c2350d4665043bb549688dce4db08b3b1a7c6b072544d651b90bd521ae477de069f280ab8d52fe957143d1f8a7cbd23eb29
     )
 else()
     # Don't change to vcpkg_from_github! This points to a release and not an archive
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${VERSION_DIRECTORY}/ACE-src-${VERSION}.tar.gz"
         FILENAME "ACE-src-${VERSION}.tar.gz"
-        SHA512 1605fdf7a78bfce090bc8b14137f9aafd23019712672f6cd041284656ce2bae0baff954124166aeb16a0565887e1d87b2d10dc2ec5981c4e38fc8d0b39a97934
+        SHA512 b08c8cf98b622248cfbf167ca91c8314284c84c4dcb1c48fedb9180be2bc354c1d647372eb046e75d426ac4f2ad0318a8dd9e3f233d36bc30f744d5f9e37c5ec
     )
 endif()
 
@@ -294,6 +294,7 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
   get_filename_component(WORKING_DIR "${WORKSPACE}" DIRECTORY)
   set(ENV{PWD} "${WORKING_DIR}")
 
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
   message(STATUS "Building ${TARGET_TRIPLET}-dbg")
   vcpkg_execute_build_process(
     COMMAND make ${_ace_makefile_macros} "debug=1" "optimize=0" "-j${VCPKG_CONCURRENCY}"
@@ -344,7 +345,9 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
       LOGNAME realclean-xml-${TARGET_TRIPLET}-dbg
     )
   endif()
-
+endif()
+
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
   message(STATUS "Building ${TARGET_TRIPLET}-rel")
   vcpkg_execute_build_process(
     COMMAND make ${_ace_makefile_macros} "-j${VCPKG_CONCURRENCY}"
@@ -377,6 +380,8 @@ elseif(VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_OSX)
     file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
   endif()
   message(STATUS "Packaging ${TARGET_TRIPLET}-rel done")
+endif()
+
   # Restore `PWD` environment variable
   set($ENV{PWD} _prev_env)
 

ports/ace/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "ace",
-  "version": "7.1.1",
-  "port-version": 2,
+  "version": "7.1.2",
+  "port-version": 1,
   "maintainers": "Johnny Willemsen <[email protected]>",
   "description": "The ADAPTIVE Communication Environment",
   "homepage": "https://github.com/DOCGroup/ACE_TAO",

ports/acl/portfile.cmake

@@ -1,7 +1,7 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 vcpkg_download_distfile(ARCHIVE
     URLS "http://download.savannah.nongnu.org/releases/acl/acl-${VERSION}.tar.xz"
+         "https://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/acl/acl-${VERSION}.tar.xz"
+
     FILENAME "acl-${VERSION}.tar.xz"
     SHA512 7d02f05d17305f8587ab485395b00c7fdb8e44c1906d0d04b70a43a3020803e8b2b8c707abb6147f794867dfa87bd51769c2d3e11a3db55ecbd2006a6e6231dc
 )
@@ -11,15 +11,25 @@ vcpkg_extract_source_archive(
     ARCHIVE ${ARCHIVE}
 )
 
+vcpkg_list(SET options)
+if("nls" IN_LIST FEATURES)
+    vcpkg_list(APPEND options "--enable-nls")
+    vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin")
+else()
+    set(ENV{AUTOPOINT} true) # true, the program
+    vcpkg_list(APPEND options "--disable-nls")
+endif()
+
 vcpkg_configure_make(
     SOURCE_PATH "${SOURCE_PATH}"
     AUTOCONFIG
+    OPTIONS
+        ${options}
 )
 
 vcpkg_install_make()
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-vcpkg_fixup_pkgconfig()
-
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/doc/COPYING.LGPL")

ports/acl/vcpkg.json

@@ -1,12 +1,27 @@
 {
   "name": "acl",
   "version-semver": "2.3.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Commands for Manipulating POSIX Access Control Lists",
   "homepage": "https://savannah.nongnu.org/projects/acl",
   "license": "LGPL-2.1-or-later",
   "supports": "linux",
   "dependencies": [
     "attr"
-  ]
+  ],
+  "features": {
+    "nls": {
+      "description": "Enable native language support",
+      "dependencies": [
+        {
+          "name": "gettext",
+          "host": true,
+          "features": [
+            "tools"
+          ]
+        },
+        "gettext-libintl"
+      ]
+    }
+  }
 }