From ec87cff2ac13f29f4aee88caa7e16e72cef3f490 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 25 Jul 2021 13:18:20 +0200 Subject: [PATCH] Assume GNU gettext >= 0.17. * modules/vasprintf (Notice): Remove. * modules/xvasprintf (Notice): Remove. * modules/xprintf (Notice): Remove. * modules/error (Notice): Remove. * modules/verror (Notice): Remove. * modules/argp (Notice): Remove. * modules/propername (Notice): Remove. * lib/propername.h: Remove outdated comment. --- ChangeLog | 12 ++++++++++++ lib/propername.h | 12 +----------- modules/argp | 5 ----- modules/error | 5 ----- modules/propername | 6 ------ modules/vasprintf | 5 ----- modules/verror | 5 ----- modules/xprintf | 6 ------ modules/xvasprintf | 4 ---- 9 files changed, 13 insertions(+), 47 deletions(-) diff --git a/ChangeLog b/ChangeLog index 22cd100103..5a99bf47ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2021-07-25 Bruno Haible + + Assume GNU gettext >= 0.17. + * modules/vasprintf (Notice): Remove. + * modules/xvasprintf (Notice): Remove. + * modules/xprintf (Notice): Remove. + * modules/error (Notice): Remove. + * modules/verror (Notice): Remove. + * modules/argp (Notice): Remove. + * modules/propername (Notice): Remove. + * lib/propername.h: Remove outdated comment. + 2021-07-19 Simon Josefsson gendocs.sh: Fix local rendering of HTML manuals. diff --git a/lib/propername.h b/lib/propername.h index 8037de7f9d..ee09d7c85b 100644 --- a/lib/propername.h +++ b/lib/propername.h @@ -51,7 +51,7 @@ output will look like this: () - To use the 'propername' module requires three simple steps: + To use the 'propername' module requires two simple steps: 1) Add it to the list of gnulib modules to import, @@ -68,16 +68,6 @@ (Optionally, here you can also add / * TRANSLATORS: ... * / comments explaining how the name is written or pronounced.) - - 3) If you are using GNU gettext version 0.16.1 or older, in po/Makevars, - in the definition of the XGETTEXT_OPTIONS variable, add: - - --keyword='proper_name:1,"This is a proper name. See the gettext manual, section Names."' - --keyword='proper_name_utf8:1,"This is a proper name. See the gettext manual, section Names."' - - This specifies automatic comments for the translator. (Requires - xgettext >= 0.15. The double-quotes inside the quoted string are on - purpose: they are part of the --keyword argument syntax.) */ #ifndef _PROPERNAME_H diff --git a/modules/argp b/modules/argp index 38a790523c..85eefe2b14 100644 --- a/modules/argp +++ b/modules/argp @@ -1,11 +1,6 @@ Description: Hierarchical processing of command line arguments. -Notice: -If you are using GNU gettext version 0.16.1 or older, add the following options -to XGETTEXT_OPTIONS in your po/Makevars: - --flag=argp_error:2:c-format --flag=argp_failure:4:c-format - Files: lib/argp.h lib/argp-ba.c diff --git a/modules/error b/modules/error index a0fb4c05ac..2945c48454 100644 --- a/modules/error +++ b/modules/error @@ -1,11 +1,6 @@ Description: error and error_at_line functions: Error reporting. -Notice: -If you are using GNU gettext version 0.16.1 or older, add the following options -to XGETTEXT_OPTIONS in your po/Makevars: - --flag=error:3:c-format --flag=error_at_line:5:c-format - Files: lib/error.h lib/error.c diff --git a/modules/propername b/modules/propername index ab06a46cd3..fb1e78a9b2 100644 --- a/modules/propername +++ b/modules/propername @@ -1,12 +1,6 @@ Description: Localization of proper names. -Notice: -If you are using GNU gettext version 0.16.1 or older, add the following options -to XGETTEXT_OPTIONS in your po/Makevars: - --keyword='proper_name:1,"This is a proper name. See the gettext manual, section Names."' - --keyword='proper_name_utf8:1,"This is a proper name. See the gettext manual, section Names."' - Files: lib/propername.h lib/propername.c diff --git a/modules/vasprintf b/modules/vasprintf index 59e5a861e7..91d082bd27 100644 --- a/modules/vasprintf +++ b/modules/vasprintf @@ -1,11 +1,6 @@ Description: vsprintf with automatic memory allocation. -Notice: -If you are using GNU gettext version 0.16.1 or older, add the following options -to XGETTEXT_OPTIONS in your po/Makevars: - --flag=asprintf:2:c-format --flag=vasprintf:2:c-format - Files: lib/vasprintf.c lib/asprintf.c diff --git a/modules/verror b/modules/verror index e183f68ea1..16ad0c5961 100644 --- a/modules/verror +++ b/modules/verror @@ -1,11 +1,6 @@ Description: verror and verror_at_line functions: Error reporting with va_list. -Notice: -If you are using GNU gettext version 0.16.1 or older, add the following options -to XGETTEXT_OPTIONS in your po/Makevars: - --flag=verror:3:c-format --flag=verror_at_line:5:c-format - Files: lib/verror.h lib/verror.c diff --git a/modules/xprintf b/modules/xprintf index de61260e87..f4942cea87 100644 --- a/modules/xprintf +++ b/modules/xprintf @@ -1,12 +1,6 @@ Description: a wrapper around printf that calls error upon ENOMEM or EILSEQ errors -Notice: -If you are using GNU gettext version 0.16.1 or older, add the following options -to XGETTEXT_OPTIONS in your po/Makevars: - --flag=xprintf:1:c-format --flag=xvprintf:1:c-format - --flag=xfprintf:2:c-format --flag=xvfprintf:2:c-format - Files: lib/xprintf.h lib/xprintf.c diff --git a/modules/xvasprintf b/modules/xvasprintf index 373c1fabc1..ae233148d3 100644 --- a/modules/xvasprintf +++ b/modules/xvasprintf @@ -1,10 +1,6 @@ Description: vasprintf and asprintf with out-of-memory checking. Also see xalloc-die. -Notice: -If you are using GNU gettext version 0.16.1 or older, add the following options -to XGETTEXT_OPTIONS in your po/Makevars: --flag=xasprintf:1:c-format - Files: lib/xvasprintf.h lib/xvasprintf.c -- 2.39.5