From: Bruno Haible <bruno@clisp.org>
Date: Fri, 3 Feb 2023 12:36:32 +0000 (+0100)
Subject: Update after gnulib changed.
X-Git-Tag: v0.22~165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3a927cba0c5f6cceb55c435eace1df46e16908d;p=thirdparty%2Fgettext.git

Update after gnulib changed.

* gettext-runtime/intl/configure.ac: Test also REPLACE_TWALK.
* gettext-tools/src/po-xerror.c: Don't include "getprogname.h".
* gnulib-local/lib/xerror.c: Likewise.
* gnulib-local/lib/error-progname.c: Include <stdlib.h> instead of
getprogname.h.
* gnulib-local/lib/error.in.h.diff: Renamed from gnulib-local/lib/error.h.diff.
* gnulib-local/Makefile.am (EXTRA_DIST): Update.
* gnulib-local/modules/gettext-tools-misc (Makefile.am): Update comment.
---

diff --git a/.gitignore b/.gitignore
index e3a18dca8..3be8967a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -66,6 +66,7 @@
 /gettext-tools/libgettextpo/arg-nonnull.h
 /gettext-tools/libgettextpo/asnprintf.c
 /gettext-tools/libgettextpo/asprintf.c
+/gettext-tools/libgettextpo/assert.in.h
 /gettext-tools/libgettextpo/attribute.h
 /gettext-tools/libgettextpo/basename-lgpl.c
 /gettext-tools/libgettextpo/basename-lgpl.h
@@ -93,7 +94,7 @@
 /gettext-tools/libgettextpo/error-progname.c
 /gettext-tools/libgettextpo/error-progname.h
 /gettext-tools/libgettextpo/error.c
-/gettext-tools/libgettextpo/error.h
+/gettext-tools/libgettextpo/error.in.h
 /gettext-tools/libgettextpo/exitfail.c
 /gettext-tools/libgettextpo/exitfail.h
 /gettext-tools/libgettextpo/fcntl.c
@@ -145,6 +146,7 @@
 /gettext-tools/libgettextpo/iconv_open.c
 /gettext-tools/libgettextpo/iconveh.h
 /gettext-tools/libgettextpo/idx.h
+/gettext-tools/libgettextpo/intprops-internal.h
 /gettext-tools/libgettextpo/intprops.h
 /gettext-tools/libgettextpo/inttypes.in.h
 /gettext-tools/libgettextpo/itold.c
@@ -210,6 +212,7 @@
 /gettext-tools/libgettextpo/stdalign.in.h
 /gettext-tools/libgettextpo/stdarg.in.h
 /gettext-tools/libgettextpo/stdbool.in.h
+/gettext-tools/libgettextpo/stdckdint.in.h
 /gettext-tools/libgettextpo/stddef.in.h
 /gettext-tools/libgettextpo/stdint.in.h
 /gettext-tools/libgettextpo/stdio-read.c
@@ -297,6 +300,7 @@
 /gettext-tools/libgrep/c++defs.h
 /gettext-tools/libgrep/cdefs.h
 /gettext-tools/libgrep/dynarray.h
+/gettext-tools/libgrep/intprops-internal.h
 /gettext-tools/libgrep/intprops.h
 /gettext-tools/libgrep/inttypes.in.h
 /gettext-tools/libgrep/langinfo.in.h
@@ -826,7 +830,9 @@ core
 /gettext-tools/doc/gettext.vrs
 /gettext-tools/libgettextpo/config.h
 /gettext-tools/libgettextpo/alloca.h
+/gettext-tools/libgettextpo/assert.h
 /gettext-tools/libgettextpo/errno.h
+/gettext-tools/libgettextpo/error.h
 /gettext-tools/libgettextpo/fcntl.h
 /gettext-tools/libgettextpo/float.h
 /gettext-tools/libgettextpo/iconv.h
@@ -836,6 +842,7 @@ core
 /gettext-tools/libgettextpo/signal.h
 /gettext-tools/libgettextpo/stdarg.h
 /gettext-tools/libgettextpo/stdbool.h
+/gettext-tools/libgettextpo/stdckdint.h
 /gettext-tools/libgettextpo/stddef.h
 /gettext-tools/libgettextpo/stdint.h
 /gettext-tools/libgettextpo/stdio.h
diff --git a/gettext-runtime/intl/configure.ac b/gettext-runtime/intl/configure.ac
index 413e43d87..5049e9672 100644
--- a/gettext-runtime/intl/configure.ac
+++ b/gettext-runtime/intl/configure.ac
@@ -305,7 +305,7 @@ if test $REPLACE_MEMCHR = 1; then
   AC_DEFINE([rpl_memchr],       [_libintl_memchr],    [Hidden symbol.])
 fi
 dnl Symbols defined by gnulib module 'tsearch'.
