[vlc-commits] [Git][videolan/vlc][master] 5 commits: po: Fix typos in {fr, oc}.po for gettext-0.22 compatibility
Steve Lhomme (@robUx4)
gitlab at videolan.org
Sat Jul 1 08:57:28 UTC 2023
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
9d67e20c by Sam James at 2023-07-01T07:38:28+00:00
po: Fix typos in {fr,oc}.po for gettext-0.22 compatibility
gettext-0.22 became stricter and started to validate format strings. Fix
the typos.
Bug: https://bugs.gentoo.org/909015
Signed-off-by: Sam James <sam at gentoo.org>
- - - - -
acdd200e by Steve Lhomme at 2023-07-01T07:38:28+00:00
extras/tools: update gettext to 0.22
- - - - -
dd433852 by Steve Lhomme at 2023-07-01T07:38:28+00:00
contrib: update gettext to 0.22
- - - - -
07bca76d by Steve Lhomme at 2023-07-01T07:38:28+00:00
contrib: gettext: don't build libasprintf on Linux/mingw-w64
They have native support for it.
- - - - -
3dac9ffa by Steve Lhomme at 2023-07-01T07:38:28+00:00
contrib: gettext: add local unistd to reuse textstyle.h
On Windows fsync is not declared, we need a header that declares it,
from gnulib.
- - - - -
8 changed files:
- contrib/src/gettext/SHA512SUMS
- − contrib/src/gettext/gettext-0.21-disable-libtextstyle.patch
- − contrib/src/gettext/obstack-func-ptr.patch
- contrib/src/gettext/rules.mak
- extras/tools/SHA512SUMS
- extras/tools/packages.mak
- po/fr.po
- po/oc.po
Changes:
=====================================
contrib/src/gettext/SHA512SUMS
=====================================
@@ -1 +1 @@
-bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1 gettext-0.21.tar.gz
+e2a58dde1cae3e6b79c03e7ef3d888f7577c1f4cba283b3b0f31123ceea8c33d7c9700e83de57104644de23e5f5c374868caa0e091f9c45edbbe87b98ee51c04 gettext-0.22.tar.gz
=====================================
contrib/src/gettext/gettext-0.21-disable-libtextstyle.patch deleted
=====================================
@@ -1,128 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index 815e3c7..e897de7 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -19,7 +19,7 @@
- AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
- ACLOCAL_AMFLAGS = -I m4
-
--SUBDIRS = gnulib-local gettext-runtime libtextstyle gettext-tools
-+SUBDIRS = gnulib-local gettext-runtime gettext-tools
-
- changelog_etc = \
- gettext-runtime/ChangeLog.0 \
-@@ -123,7 +123,6 @@ distcheck-hook:
- test "`sed 1,16d $(srcdir)/gettext-runtime/intl/xsize.h | md5sum`" = "`sed 1,16d $(srcdir)/gettext-tools/gnulib-lib/xsize.h | md5sum`"
- cmp -s $(srcdir)/gettext-runtime/man/help2man $(srcdir)/gettext-tools/man/help2man
- cmp -s $(srcdir)/gettext-runtime/man/x-to-1.in $(srcdir)/gettext-tools/man/x-to-1.in
-- cmp -s $(srcdir)/libtextstyle/m4/libtextstyle.m4 $(srcdir)/gettext-tools/gnulib-m4/libtextstyle.m4
- cmp -s $(srcdir)/gettext-tools/examples/hello-java-awt/m4/TestAWT.java $(srcdir)/gettext-tools/examples/hello-java-swing/m4/TestAWT.java
- cmp -s $(srcdir)/gettext-tools/examples/hello-java-awt/m4/TestAWT.class $(srcdir)/gettext-tools/examples/hello-java-swing/m4/TestAWT.class
- test "`sed 1,15d $(srcdir)/gnulib-local/lib/alloca.in.h | md5sum`" = "`sed 1,15d $(srcdir)/gettext-runtime/libasprintf/alloca.in.h | md5sum`"
-diff --git a/configure.ac b/configure.ac
-index 49689fb..2d23b44 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -37,7 +37,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
-
- dnl Checks for library functions.
-
--AC_CONFIG_SUBDIRS([gettext-runtime libtextstyle gettext-tools])
-+AC_CONFIG_SUBDIRS([gettext-runtime gettext-tools])
-
- AM_EXTRA_RECURSIVE_TARGETS([maintainer-update-po])
-
-@@ -49,7 +49,7 @@ AC_CANONICAL_HOST
- dnl Optional Features: AC_ARG_ENABLE calls
- dnl Optional Packages: AC_ARG_WITH calls
- dnl Some influential environment variables: AC_ARG_VAR calls
--esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; cd libtextstyle && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; { cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | grep -v installed.libtextstyle | grep -v installed.csharp | grep -v 'installed C#'; } | sed -f build-aux/ac-help.sed ])
-+esyscmd([{ cd gettext-runtime && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; { cd gettext-tools && autoconf --trace=AC_ARG_ENABLE:'$n([$1],[$2])' --trace=AC_ARG_WITH:'$n([$1],[$2])' --trace=AC_ARG_VAR:'$n($@)' && cd ..; } | grep -v installed.csharp | grep -v 'installed C#'; } | sed -f build-aux/ac-help.sed ])
-
- AC_CONFIG_FILES([Makefile])
-
-diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am
-index 449a797..c5719c2 100644
---- a/gettext-tools/Makefile.am
-+++ b/gettext-tools/Makefile.am
-@@ -19,7 +19,7 @@
- AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
- ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
-
--SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
-+SUBDIRS = intl gnulib-lib libgrep libgettextpo src po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
-
- EXTRA_DIST = misc/DISCLAIM
- MOSTLYCLEANFILES = core *.stackdump
-diff --git a/gettext-tools/libgettextpo/textstyle.in.h b/gettext-tools/libgettextpo/textstyle.in.h
-index 536b51b..585ce66 100644
---- a/gettext-tools/libgettextpo/textstyle.in.h
-+++ b/gettext-tools/libgettextpo/textstyle.in.h
-@@ -213,7 +213,8 @@ typedef ostream_t file_ostream_t;
- static inline file_ostream_t
- file_ostream_create (FILE *fp)
- {
-- return fp;
-+ /* Closing the stream we return should not close 'fp'. */
-+ return fdopen (dup (fileno (fp)), "w");
- }
-
- /* --------------------------- From fd-ostream.h --------------------------- */
-@@ -413,6 +414,30 @@ html_styled_ostream_create (ostream_t destination _GL_UNUSED,
- return NULL;
- }
-
-+/* ----------------------- From noop-styled-ostream.h ----------------------- */
-+
-+/* noop_styled_ostream_t is a subtype of ostream_t. */
-+typedef ostream_t noop_styled_ostream_t;
-+
-+#define noop_styled_ostream_write_mem ostream_write_mem
-+#define noop_styled_ostream_flush ostream_flush
-+#define noop_styled_ostream_free ostream_free
-+#define noop_styled_ostream_begin_use_class styled_ostream_begin_use_class
-+#define noop_styled_ostream_end_use_class styled_ostream_end_use_class
-+#define noop_styled_ostream_get_hyperlink_ref styled_ostream_get_hyperlink_ref
-+#define noop_styled_ostream_get_hyperlink_id styled_ostream_get_hyperlink_id
-+#define noop_styled_ostream_set_hyperlink styled_ostream_set_hyperlink
-+#define noop_styled_ostream_flush_to_current_style styled_ostream_flush_to_current_style
-+
-+static inline ostream_t
-+noop_styled_ostream_create (ostream_t destination, bool pass_ownership)
-+{
-+ if (pass_ownership)
-+ return destination;
-+ else
-+ return fdopen (dup (fileno (destination)), "w");
-+}
-+
- /* ------------------------------ From color.h ------------------------------ */
-
- #define color_test_mode false
-diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
-index 764ffad..eccfbbd 100644
---- a/gettext-tools/src/Makefile.am
-+++ b/gettext-tools/src/Makefile.am
-@@ -292,19 +292,9 @@ cldr_plurals_SOURCES = cldr-plural.y cldr-plural-exp.c cldr-plurals.c
- cldr_plurals_CFLAGS = $(AM_CFLAGS) $(INCXML)
- cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
-
--if USE_INSTALLED_LIBTEXTSTYLE
--LT_LIBTEXTSTYLE = @LTLIBTEXTSTYLE@
--else
--# How to get the include files of libtextstyle.
--textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h:
-- here=`pwd`; \
-- cd ../../libtextstyle/lib && \
-- $(MAKE) install-nobase_includeHEADERS install-nobase_nodist_includeHEADERS includedir="$$here"
--BUILT_SOURCES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
--MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyle/woe32dll.h
--# Where to find the built libtextstyle library.
--LT_LIBTEXTSTYLE = ../../libtextstyle/lib/libtextstyle.la
--endif
-+# Use the dummy libtextstyle from gnulib, as libgettextpo does.
-+LT_LIBTEXTSTYLE =
-+AM_CPPFLAGS += -I../libgettextpo -I$(top_srcdir)/libgettextpo
-
- # How to build libgettextsrc.la.
- # Need ../gnulib-lib/libgettextlib.la.
=====================================
contrib/src/gettext/obstack-func-ptr.patch deleted
=====================================
@@ -1,22 +0,0 @@
---- gettext/gettext-tools/libgettextpo/obstack.c.orig 2022-08-12 11:05:36.109187107 +0300
-+++ gettext/gettext-tools/libgettextpo/obstack.c 2022-08-12 11:05:47.220954747 +0300
-@@ -326,7 +326,7 @@
- # include <libio/iolibio.h>
- # endif
-
--static _Noreturn void
-+static __attribute_noreturn__ void
- print_and_abort (void)
- {
- /* Don't change any of these strings. Yes, it would be possible to add
---- gettext/gettext-tools/gnulib-lib/obstack.c.orig 2022-08-12 11:04:11.938947065 +0300
-+++ gettext/gettext-tools/gnulib-lib/obstack.c 2022-08-12 11:04:19.682785156 +0300
-@@ -326,7 +326,7 @@
- # include <libio/iolibio.h>
- # endif
-
--static _Noreturn void
-+static __attribute_noreturn__ void
- print_and_abort (void)
- {
- /* Don't change any of these strings. Yes, it would be possible to add
=====================================
contrib/src/gettext/rules.mak
=====================================
@@ -1,5 +1,5 @@
# gettext
-GETTEXT_VERSION := 0.21
+GETTEXT_VERSION := 0.22
GETTEXT_URL := $(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
ifndef HAVE_WINSTORE # FIXME uses sys/socket.h improperly
@@ -17,8 +17,19 @@ $(TARBALLS)/gettext-$(GETTEXT_VERSION).tar.gz:
gettext: gettext-$(GETTEXT_VERSION).tar.gz .sum-gettext
$(UNPACK)
- $(APPLY) $(SRC)/gettext/gettext-0.21-disable-libtextstyle.patch
- $(APPLY) $(SRC)/gettext/obstack-func-ptr.patch
+ # 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
+ # 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
$(MOVE)
DEPS_gettext = iconv $(DEPS_iconv) libxml2 $(DEPS_libxml2)
@@ -27,33 +38,40 @@ GETTEXT_CONF = \
--disable-relocatable \
--disable-java \
--disable-native-java \
+ --disable-csharp \
--without-emacs \
- --without-included-libxml
+ --without-included-libxml \
+ --with-installed-libtextstyle \
+ --without-libtextstyle-prefix \
+ --without-git
ifdef HAVE_WIN32
GETTEXT_CONF += --disable-threads
endif
+ifdef HAVE_LINUX
+GETTEXT_CONF += --disable-libasprintf
+endif
+ifdef HAVE_MINGW_W64
+GETTEXT_CONF += --disable-libasprintf
+endif
.gettext: gettext
- cd $< && cd gettext-runtime && $(AUTORECONF)
- cd $< && cd gettext-tools && $(AUTORECONF)
$(MAKEBUILDDIR)
$(MAKECONFIGURE) $(GETTEXT_CONF)
+ +$(MAKEBUILD) -C gettext-runtime
ifndef HAVE_ANDROID
- +$(MAKEBUILD)
- +$(MAKEBUILD) install
+ # build libgettextpo first so we can use its textstyle.h and unistd.h (fsync)
+ +$(MAKEBUILD) -C gettext-tools -C libgettextpo
+ cd $(BUILD_DIR) && cp gettext-tools/libgettextpo/textstyle.h gettext-tools/src/textstyle.h
+ cd $(BUILD_DIR) && cp gettext-tools/libgettextpo/unistd.h gettext-tools/src/unistd.h
+ +$(MAKEBUILD) -C gettext-tools
+ +$(MAKEBUILD) -C gettext-tools install
else
# Android 32bits does not have localeconv
- +$(MAKEBUILD) -C gettext-runtime
- +$(MAKEBUILD) -C gettext-tools/intl
+$(MAKEBUILD) -C gettext-tools/misc
+$(MAKEBUILD) -C gettext-tools/m4
- +$(MAKEBUILD) -C gettext-runtime install
+$(MAKEBUILD) -C gettext-tools/misc install
+$(MAKEBUILD) -C gettext-tools/m4 install
endif
-ifdef HAVE_MACOSX
- # detect libintl correctly in configure for static library
- sed -i.orig 's/$$LIBS $$LIBINTL/$$LIBS $$LIBINTL $$INTL_MACOSX_LIBS/' "$(PREFIX)"/share/aclocal/gettext.m4
-endif
+ +$(MAKEBUILD) -C gettext-runtime install
touch $@
=====================================
extras/tools/SHA512SUMS
=====================================
@@ -11,7 +11,7 @@ dbbb0bb348fac54612d29182c09c88bda7096dea03bd94f03c580c24146e65a06db12808c6a1a9ad
d4d23af6671406e97257892f90651b67f2ab95219831372be032190b7156c10a3435d457857e677445df8b2327aacccc15344acbbc3808a6f332a93cce23b444 bison-3.8.2.tar.xz
e9785f3d620a204b7d20222888917dc065c2036cae28667065bf7862dfa1b25235095a12fd04efdbd09bfd17d3452e6b9ef953a8c1137862ff671c97132a082e flex-2.6.4.tar.gz
611e573756e3e936ce16b456df9583eb9acae51a0fbd28212444ddc0c1c5ec21e893d7a666bd77ef53423024939291a31dcf86d129126fa707b729d80b24184d nasm-2.13.03.tar.gz
-073042fa2dc48804c58e76f036130a669e19612c25427b0ab14d0b366b549a63751bf3af03bfd0745d7c4f72497a4b2aab26a3cc6de83189ce111679073878e1 gettext-0.19.8.1.tar.gz
+e2a58dde1cae3e6b79c03e7ef3d888f7577c1f4cba283b3b0f31123ceea8c33d7c9700e83de57104644de23e5f5c374868caa0e091f9c45edbbe87b98ee51c04 gettext-0.22.tar.gz
d24849b93de58b20f518c071687e7bfa653a96600382f36c4cf7fc1047656458f75f093b911b786b18b6931b2453cb60868ecbe07cc7d2984e5981a874b34942 help2man-1.47.6.tar.xz
8d23dde18525dccaa648ca01df40151e7f00cec4846bd611c8970dbcfc1fb57a453facfe4d41462e7c3c8bb548d44b961a04e4fc3073ab6b65063e53f42bf6fd nasm-2.14.tar.gz
37b3a421419b16930e53181c431fe3b4afd55ac54733a5df08376641fd2fb88eeb73ee7abe3788f3e491e7c1b215c7f35aefa66f44b09008ad22b76ab2998830 ninja-1.11.1.tar.gz
=====================================
extras/tools/packages.mak
=====================================
@@ -45,7 +45,7 @@ BISON_URL=$(GNU)/bison/bison-$(BISON_VERSION).tar.xz
FLEX_VERSION=2.6.4
FLEX_URL=https://github.com/westes/flex/releases/download/v$(FLEX_VERSION)/flex-$(FLEX_VERSION).tar.gz
-GETTEXT_VERSION=0.19.8.1
+GETTEXT_VERSION=0.22
GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
HELP2MAN_VERSION=1.47.6
=====================================
po/fr.po
=====================================
@@ -5407,19 +5407,19 @@ msgstr "Commande+"
#: src/misc/update.c:482
#, c-format
msgid "%.1f GiB"
-msgstr "%.lf Gio"
+msgstr "%.1f Gio"
#: src/misc/update.c:484
#, c-format
msgid "%.1f MiB"
-msgstr "%.lf Mio"
+msgstr "%.1f Mio"
#: src/misc/update.c:486 modules/gui/macosx/VLCPlaylistInfo.m:148
#: modules/gui/macosx/VLCPlaylistInfo.m:150
#: modules/gui/macosx/VLCPlaylistInfo.m:160
#, c-format
msgid "%.1f KiB"
-msgstr "%.lf Kio"
+msgstr "%.1f Kio"
#: src/misc/update.c:488
#, c-format
=====================================
po/oc.po
=====================================
@@ -5374,19 +5374,19 @@ msgstr "Comanda+"
#: src/misc/update.c:482
#, c-format
msgid "%.1f GiB"
-msgstr "%.lf Gio"
+msgstr "%.1f Gio"
#: src/misc/update.c:484
#, c-format
msgid "%.1f MiB"
-msgstr "%.lf Mio"
+msgstr "%.1f Mio"
#: src/misc/update.c:486 modules/gui/macosx/VLCPlaylistInfo.m:148
#: modules/gui/macosx/VLCPlaylistInfo.m:150
#: modules/gui/macosx/VLCPlaylistInfo.m:160
#, c-format
msgid "%.1f KiB"
-msgstr "%.lf Kio"
+msgstr "%.1f Kio"
#: src/misc/update.c:488
#, c-format
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/82faf7932af044cd93c841bc2e53c26216fe0d07...3dac9ffa929a1a517e9b29df22c96f55259156a8
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/82faf7932af044cd93c841bc2e53c26216fe0d07...3dac9ffa929a1a517e9b29df22c96f55259156a8
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list