Update to gettext-0.21.

This commit is contained in:
Jonas 'Sortie' Termansen 2022-06-14 19:43:30 +02:00
parent 4addab6e30
commit 671d1219a4
16 changed files with 81 additions and 145 deletions

View File

@ -1,5 +1,5 @@
NAME=binutils
BUILD_LIBRARIES=gettext
BUILD_LIBRARIES=libintl
VERSION=1.1-rc1
DISTNAME=sortix-binutils-$VERSION
COMPRESSION=tar.xz

View File

@ -1,5 +1,5 @@
NAME=e2fsprogs
BUILD_LIBRARIES='libiconv gettext'
BUILD_LIBRARIES='libiconv libintl'
VERSION=1.42.13
DISTNAME=$NAME-$VERSION
COMPRESSION=tar.xz

View File

@ -1,5 +1,5 @@
NAME=flex
BUILD_LIBRARIES='libiconv? gettext?'
BUILD_LIBRARIES='libiconv? libintl?'
VERSION=2.6.0
DISTNAME=$NAME-$VERSION
COMPRESSION=tar.xz

View File

@ -124,9 +124,9 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-runtime/configure gettex
+export gl_cv_struct_dirent_d_ino=yes # Only if the OS actually supports this, Sortix does.
+export ac_cv_func_realloc_0_nonnull=yes # TODO: Investigate this, found in flex.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for gettext-runtime 0.19.8.
# Generated by GNU Autoconf 2.69 for gettext-runtime 0.21.
#
@@ -18912,6 +19032,8 @@
@@ -20509,6 +20629,8 @@
static char buf[100];
int main ()
{
@ -169,7 +169,7 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-runtime/gnulib-lib/prope
diff -Paur --no-dereference -- gettext.upstream/gettext-runtime/intl/dcigettext.c gettext/gettext-runtime/intl/dcigettext.c
--- gettext.upstream/gettext-runtime/intl/dcigettext.c
+++ gettext/gettext-runtime/intl/dcigettext.c
@@ -997,6 +997,8 @@
@@ -1069,6 +1069,8 @@
resultlen = domain->trans_sysdep_tab[act - nstrings].length;
}
@ -178,7 +178,7 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-runtime/intl/dcigettext.
#if defined _LIBC || HAVE_ICONV
# ifdef IN_LIBGLOCALE
if (encoding != NULL)
@@ -1406,6 +1408,7 @@
@@ -1475,6 +1477,7 @@
/* The result string is converted. */
#endif /* _LIBC || HAVE_ICONV */
@ -189,7 +189,7 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-runtime/intl/dcigettext.
diff -Paur --no-dereference -- gettext.upstream/gettext-runtime/libasprintf/configure gettext/gettext-runtime/libasprintf/configure
--- gettext.upstream/gettext-runtime/libasprintf/configure
+++ gettext/gettext-runtime/libasprintf/configure
@@ -18352,6 +18352,8 @@
@@ -19342,6 +19342,8 @@
static char buf[100];
int main ()
{
@ -324,9 +324,9 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/configure gettext/
+export gl_cv_struct_dirent_d_ino=yes # Only if the OS actually supports this, Sortix does.
+export ac_cv_func_realloc_0_nonnull=yes # TODO: Investigate this, found in flex.
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for gettext-tools 0.19.8.
# Generated by GNU Autoconf 2.69 for gettext-tools 0.21.
#
@@ -21267,6 +21387,8 @@
@@ -22666,6 +22786,8 @@
static char buf[100];
int main ()
{
@ -335,7 +335,20 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/configure gettext/
sprintf (buf, format, 33, 55);
return (strcmp (buf, "55 33") != 0);
}
@@ -44404,7 +44526,9 @@
@@ -24410,10 +24532,10 @@
$as_echo "$ac_res" >&6; }
fi
+ # PATCH: Use preinstalled libintl in gettext-tools.
if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
|| { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
- && test "$PACKAGE" != gettext-runtime \
- && test "$PACKAGE" != gettext-tools; }; then
+ && test "$PACKAGE" != gettext-runtime; }; then
gt_use_preinstalled_gnugettext=yes
else
LIBINTL=
@@ -46687,7 +46809,9 @@
@ -346,7 +359,7 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/configure gettext/
acl_save_prefix="$prefix"
prefix="$acl_final_prefix"
@@ -44424,6 +44548,7 @@
@@ -46709,6 +46833,7 @@
if test "X$withval" = "Xno"; then
use_additional=no
else
@ -354,16 +367,7 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/configure gettext/
if test "X$withval" = "X"; then
acl_save_prefix="$prefix"
@@ -44858,6 +44983,8 @@
+ LIBXML2="$LIBXML2 $(${PKG_CONFIG-pkg-config} --libs libxml-2.0)"
+ LTLIBXML2="$LTLIBXML2 $(${PKG_CONFIG-pkg-config} --libs libxml-2.0)"
LIBS="$gl_save_LIBS $LIBXML2 $LIBICONV"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -50550,6 +50677,8 @@
@@ -54326,6 +54451,8 @@
static char buf[100];
int main ()
{
@ -372,7 +376,7 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/configure gettext/
sprintf (buf, format, 33, 55);
return (strcmp (buf, "55 33") != 0);
}
@@ -54324,6 +54453,8 @@
@@ -58358,6 +58485,8 @@
static char buf[100];
int main ()
{
@ -384,7 +388,7 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/configure gettext/
diff -Paur --no-dereference -- gettext.upstream/gettext-tools/gnulib-lib/backupfile.c gettext/gettext-tools/gnulib-lib/backupfile.c
--- gettext.upstream/gettext-tools/gnulib-lib/backupfile.c
+++ gettext/gettext-tools/gnulib-lib/backupfile.c
@@ -90,14 +90,15 @@
@@ -89,14 +89,15 @@
size_t numbered_suffix_size_max = INT_STRLEN_BOUND (int) + 4;
char *s;
const char *suffix = simple_backup_suffix;
@ -402,7 +406,7 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/gnulib-lib/backupf
if (s)
{
strcpy (s, file);
@@ -112,8 +113,10 @@
@@ -111,8 +112,10 @@
highest_backup = max_backup_version (file + dir_len, s);
if (! (backup_type == numbered_existing && highest_backup == 0))
{
@ -415,30 +419,6 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/gnulib-lib/backupf
suffix = numbered_suffix;
}
strcpy (s, file);
diff -Paur --no-dereference -- gettext.upstream/gettext-tools/gnulib-lib/html-ostream.c gettext/gettext-tools/gnulib-lib/html-ostream.c
--- gettext.upstream/gettext-tools/gnulib-lib/html-ostream.c
+++ gettext/gettext-tools/gnulib-lib/html-ostream.c
@@ -178,7 +178,7 @@
/* Output non-ASCII characters in #&nnn;
notation. */
char bytes[32];
- sprintf (bytes, "&#%d;", (int) uc);
+ snprintf (bytes, sizeof(bytes), "&#%d;", (int) uc);
ostream_write_str (stream->destination, bytes);
}
break;
diff -Paur --no-dereference -- gettext.upstream/gettext-tools/gnulib-lib/html-ostream.oo.c gettext/gettext-tools/gnulib-lib/html-ostream.oo.c
--- gettext.upstream/gettext-tools/gnulib-lib/html-ostream.oo.c
+++ gettext/gettext-tools/gnulib-lib/html-ostream.oo.c
@@ -177,7 +177,7 @@
/* Output non-ASCII characters in #&nnn;
notation. */
char bytes[32];
- sprintf (bytes, "&#%d;", (int) uc);
+ snprintf (bytes, sizeof(bytes), "&#%d;", (int) uc);
ostream_write_str (stream->destination, bytes);
}
break;
diff -Paur --no-dereference -- gettext.upstream/gettext-tools/gnulib-lib/propername.c gettext/gettext-tools/gnulib-lib/propername.c
--- gettext.upstream/gettext-tools/gnulib-lib/propername.c
+++ gettext/gettext-tools/gnulib-lib/propername.c
@ -473,7 +453,7 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/gnulib-lib/propern
diff -Paur --no-dereference -- gettext.upstream/gettext-tools/gnulib-lib/tmpdir.c gettext/gettext-tools/gnulib-lib/tmpdir.c
--- gettext.upstream/gettext-tools/gnulib-lib/tmpdir.c
+++ gettext/gettext-tools/gnulib-lib/tmpdir.c
@@ -154,6 +154,7 @@
@@ -160,6 +160,7 @@
}
memcpy (tmpl, dir, dlen);
@ -482,31 +462,10 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/gnulib-lib/tmpdir.
+ (int) plen, pfx);
return 0;
}
diff -Paur --no-dereference -- gettext.upstream/gettext-tools/gnulib-lib/tparm.c gettext/gettext-tools/gnulib-lib/tparm.c
--- gettext.upstream/gettext-tools/gnulib-lib/tparm.c
+++ gettext/gettext-tools/gnulib-lib/tparm.c
@@ -496,7 +496,7 @@
char *s;
if (popstring (&s))
return OOPS;
- sprintf (sbuf, fmt, s);
+ snprintf (sbuf, sizeof(sbuf), fmt, s);
}
else
{
@@ -512,7 +512,7 @@
if (i == 0 && conv_char == 'c')
strcpy (sbuf, "\000");
else
- sprintf (sbuf, fmt, i);
+ snprintf (sbuf, sizeof(sbuf), fmt, i);
}
}
sp++;
diff -Paur --no-dereference -- gettext.upstream/gettext-tools/gnulib-lib/uniname/uniname.c gettext/gettext-tools/gnulib-lib/uniname/uniname.c
--- gettext.upstream/gettext-tools/gnulib-lib/uniname/uniname.c
+++ gettext/gettext-tools/gnulib-lib/uniname/uniname.c
@@ -284,8 +284,8 @@
@@ -286,8 +286,8 @@
small. */
/* buf needs to have at least 19 + 3 bytes here. */
@ -520,7 +479,7 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/gnulib-lib/uniname
diff -Paur --no-dereference -- gettext.upstream/gettext-tools/src/cldr-plurals.c gettext/gettext-tools/src/cldr-plurals.c
--- gettext.upstream/gettext-tools/src/cldr-plurals.c
+++ gettext/gettext-tools/src/cldr-plurals.c
@@ -162,7 +162,7 @@
@@ -159,7 +159,7 @@
buffer = (char *) xrealloc (buffer, bufmax);
}
@ -532,7 +491,7 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/src/cldr-plurals.c
diff -Paur --no-dereference -- gettext.upstream/gettext-tools/src/format.c gettext/gettext-tools/src/format.c
--- gettext.upstream/gettext-tools/src/format.c
+++ gettext/gettext-tools/src/format.c
@@ -110,7 +110,7 @@
@@ -112,7 +112,7 @@
if (msgid_plural != NULL)
{
@ -544,7 +503,7 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/src/format.c gette
diff -Paur --no-dereference -- gettext.upstream/gettext-tools/src/read-mo.c gettext/gettext-tools/src/read-mo.c
--- gettext.upstream/gettext-tools/src/read-mo.c
+++ gettext/gettext-tools/src/read-mo.c
@@ -184,7 +184,8 @@
@@ -193,7 +193,8 @@
if (!(ss_length > 0 && bfp->data[ss_end - 1] == '\0'))
{
char location[30];
@ -554,22 +513,10 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/src/read-mo.c gett
error (EXIT_FAILURE, 0,
_("file \"%s\" contains a not NUL terminated string, at %s"),
bfp->filename, location);
diff -Paur --no-dereference -- gettext.upstream/gettext-tools/src/search-path.c gettext/gettext-tools/src/search-path.c
--- gettext.upstream/gettext-tools/src/search-path.c
+++ gettext/gettext-tools/src/search-path.c
@@ -142,7 +142,7 @@
gettextdatadirs = getenv ("XDG_DATA_DIRS");
if (gettextdatadirs != NULL)
foreach_elements (gettextdatadirs, fill, &array);
- free (array.sub);
+ free ((char *)array.sub);
/* Append version specific directory. */
base = xasprintf ("%s%s", gettextdatadir, PACKAGE_SUFFIX);
diff -Paur --no-dereference -- gettext.upstream/gettext-tools/src/write-csharp.c gettext/gettext-tools/src/write-csharp.c
--- gettext.upstream/gettext-tools/src/write-csharp.c
+++ gettext/gettext-tools/src/write-csharp.c
@@ -716,10 +716,10 @@
@@ -721,10 +721,10 @@
{
char *class_name_part1 = construct_class_name (resource_name);
char *p;
@ -586,7 +533,7 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/src/write-csharp.c
diff -Paur --no-dereference -- gettext.upstream/gettext-tools/src/write-po.c gettext/gettext-tools/src/write-po.c
--- gettext.upstream/gettext-tools/src/write-po.c
+++ gettext/gettext-tools/src/write-po.c
@@ -78,16 +78,16 @@
@@ -76,16 +76,16 @@
case possible:
if (debug)
{
@ -606,7 +553,7 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/src/write-po.c get
break;
default:
/* The others have already been filtered out by significant_format_p. */
@@ -399,7 +399,7 @@
@@ -398,7 +398,7 @@
|| pp->line_number == (size_t)(-1))
buffer[0] = '\0';
else
@ -615,7 +562,7 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/src/write-po.c get
len = strlen (cp) + strlen (buffer) + 1;
if (column > 2 && column + len > page_width)
{
@@ -1375,7 +1375,7 @@
@@ -1373,7 +1373,7 @@
p < mp->msgstr + mp->msgstr_len;
p += strlen (p) + 1, i++)
{
@ -624,7 +571,7 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/src/write-po.c get
wrap (mp, stream, NULL, extra_indent, class_msgstr, prefix_buf, p,
mp->do_wrap, page_width, charset);
}
@@ -1499,7 +1499,7 @@
@@ -1541,7 +1541,7 @@
p < mp->msgstr + mp->msgstr_len;
p += strlen (p) + 1, i++)
{
@ -636,7 +583,7 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/src/write-po.c get
diff -Paur --no-dereference -- gettext.upstream/gettext-tools/src/write-properties.c gettext/gettext-tools/src/write-properties.c
--- gettext.upstream/gettext-tools/src/write-properties.c
+++ gettext/gettext-tools/src/write-properties.c
@@ -96,7 +96,7 @@
@@ -97,7 +97,7 @@
else if (uc < 0x10000)
{
/* Single UCS-2 'char' */
@ -645,7 +592,7 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/src/write-properti
hexdigit[(uc >> 12) & 0x0f], hexdigit[(uc >> 8) & 0x0f],
hexdigit[(uc >> 4) & 0x0f], hexdigit[uc & 0x0f]);
newstr += 6;
@@ -106,11 +106,11 @@
@@ -107,11 +107,11 @@
/* UTF-16 surrogate: two 'char's. */
ucs4_t uc1 = 0xd800 + ((uc - 0x10000) >> 10);
ucs4_t uc2 = 0xdc00 + ((uc - 0x10000) & 0x3ff);
@ -659,42 +606,18 @@ diff -Paur --no-dereference -- gettext.upstream/gettext-tools/src/write-properti
hexdigit[(uc2 >> 12) & 0x0f], hexdigit[(uc2 >> 8) & 0x0f],
hexdigit[(uc2 >> 4) & 0x0f], hexdigit[uc2 & 0x0f]);
newstr += 6;
diff -Paur --no-dereference -- gettext.upstream/gettext-tools/src/xgettext.c gettext/gettext-tools/src/xgettext.c
--- gettext.upstream/gettext-tools/src/xgettext.c
+++ gettext/gettext-tools/src/xgettext.c
@@ -2321,7 +2321,7 @@
if (line_number == (size_t)(-1))
buffer[0] = '\0';
else
- sprintf (buffer, ":%ld", (long) line_number);
+ snprintf (buffer, sizeof (buffer), ":%ld", (long) line_number);
switch (lcontext)
{
@@ -2441,7 +2441,7 @@
if (pos->line_number == (size_t)(-1))
buffer[0] = '\0';
else
- sprintf (buffer, ":%ld", (long) pos->line_number);
+ snprintf (buffer, sizeof (buffer), ":%ld", (long) pos->line_number);
multiline_warning (xasprintf (_("%s%s: warning: "),
pos->file_name, buffer),
xasprintf (is_format[i] == yes_according_to_context
@@ -2474,7 +2474,7 @@
if (pos->line_number == (size_t)(-1))
buffer[0] = '\0';
diff -Paur --no-dereference -- gettext.upstream/libtextstyle/lib/term-style-control.c gettext/libtextstyle/lib/term-style-control.c
--- gettext.upstream/libtextstyle/lib/term-style-control.c
+++ gettext/libtextstyle/lib/term-style-control.c
@@ -369,9 +369,9 @@
}
else
- sprintf (buffer, ":%ld", (long) pos->line_number);
+ snprintf (buffer, sizeof (buffer), ":%ld", (long) pos->line_number);
multiline_warning (xasprintf (_("%s%s: warning: "),
pos->file_name, buffer),
xasprintf (_("\
@@ -2539,7 +2539,7 @@
if (pos->line_number == (size_t)(-1))
buffer[0] = '\0';
else
- sprintf (buffer, ":%ld", (long) pos->line_number);
+ snprintf (buffer, sizeof (buffer), ":%ld", (long) pos->line_number);
multiline_warning (xasprintf (_("%s%s: warning: "), pos->file_name,
buffer),
xstrdup (_("\
{
- /* getpgrp () changes when the process gets put into the background
+ /* getpgid () changes when the process gets put into the background
by a shell that implements job control. */
- if (p == getpgrp ())
+ if (p == getpgid (0))
{
pgrp_status = PGRP_IN_FOREGROUND;
log_message ("pgrp_status = PGRP_IN_FOREGROUND\n");

View File

@ -1,15 +1,17 @@
NAME=gettext
BUILD_LIBRARIES='libiconv libintl libxml2 libcroco? libcurses? libexpat? libunistring?'
VERSION=0.19.8
BUILD_LIBRARIES='libiconv libintl libtextstyle libxml2 libcroco? libunistring?'
VERSION=0.21
DISTNAME=$NAME-$VERSION
COMPRESSION=tar.xz
ARCHIVE=$DISTNAME.$COMPRESSION
SHA256SUM=9c1781328238caa1685d7bc7a2e1dcf1c6c134e86b42ed554066734b621bd12f
SHA256SUM=d20fcbb537e02dcf1383197ba05bd0734ef7bf5db06bdb241eb69b7d16b73192
UPSTREAM_SITE=https://ftp.gnu.org/gnu/gettext
UPSTREAM_ARCHIVE=$ARCHIVE
LICENSE=GPL-3-or-later
# TODO: libcroco and libunistring are bundled and are only marked as optional
# here as there's no official port yet. Finish those and then remove
# them as optional.
SUBDIR=gettext-tools
BUILD_SYSTEM=configure
CONFIGURE_ARGS='--with-installed-libtextstyle --with-installed-csharp-dll'
POST_INSTALL=tix-eradicate-libtool-la

View File

@ -1,5 +1,5 @@
NAME=grep
BUILD_LIBRARIES='libiconv? gettext?'
BUILD_LIBRARIES='libiconv? libintl?'
VERSION=2.20
DISTNAME=$NAME-$VERSION
COMPRESSION=tar.xz

View File

@ -1,5 +1,5 @@
NAME=grub
BUILD_LIBRARIES='libiconv? gettext? libfreetype? xz?'
BUILD_LIBRARIES='libiconv? libintl? libfreetype? xz?'
VERSION=1.0-rc1
DISTNAME=sortix-grub-$VERSION
COMPRESSION=tar.gz

View File

@ -1,5 +1,5 @@
NAME=hello
BUILD_LIBRARIES='libiconv? gettext?'
BUILD_LIBRARIES='libiconv? libintl?'
VERSION=2.8
DISTNAME=$NAME-$VERSION
COMPRESSION=tar.gz

View File

@ -1,5 +1,5 @@
NAME=libglib
BUILD_LIBRARIES='libiconv gettext libz libffi xz? libdbus?'
BUILD_LIBRARIES='libiconv libintl libz libffi xz? libdbus?'
VERSION=2.45.6
DISTNAME=glib-$VERSION
COMPRESSION=tar.xz

View File

@ -1,5 +1,5 @@
NAME=libidn
BUILD_LIBRARIES='libiconv? gettext?'
BUILD_LIBRARIES='libiconv? libintl?'
VERSION=1.33
DISTNAME=$NAME-$VERSION
COMPRESSION=tar.gz

View File

@ -1,9 +1,11 @@
NAME=libintl
BUILD_LIBRARIES=libiconv?
SOURCE_PORT=gettext
SUBDIR=gettext-runtime
LICENSE=LGPL-2.1-or-later
BUILD_SYSTEM=configure
# libstdc++ is a dependency if libasprintf is enabled. Right now, I suspect it
# is more trouble than it is worth, so it's disabled. Does anything of value
# actually use it?
CONFIGURE_ARGS=--disable-libasprintf
CONFIGURE_ARGS='--disable-libasprintf --without-included-gettext'
POST_INSTALL=tix-eradicate-libtool-la

View File

@ -0,0 +1,9 @@
NAME=libtextstyle
BUILD_LIBRARIES='libiconv?'
SOURCE_PORT=gettext
LICENSE=GPL-3-or-later
SUBDIR=libtextstyle
BUILD_SYSTEM=configure
# gettext-tools doesn't try to -lcurses when detecting libtextstyle
CONFIGURE_ARGS=--disable-curses
POST_INSTALL=tix-eradicate-libtool-la

View File

@ -1,5 +1,5 @@
NAME=m4
BUILD_LIBRARIES='libiconv? gettext?'
BUILD_LIBRARIES='libiconv? libintl?'
VERSION=1.4.16
DISTNAME=$NAME-$VERSION
COMPRESSION=tar.xz

View File

@ -1,5 +1,5 @@
NAME=nano
BUILD_LIBRARIES='libiconv? gettext? libcurses libmagic? libz?'
BUILD_LIBRARIES='libiconv? libintl? libcurses libmagic? libz?'
VERSION=2.7.1
DISTNAME=$NAME-$VERSION
COMPRESSION=tar.xz

View File

@ -1,5 +1,5 @@
NAME=tar
BUILD_LIBRARIES='libiconv? gettext?'
BUILD_LIBRARIES='libiconv? libintl?'
VERSION=1.28
DISTNAME=$NAME-$VERSION
COMPRESSION=tar.xz

View File

@ -1,5 +1,5 @@
NAME=xz
BUILD_LIBRARIES='libiconv? gettext?'
BUILD_LIBRARIES='libiconv? libintl?'
VERSION=5.2.1
DISTNAME=$NAME-$VERSION
COMPRESSION=tar.xz