diff --git a/ports/gettext/env.patch b/ports/gettext/env.patch new file mode 100644 index 0000000000..bd431acdc4 --- /dev/null +++ b/ports/gettext/env.patch @@ -0,0 +1,28 @@ +--- a/gettext-tools/gnulib-lib/localtime.c.old 2024-02-21 11:44:25.000000000 +0100 ++++ b/gettext-tools/gnulib-lib/localtime.c 2026-02-05 14:32:39.392247000 +0100 +@@ -63,13 +63,19 @@ rpl_localtime (const time_t *tp) + char **env = _environ; + wchar_t **wenv = _wenviron; + if (env != NULL) +- for (char *s = env; *s != NULL; s++) +- if (s[0] == 'T' && s[1] == 'Z' && s[2] == '=') +- s[0] = '$'; ++ for (char **ep = env; *ep != NULL; ep++) ++ { ++ char *s = *ep; ++ if (s[0] == 'T' && s[1] == 'Z' && s[2] == '=') ++ s[0] = '$'; ++ } + if (wenv != NULL) +- for (wchar_t *ws = wenv; *ws != NULL; ws++) +- if (ws[0] == L'T' && ws[1] == L'Z' && ws[2] == L'=') +- ws[0] = L'$'; ++ for (wchar_t **wep = wenv; *wep != NULL; wep++) ++ { ++ wchar_t *ws = *wep; ++ if (ws[0] == L'T' && ws[1] == L'Z' && ws[2] == L'=') ++ ws[0] = L'$'; ++ } + } + #endif + diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake index 86b1f56d49..3c8da025a2 100644 --- a/ports/gettext/portfile.cmake +++ b/ports/gettext/portfile.cmake @@ -30,6 +30,7 @@ vcpkg_extract_source_archive(SOURCE_PATH parallel-gettext-tools.patch config-step-order.patch 0001-xgettext-Fix-some-test-failures-on-MSVC.patch + env.patch # https://cgit.git.savannah.gnu.org/cgit/gnulib.git/commit/lib/localtime.c?id=92cdf62b56462b914193c7770440e505a37c2526 ) set(subdirs "") diff --git a/ports/gettext/vcpkg.json b/ports/gettext/vcpkg.json index 522b2b2288..51e7a1164c 100644 --- a/ports/gettext/vcpkg.json +++ b/ports/gettext/vcpkg.json @@ -1,7 +1,7 @@ { "name": "gettext", "version": "0.22.5", - "port-version": 3, + "port-version": 4, "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 1c1483381d..92b8ecb41c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3342,7 +3342,7 @@ }, "gettext": { "baseline": "0.22.5", - "port-version": 3 + "port-version": 4 }, "gettext-libintl": { "baseline": "0.22.5", diff --git a/versions/g-/gettext.json b/versions/g-/gettext.json index 80a948d8f0..2f670ae1b9 100644 --- a/versions/g-/gettext.json +++ b/versions/g-/gettext.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e8581f71d357844e6869e4c79fae472de8012150", + "version": "0.22.5", + "port-version": 4 + }, { "git-tree": "6308f030041019677efe2ef49cc2d7a42b9cf632", "version": "0.22.5",