Skip to content

[gettext] Fix wrong variable type #49860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 3 commits into from
Feb 13, 2026
Merged

[gettext] Fix wrong variable type #49860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8eac219
[gettext] Fix wrong variable type
bansan85 Feb 5, 2026
5150f64
Add comment to the patch for where it came from
BillyONeal Feb 10, 2026
d3de59a
Merge pull request #1 from BillyONeal/pr-49860-gettext
bansan85 Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions ports/gettext/env.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

1 change: 1 addition & 0 deletions ports/gettext/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")
Expand Down
2 changes: 1 addition & 1 deletion ports/gettext/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3326,7 +3326,7 @@
},
"gettext": {
"baseline": "0.22.5",
"port-version": 3
"port-version": 4
},
"gettext-libintl": {
"baseline": "0.22.5",
Expand Down
5 changes: 5 additions & 0 deletions versions/g-/gettext.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e8581f71d357844e6869e4c79fae472de8012150",
"version": "0.22.5",
"port-version": 4
},
{
"git-tree": "6308f030041019677efe2ef49cc2d7a42b9cf632",
"version": "0.22.5",
Expand Down
Loading