-if test $HAVE_TSEARCH = 0 || test $HAVE_TWALK = 0 || test $REPLACE_TSEARCH = 1; then
+if test $HAVE_TSEARCH = 0 || test $HAVE_TWALK = 0 || test $REPLACE_TSEARCH = 1 || test $REPLACE_TWALK = 1; then
   AC_DEFINE([tsearch],          [_libintl_tsearch],   [Hidden symbol.])
   AC_DEFINE([rpl_tsearch],      [_libintl_tsearch],   [Hidden symbol.])
   AC_DEFINE([tfind],            [_libintl_tfind],     [Hidden symbol.])
diff --git a/gettext-tools/src/po-xerror.c b/gettext-tools/src/po-xerror.c
index d916d2a37..d3ee36772 100644
--- a/gettext-tools/src/po-xerror.c
+++ b/gettext-tools/src/po-xerror.c
@@ -1,5 +1,5 @@
 /* Error handling during reading and writing of PO files.
-   Copyright (C) 2005-2007, 2013, 2019 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007, 2013, 2019, 2023 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2005.
 
    This program is free software: you can redistribute it and/or modify
@@ -35,7 +35,6 @@
 #include "xvasprintf.h"
 #include "po-error.h"
 #if IN_LIBGETTEXTPO
-# include "getprogname.h"
 # define program_name getprogname ()
 #else
 # include "progname.h"
diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 300eca0cb..3ed2f77bf 100644
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -1,5 +1,5 @@
 ## Makefile for the gnulib-local directory of GNU gettext
-## Copyright (C) 2006-2008, 2010-2012, 2014-2021 Free Software Foundation, Inc.
+## Copyright (C) 2006-2008, 2010-2012, 2014-2023 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ lib/backupfile.c \
 lib/backupfile.h \
 lib/closeout.c \
 lib/closeout.h \
-lib/error.h.diff \
+lib/error.in.h.diff \
 lib/error-progname.c \
 lib/error-progname.h \
 lib/exitfail.h.diff \
diff --git a/gnulib-local/lib/error-progname.c b/gnulib-local/lib/error-progname.c
index cc2fefef6..8294110b0 100644
--- a/gnulib-local/lib/error-progname.c
+++ b/gnulib-local/lib/error-progname.c
@@ -1,5 +1,5 @@
 /* Use of program name in error-reporting functions.
-   Copyright (C) 2001-2003, 2006, 2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2019, 2023 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -22,9 +22,9 @@
 #include "error-progname.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 
 #if IN_LIBGETTEXTPO
-# include "getprogname.h"
 # define program_name getprogname ()
 #else
 # include "progname.h"
diff --git a/gnulib-local/lib/error.h.diff b/gnulib-local/lib/error.in.h.diff
similarity index 83%
rename from gnulib-local/lib/error.h.diff
rename to gnulib-local/lib/error.in.h.diff
index 5b82f224e..4b78d8836 100644
--- a/gnulib-local/lib/error.h.diff
+++ b/gnulib-local/lib/error.in.h.diff
@@ -1,9 +1,9 @@
-*** gnulib/lib/error.h	2012-12-24 20:10:43.000000000 +0900
---- srclib/error.h	2012-12-24 20:08:16.000000000 +0900
+*** error.in.h.bak	2023-02-04 18:32:38.885731972 +0100
+--- error.in.h	2023-02-04 18:34:04.056640179 +0100
 ***************
-*** 31,36 ****
---- 31,45 ----
-  # define _GL_ATTRIBUTE_FORMAT(spec) /* empty */
+*** 30,35 ****
+--- 30,44 ----
+  # define _GL_ATTRIBUTE_SPEC_PRINTF_ERROR _GL_ATTRIBUTE_SPEC_PRINTF_SYSTEM
   #endif
   
 + #if GNULIB_REPLACE_ERROR
@@ -19,7 +19,7 @@
   extern "C" {
   #endif
 ***************
-*** 49,62 ****
+*** 90,103 ****
   /* If NULL, error will flush stdout, then print on stderr the program
      name, a colon and a space.  Otherwise, error will call this
      function without parameters instead.  */
@@ -32,9 +32,9 @@
      variable controls whether this mode is selected or not.  */
 ! extern int error_one_per_line;
   
-  #ifdef	__cplusplus
+  #ifdef __cplusplus
   }
---- 58,71 ----
+--- 99,112 ----
   /* If NULL, error will flush stdout, then print on stderr the program
      name, a colon and a space.  Otherwise, error will call this
      function without parameters instead.  */
@@ -47,5 +47,5 @@
      variable controls whether this mode is selected or not.  */
 ! extern DLL_VARIABLE int error_one_per_line;
   
-  #ifdef	__cplusplus
+  #ifdef __cplusplus
   }
diff --git a/gnulib-local/lib/xerror.c b/gnulib-local/lib/xerror.c
index 532cbc862..fd1cabaec 100644
--- a/gnulib-local/lib/xerror.c
+++ b/gnulib-local/lib/xerror.c
@@ -1,5 +1,5 @@
 /* Multiline error-reporting functions.
-   Copyright (C) 2001-2003, 2006, 2019 Free Software Foundation, Inc.
+   Copyright (C) 2001-2003, 2006, 2019, 2023 Free Software Foundation, Inc.
    Written by Bruno Haible <haible@clisp.cons.org>, 2001.
 
    This program is free software: you can redistribute it and/or modify
@@ -29,7 +29,6 @@
 #include "error-progname.h"
 #include "mbswidth.h"
 #if IN_LIBGETTEXTPO
-# include "getprogname.h"
 # define program_name getprogname ()
 #else
 # include "progname.h"
diff --git a/gnulib-local/modules/gettext-tools-misc b/gnulib-local/modules/gettext-tools-misc
index 0aff53f67..6e9b3412c 100644
--- a/gnulib-local/modules/gettext-tools-misc
+++ b/gnulib-local/modules/gettext-tools-misc
@@ -18,9 +18,9 @@ lib_LTLIBRARIES = libgettextlib.la
 # was given.
 # Need @LTLIBINTL@ because many source files use gettext().
 # Need @LTLIBICONV@ because linebreak.c and striconv.c use iconv().
-# Need @LIB_ACL@ because copy-file.c uses acl.h.
+# Need @LIB_ACL@ @QCOPY_ACL_LIB@ because copy-file.c uses acl.h and qcopy_acl.
 # As of 2010-10-04, these are all added by gnulib-tool automatically.
-#lib_LDFLAGS += $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ @LIB_ACL@
+#lib_LDFLAGS += $(LTLIBUNISTRING) @LTLIBINTL@ @LTLIBICONV@ @LIB_ACL@ @QCOPY_ACL_LIB@
 
 lib_LDFLAGS += -release @VERSION@
 
diff --git a/libtextstyle/.gitignore b/libtextstyle/.gitignore
index 31748d057..d4d145367 100644
--- a/libtextstyle/.gitignore
+++ b/libtextstyle/.gitignore
@@ -22,6 +22,7 @@
 /lib/arg-nonnull.h
 /lib/asnprintf.c
 /lib/asprintf.c
+/lib/assert.in.h
 /lib/attribute.h
 /lib/basename-lgpl.c
 /lib/basename-lgpl.h
@@ -45,7 +46,7 @@
 /lib/dup2.c
 /lib/errno.in.h
 /lib/error.c
-/lib/error.h
+/lib/error.in.h
 /lib/exitfail.c
 /lib/exitfail.h
 /lib/fatal-signal.c
@@ -99,6 +100,7 @@
 /lib/iconv-ostream.oo.c
 /lib/iconv-ostream.oo.h
 /lib/idx.h
+/lib/intprops-internal.h
 /lib/intprops.h
 /lib/inttypes.in.h
 /lib/isatty.c
@@ -178,6 +180,7 @@
 /lib/stdalign.in.h
 /lib/stdarg.in.h
 /lib/stdbool.in.h
+/lib/stdckdint.in.h
 /lib/stddef.in.h
 /lib/stdint.in.h
 /lib/stdio-read.c
@@ -440,10 +443,14 @@ core
 /doc/vti.tmp*
 /lib/alloca.h
 /lib/alloca.h-t
+/lib/assert.h
+/lib/assert.h-t
 /lib/config.h
 /lib/config.h-t
 /lib/errno.h
 /lib/errno.h-t
+/lib/error.h
+/lib/error.h-t
 /lib/fcntl.h
 /lib/fcntl.h-t
 /lib/float.h
@@ -527,6 +534,8 @@ core
 /lib/stdarg.h-t
 /lib/stdbool.h
 /lib/stdbool.h-t
+/lib/stdckdint.h
+/lib/stdckdint.h-t
 /lib/stddef.h
 /lib/stddef.h-t
 /lib/stdint.h