[PATCH] gettext: Update to version 0.22.5

[PATCH] gettext: Update to version 0.22.5

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 4097 bytes --]

- Update from version 0.22.4 to 0.22.5
- Update of rootfile
- Changelog
    0.22.5
	* The replacements for the printf()/fprintf()/... functions that are
	  provided through <libintl.h> on native Windows and NetBSD now enable
	  GCC's format string analysis (-Wformat).
	* Bug fixes:
	  - xgettext's processing of Vala files with printf method invocations has
	    been corrected (regression in 0.22).
	  - Build fixes on macOS.

Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 config/rootfiles/common/gettext | 29 ++++++++++++-----------------
 lfs/gettext                     | 15 +++++++++++----
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/config/rootfiles/common/gettext b/config/rootfiles/common/gettext
index 31dcfa033..8b5f2aa28 100644
--- a/config/rootfiles/common/gettext
+++ b/config/rootfiles/common/gettext
@@ -33,25 +33,20 @@ usr/bin/gettext.sh
 #usr/lib/gettext/project-id
 #usr/lib/gettext/urlget
 #usr/lib/gettext/user-email
-#usr/lib/libasprintf.a
 #usr/lib/libasprintf.la
 #usr/lib/libasprintf.so
 usr/lib/libasprintf.so.0
 usr/lib/libasprintf.so.0.0.0
-usr/lib/libgettextlib-0.22.4.so
-usr/lib/libgettextlib.a
+usr/lib/libgettextlib-0.22.5.so
 #usr/lib/libgettextlib.la
 #usr/lib/libgettextlib.so
-#usr/lib/libgettextpo.a
 #usr/lib/libgettextpo.la
 #usr/lib/libgettextpo.so
 usr/lib/libgettextpo.so.0
 usr/lib/libgettextpo.so.0.5.10
-usr/lib/libgettextsrc-0.22.4.so
-#usr/lib/libgettextsrc.a
+usr/lib/libgettextsrc-0.22.5.so
 #usr/lib/libgettextsrc.la
 usr/lib/libgettextsrc.so
-#usr/lib/libtextstyle.a
 #usr/lib/libtextstyle.la
 #usr/lib/libtextstyle.so
 usr/lib/libtextstyle.so.0
@@ -1986,16 +1981,16 @@ usr/lib/preloadable_libintl.so
 #usr/share/doc/libtextstyle/libtextstyle_abt.html
 #usr/share/doc/libtextstyle/libtextstyle_toc.html
 #usr/share/gettext
-#usr/share/gettext-0.22.4
-#usr/share/gettext-0.22.4/its
-#usr/share/gettext-0.22.4/its/glade.loc
-#usr/share/gettext-0.22.4/its/glade1.its
-#usr/share/gettext-0.22.4/its/glade2.its
-#usr/share/gettext-0.22.4/its/gsettings.its
-#usr/share/gettext-0.22.4/its/gsettings.loc
-#usr/share/gettext-0.22.4/its/gtkbuilder.its
-#usr/share/gettext-0.22.4/its/metainfo.its
-#usr/share/gettext-0.22.4/its/metainfo.loc
+#usr/share/gettext-0.22.5
+#usr/share/gettext-0.22.5/its
+#usr/share/gettext-0.22.5/its/glade.loc
+#usr/share/gettext-0.22.5/its/glade1.its
+#usr/share/gettext-0.22.5/its/glade2.its
+#usr/share/gettext-0.22.5/its/gsettings.its
+#usr/share/gettext-0.22.5/its/gsettings.loc
+#usr/share/gettext-0.22.5/its/gtkbuilder.its
+#usr/share/gettext-0.22.5/its/metainfo.its
+#usr/share/gettext-0.22.5/its/metainfo.loc
 #usr/share/gettext/ABOUT-NLS
 #usr/share/gettext/archive.dir.tar.xz
 #usr/share/gettext/config.rpath
diff --git a/lfs/gettext b/lfs/gettext
index fb7462b5e..30f3d64c5 100644
--- a/lfs/gettext
+++ b/lfs/gettext
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.22.4
+VER        = 0.22.5
 
 THISAPP    = gettext-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -35,10 +35,17 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls
+  EXTRA_CONFIG = \
+		--prefix=/usr \
+		--disable-static \
+		--disable-nls
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-shared --disable-nls --build=$(BUILDTARGET)
+  EXTRA_CONFIG = \
+		--prefix=$(TOOLS_DIR) \
+		--disable-shared \
+		--disable-nls \
+		--build=$(BUILDTARGET)
 endif
 
 ###############################################################################
@@ -49,7 +56,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_BLAKE2 = 3f93aa5aef8e40d2e01acaa5aeed11efefd0de43ea26d084a0b9e743019685f7584d8e1bf05c1fd5772a5576d21ee1f052b81366f52c7827b6d14bd4d9890edc
+$(DL_FILE)_BLAKE2 = 18c383518f5a78b5c04cf76de976524da2a87a892a30d6386778bb4c7dd526ffc3f14f484906c5d3a513b7caf76ea560e53962b325e552182d6940055d798f24
 
 install : $(TARGET)
 
-- 
2.45.2