Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC
Commits:
098988d3 by Steve Lhomme at 2026-02-03T08:20:27+00:00
contrib: gettext: remove unneeded patches
Missing from 922f6d11598b6bbfc6d8c71cb844801e1644b781.
We don't build the gettext tools so we don't need to patch that code.
- - - - -
07bb4431 by Steve Lhomme at 2026-02-03T08:20:27+00:00
contrib: gettext: update to 0.26
It builds properly with gcc 14 mingw-w64.
We only need the runtime part to compile/link with.
The native tools are in the system or in extras/tools.
(cherry picked from commit 031aff1c30a635c83578b30a90e52e37aa9f5c8a)
(edited)
edited:
- 3.0 already has the MAKEBUILD simplifications
- - - - -
614590f5 by Steve Lhomme at 2026-02-03T08:20:27+00:00
contrib: gettext: avoid doing RECONF on a gnulib based project
(cherry picked from commit 777a8a09171d50706c391d0911a52a2a1f24fe54) (rebased)
rebased:
- 3.0 uses UPDATE_AUTOCONFIG instead of call update_autoconfig
- - - - -
4 changed files:
- contrib/src/gettext/SHA512SUMS
- − contrib/src/gettext/gettext-0.22.5-gnulib-localtime.patch
- − contrib/src/gettext/gettext-0.22.5-gnulib-rename-real-openat.patch
- contrib/src/gettext/rules.mak
Changes:
=====================================
contrib/src/gettext/SHA512SUMS
=====================================
@@ -1 +1 @@
-d8b22d7fba10052a2045f477f0a5b684d932513bdb3b295c22fbd9dfc2a9d8fccd9aefd90692136c62897149aa2f7d1145ce6618aa1f0be787cb88eba5bc09be
gettext-0.22.5.tar.gz
+544e41c9390695df1c21542842e9ca027a03cb7d4045d8cd759dec1a3dfb624aae900751b458bdb31d6454b37c40c474a952059b884555a03c7c95d6d0e687b1
gettext-0.26.tar.xz
=====================================
contrib/src/gettext/gettext-0.22.5-gnulib-localtime.patch deleted
=====================================
@@ -1,29 +0,0 @@
-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/gettext-0.22.5-gnulib-rename-real-openat.patch deleted
=====================================
@@ -1,13 +0,0 @@
-diff -urN gettext-0.22.5-orig/gettext-tools/gnulib-lib/unistd.in.h
gettext-0.22.5/gettext-tools/gnulib-lib/unistd.in.h
---- gettext-0.22.5-orig/gettext-tools/gnulib-lib/unistd.in.h 2024-02-21
12:44:25
-+++ gettext-0.22.5/gettext-tools/gnulib-lib/unistd.in.h 2025-08-15
14:19:45
-@@ -52,7 +52,9 @@
- # endif
- # if (!defined MAC_OS_X_VERSION_MIN_REQUIRED \
- || MAC_OS_X_VERSION_MIN_REQUIRED < 99990000)
-+#define openat real_openat
- # include <sys/fcntl.h> /* It also defines the two macros. */
-+#undef openat
- # undef SEEK_DATA
- # undef SEEK_HOLE
- # endif
=====================================
contrib/src/gettext/rules.mak
=====================================
@@ -1,6 +1,6 @@
# gettext
-GETTEXT_VERSION := 0.22.5
-GETTEXT_URL := $(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
+GETTEXT_VERSION := 0.26
+GETTEXT_URL := $(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.xz
PKGS += gettext
ifneq ($(filter gnu%,$(subst -, ,$(HOST))),)
@@ -8,38 +8,21 @@ ifneq ($(filter gnu%,$(subst -, ,$(HOST))),)
PKGS_FOUND += gettext
endif
-$(TARBALLS)/gettext-$(GETTEXT_VERSION).tar.gz:
+$(TARBALLS)/gettext-$(GETTEXT_VERSION).tar.xz:
$(call download_pkg,$(GETTEXT_URL),gettext)
-.sum-gettext: gettext-$(GETTEXT_VERSION).tar.gz
+.sum-gettext: gettext-$(GETTEXT_VERSION).tar.xz
-GETTEXT_TOOLS_DIRS := gettext-runtime/src gettext-tools/src
-
-gettext: gettext-$(GETTEXT_VERSION).tar.gz .sum-gettext
+gettext: gettext-$(GETTEXT_VERSION).tar.xz .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
- sed -i.orig -e 's,gettext-runtime libtextstyle
gettext-tools,gettext-runtime gettext-tools,g' $(UNPACK_DIR)/Makefile.in
- sed -i.orig -e 's,ENABLE_COLOR 1,ENABLE_COLOR 0,g'
$(UNPACK_DIR)/gettext-tools/src/write-catalog.c
- # disable gettext-tools examples configure
- sed -i.orig -e "s,ac_subdirs_all='examples',ac_subdirs_all=,"
$(UNPACK_DIR)/gettext-tools/configure
- sed -i.orig -e 's, examples",",' $(UNPACK_DIR)/gettext-tools/configure
- # disable gettext-tools tests/samples
- sed -i.orig -e 's,tests system-tests gnulib-tests examples doc,,'
$(UNPACK_DIR)/gettext-tools/Makefile.in
+ $(call update_autoconfig,libtextstyle/build-aux)
# disable useless gettext-runtime targets
- sed -i.orig -e 's,doc ,,' $(UNPACK_DIR)/gettext-runtime/Makefile.in
- sed -i.orig -e 's,po man m4 tests,,'
$(UNPACK_DIR)/gettext-runtime/Makefile.in
- sed -i.orig -e 's,doc ,,' $(UNPACK_DIR)/gettext-runtime/Makefile.in
-ifdef HAVE_CROSS_COMPILE
- # disable cross-compiled command line tools that can't be run
- sed -i.orig -e 's,install-binPROGRAMS install-exec-local,,'
$(UNPACK_DIR)/gettext-tools/src/Makefile.in
- for subdir in $(GETTEXT_TOOLS_DIRS); do \
- sed -i.orig -e 's,^bin_PROGRAMS = ,bin_PROGRAMS_disabled = ,g'
$(UNPACK_DIR)/$$subdir/Makefile.in && \
- sed -i.orig -e 's,^noinst_PROGRAMS = ,noinst_PROGRAMS_disabled =
,g' $(UNPACK_DIR)/$$subdir/Makefile.in; done
-endif
+ sed -i.orig -e 's,doc ,,g' $(UNPACK_DIR)/gettext-runtime/Makefile.in
+ sed -i.orig -e 's,intl-java intl-csharp intl-d intl-modula2 ,,g'
$(UNPACK_DIR)/gettext-runtime/Makefile.in
+ sed -i.orig -e 's, tests,,g' $(UNPACK_DIR)/gettext-runtime/Makefile.in
+ # disable useless gettext-tools configure
+ sed -i.orig -e 's,gettext-runtime libtextstyle
gettext-tools,gettext-runtime libtextstyle,g' $(UNPACK_DIR)/configure
$(MOVE)
DEPS_gettext = iconv $(DEPS_iconv) libxml2 $(DEPS_libxml2)
@@ -49,11 +32,14 @@ GETTEXT_CONF = \
--disable-java \
--disable-native-java \
--disable-csharp \
+ --disable-d \
+ --disable-go \
+ --disable-modula2 \
+ --disable-openmp \
--without-emacs \
--without-included-libxml \
- --with-installed-libtextstyle \
- --without-libtextstyle-prefix \
- --without-git
+ --without-git \
+ --without-cvs
ifdef HAVE_WIN32
GETTEXT_CONF += --disable-threads
@@ -64,6 +50,10 @@ endif
ifdef HAVE_MINGW_W64
GETTEXT_CONF += --disable-libasprintf
endif
+
+ifeq ($(findstring libxml2,$(PKGS_FOUND)),)
+GETTEXT_CONF += --with-libxml2-prefix=$(PREFIX)
+endif
ifdef HAVE_MACOSX
# Mark functions as missing. Gettext/gnulib checks for functions without
# using headers (which would make them unavailable with
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/ea3c709c10b7125a4e33c551b42a6716f8f55440...614590f51fabef15f092332ed3ecd735c04ab895
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/ea3c709c10b7125a4e33c551b42a6716f8f55440...614590f51fabef15f092332ed3ecd735c04ab895
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits
