From fa6e6a6ec3224f1d3697d544edef6272a59cd834 Mon Sep 17 00:00:00 2001 From: Alonso Schaich Date: Mon, 22 Jan 2024 20:32:16 +0000 Subject: [PATCH] [gettext] Workaround bash substitution failure (#36203) * [gettext] Attempt fixing invalid substitution error (microsoft/vcpkg#36201) Bash is complaining about invalid substitutions, so use sed to remove the gettext-runtime substring instead. * [gettext] Bump portrevision (microsoft/vcpkg#36201) * [gettext] Regenerate versions (microsoft/vcpkg#36201) --- ports/gettext/subdirs.patch | 2 +- ports/gettext/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/g-/gettext.json | 5 +++++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ports/gettext/subdirs.patch b/ports/gettext/subdirs.patch index 15a354cfb3..9931fed016 100644 --- a/ports/gettext/subdirs.patch +++ b/ports/gettext/subdirs.patch @@ -7,7 +7,7 @@ index 904bdf5..e751ffc 100755 -subdirs="$subdirs gettext-runtime libtextstyle gettext-tools" -+subdirs="$subdirs gettext-runtime ${VCPKG_GETTEXT_SUBDIRS/gettext-runtime/}" ++subdirs="$subdirs gettext-runtime $(echo ${VCPKG_GETTEXT_SUBDIRS} | sed 's/gettext-runtime//')" diff --git a/ports/gettext/vcpkg.json b/ports/gettext/vcpkg.json index db6883c459..2eb67e19dd 100644 --- a/ports/gettext/vcpkg.json +++ b/ports/gettext/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gettext", "version": "0.22.4", - "port-version": 1, + "port-version": 2, "description": "A GNU framework to help produce multi-lingual messages.", "homepage": "https://www.gnu.org/software/gettext/", "license": "GPL-3.0-only", diff --git a/versions/baseline.json b/versions/baseline.json index a4974fa5a9..3939570855 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2950,7 +2950,7 @@ }, "gettext": { "baseline": "0.22.4", - "port-version": 1 + "port-version": 2 }, "gettext-libintl": { "baseline": "0.22.4", diff --git a/versions/g-/gettext.json b/versions/g-/gettext.json index a14bdd6486..d5a06f5c7d 100644 --- a/versions/g-/gettext.json +++ b/versions/g-/gettext.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d9cc9b8256d9653fe2d484ecf268f7368666d942", + "version": "0.22.4", + "port-version": 2 + }, { "git-tree": "bd31edd407c0889c864c1e8854be92b602a4e29f", "version": "0.22.4",