From 6f1ddd6b6878e7e66fcc35c65ba1d8feec2e01f8 Mon Sep 17 00:00:00 2001 From: Weihang Ding <798047000@qq.com> Date: Fri, 7 Jun 2024 18:14:31 +0800 Subject: [PATCH] [nss] Fix build error on non pure English system (#39033) --- ports/nss/portfile.cmake | 3 ++- ports/nss/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/n-/nss.json | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/nss/portfile.cmake b/ports/nss/portfile.cmake index bef866ed2f..7ed61e861c 100644 --- a/ports/nss/portfile.cmake +++ b/ports/nss/portfile.cmake @@ -4,7 +4,7 @@ string(REPLACE "." "_" V_URL ${VERSION}) vcpkg_download_distfile(ARCHIVE URLS "https://ftp.mozilla.org/pub/security/nss/releases/NSS_${V_URL}_RTM/src/nss-${VERSION}.tar.gz" FILENAME "nss-${VERSION}.tar.gz" - SHA512 8ae032f3cb8eadfe524505d20e430b90ed25af2b4732b2cf286c435b0fcd5701d2f5c48bd2cfb3f9aa0bfdf503c1f3d5394cf34f860f51a1141cc4a7586bba32 + SHA512 8ae032f3cb8eadfe524505d20e430b90ed25af2b4732b2cf286c435b0fcd5701d2f5c48bd2cfb3f9aa0bfdf503c1f3d5394cf34f860f51a1141cc4a7586bba32 ) vcpkg_extract_source_archive( @@ -119,6 +119,7 @@ if (VCPKG_TARGET_IS_WINDOWS) ) list(APPEND GYPENV + "PYTHONUTF8=1" "VSPATH=${GYP_MSVS_OVERRIDE_PATH}" "GYP_MSVS_OVERRIDE_PATH=${GYP_MSVS_OVERRIDE_PATH}" "GYP_MSVS_VERSION=${GYP_MSVS_VERSION}" diff --git a/ports/nss/vcpkg.json b/ports/nss/vcpkg.json index 97fce7a1d4..de7b721cde 100644 --- a/ports/nss/vcpkg.json +++ b/ports/nss/vcpkg.json @@ -1,6 +1,7 @@ { "name": "nss", "version": "3.99", + "port-version": 1, "description": "Network Security Services from Mozilla", "homepage": "https://ftp.mozilla.org/pub/security/nss/releases/", "license": "MPL-2.0", diff --git a/versions/baseline.json b/versions/baseline.json index a79e185ae0..641ad51472 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6226,7 +6226,7 @@ }, "nss": { "baseline": "3.99", - "port-version": 0 + "port-version": 1 }, "nsync": { "baseline": "1.26.0", diff --git a/versions/n-/nss.json b/versions/n-/nss.json index 09248284fd..fe53894478 100644 --- a/versions/n-/nss.json +++ b/versions/n-/nss.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "93c8abd74523ba189511a0846810848b9a0ed9b5", + "version": "3.99", + "port-version": 1 + }, { "git-tree": "ea00c7a5c7a405e00c94f4bf162bb5a616c2956c", "version": "3.99",