From caeb9a5604a5aba8f9fb6122ee25c7d8705c87e9 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 5 Oct 2022 17:51:44 +0300 Subject: [PATCH 30/30] Bump minimum gettext requirement to 0.16 See osdn #45783 Signed-off-by: Marko Lindqvist --- INSTALL | 6 +++--- autogen.sh | 4 ++-- doc/README.packaging | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/INSTALL b/INSTALL index c670bab31a..3a48e90450 100644 --- a/INSTALL +++ b/INSTALL @@ -4,7 +4,7 @@ Installing Freeciv: This file describes how to compile and install Freeciv. Last time we made sure this file is up to date was 16-Jul-06. -Last minor update was 20-Jul-22. +Last minor update was 05-Oct-22. There may be a localized version of this file in the ./doc directory, named INSTALL. (e.g., INSTALL.de). @@ -91,7 +91,7 @@ out whether your system is suitable. If in doubt, just try it. The git version has additional requirements. A release version contains the generated files. - - The programs from GNU gettext version 0.15 or better + - The programs from GNU gettext version 0.16 or better Especial the xgettext program is required to create the *.gmo files which aren't included in the git tree. @@ -502,7 +502,7 @@ Freeciv, there are a few work-arounds you can try: 2. You can try to install the latest version of GNU gettext. It may be obtained from here: - ftp://ftp.gnu.org/pub/gnu/gettext/gettext-0.19.2.tar.xz + https://ftp.gnu.org/gnu/gettext/gettext-0.21.tar.xz 6. Readline Support: diff --git a/autogen.sh b/autogen.sh index 6b310c4c68..570fd9e10c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -253,8 +253,8 @@ real_package_name "python3" "https://www.python.org/" 3 4 || DIE=1 if [ "$FC_USE_NLS" = "yes" ]; then DIE2=0 - version_check 1 "xgettext" "xgettext" "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 15 || DIE2=1 - version_check 1 "msgfmt" "msgfmt" "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 15 || DIE2=1 + version_check 1 "xgettext" "xgettext" "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 16 || DIE2=1 + version_check 1 "msgfmt" "msgfmt" "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 16 || DIE2=1 if [ "$DIE2" -eq 1 ]; then echo echo "You may want to use --disable-nls to disable NLS." diff --git a/doc/README.packaging b/doc/README.packaging index fdea5bbc18..bee28f9888 100644 --- a/doc/README.packaging +++ b/doc/README.packaging @@ -38,6 +38,7 @@ Updating from 3.0 to 3.1 * Support for zstd compressed savegames added, requires libzstd and headers * Minimum Python requirement for code generation scripts is 3.4 now. * Configure option --with-appdatadir renamed as --with-metainfodir +* Minimum gettexti requirement is 0.16 ---------------------------------------------------------------------- Compatibility of modified versions -- 2.35.1