[vlc-commits] [Git][videolan/vlc][3.0.x] contrib: gettext: Apply a patch to fix building with latest Clang

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
5bd37679 by Martin Storsjö at 2025-09-17T14:07:08+00:00
contrib: gettext: Apply a patch to fix building with latest Clang

The latest nightly Clang made -Wincompatible-pointer-types an
error by default, which GCC 14 also already did.

Backport a patch from newer gnulib [1], which fixes a bug in
parsing environment strings; this bug was pointed out by the
warning that now was upgraded to an error.

Newer versions of gettext have new enough gnulib bundled out
of the box.

[1] https://cgit.git.savannah.gnu.org/cgit/gnulib.git/commit/?id=92cdf62b56462b914193c7770440e505a37c2526

- - - - -


2 changed files:

- + contrib/src/gettext/gettext-0.22.5-gnulib-localtime.patch
- contrib/src/gettext/rules.mak


Changes:

=====================================
contrib/src/gettext/gettext-0.22.5-gnulib-localtime.patch
=====================================
@@ -0,0 +1,29 @@
+diff -urN gettext-orig/gettext-tools/gnulib-lib/localtime.c gettext/gettext-tools/gnulib-lib/localtime.c
+--- gettext-orig/gettext-tools/gnulib-lib/localtime.c	2024-02-21 12:44:25.000000000 +0200
++++ gettext/gettext-tools/gnulib-lib/localtime.c	2025-09-16 13:24:27.574053984 +0300
+@@ -63,13 +63,19 @@
+       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
+ 


=====================================
contrib/src/gettext/rules.mak
=====================================
@@ -18,6 +18,7 @@ GETTEXT_TOOLS_DIRS := gettext-runtime/src gettext-tools/src
 gettext: gettext-$(GETTEXT_VERSION).tar.gz .sum-gettext
 	$(UNPACK)
 	$(APPLY) $(SRC)/gettext/gettext-0.22.5-gnulib-rename-real-openat.patch
+	$(APPLY) $(SRC)/gettext/gettext-0.22.5-gnulib-localtime.patch
 	$(UPDATE_AUTOCONFIG) && cd $(UNPACK_DIR) && mv config.guess config.sub build-aux
 	# disable libtextstyle
 	sed -i.orig -e 's,gettext-runtime libtextstyle gettext-tools,gettext-runtime gettext-tools,g' $(UNPACK_DIR)/configure



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/5bd37679406d364c39c3385867794cce814aa664

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/5bd37679406d364c39c3385867794cce814aa664
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance