Merge pull request #24630 from fuzzard/depends_gettext_0.22.4

[tools/depends] Bump gettext 0.22.4

tools/depends/native/gettext/02-disable-test-doc.patch

@@ -1,11 +1,11 @@
 --- a/gettext-tools/Makefile.in
 +++ b/gettext-tools/Makefile.in
-@@ -2198,7 +2198,7 @@
+@@ -3400,7 +3400,7 @@
  top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
  ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
--SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
-+SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4
+-SUBDIRS = gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
++SUBDIRS = gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4
 
  # Allow users to use "gnulib-tool --update".
 

tools/depends/native/gettext/GETTEXT-VERSION

@@ -0,0 +1,4 @@
+LIBNAME=gettext
+VERSION=0.22.4
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
+SHA512=ad2fa2f69be996a637e9b51e8941a39e10050060245dcec1fe75c15b68d0ff973043c87b77e4e2830e407e3bdd040b578f8e24fd05bba43adb94eaee34001aa5

tools/depends/native/gettext/Makefile

@@ -1,34 +1,28 @@
-include ../../Makefile.include
+include ../../Makefile.include GETTEXT-VERSION ../../download-files.include
 PREFIX=$(NATIVEPREFIX)
 PLATFORM=$(NATIVEPLATFORM)
-DEPS = ../../Makefile.include Makefile 01-gettext-tools-stpncpy.patch 02-disable-test-doc.patch ../../download-files.include
-
-# lib name, version
-LIBNAME=gettext
-VERSION=0.21
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.xz
-SHA512=f7e2968651879f8444d43a176a149db9f9411f4a03132a7f3b37c2ed97e3978ae6888169c995c1953cb78943b6e3573811abcbb8661b6631edbbe067b2699ddf
-include ../../download-files.include
+DEPS = ../../Makefile.include Makefile GETTEXT-VERSION ../../download-files.include \
+                      02-disable-test-doc.patch
 
 # configuration settings
 CONFIGURE=./configure --prefix=$(PREFIX) \
-    --disable-csharp --disable-native-java --disable-java --without-emacs \
-    --disable-libasprintf --disable-openmp \
-    --with-included-gettext \
-    --with-included-glib \
-    --with-included-libcroco \
-    --with-included-libxml \
-    --without-git --without-cvs \
-    --disable-shared --disable-curses --disable-acl --disable-c++ --disable-nls
-
-ifeq ($(NATIVE_OS), osx)
-  # As per homebrew - https://github.com/Homebrew/homebrew-core/blob/f6df737d9479dd215185000a3dbd641185eafec2/Formula/g/gettext.rb#L52C1-L55
-  # Sonoma iconv() has a regression w.r.t. transliteration, which happens to
-  # break gettext's configure check. Force it.
-  # Reported to Apple as FB13163914
-  CONFIGURE+= am_cv_func_iconv_works=y
-endif
+                      --disable-csharp \
+                      --disable-native-java \
+                      --disable-java \
+                      --disable-c++ \
+                      --without-emacs \
+                      --disable-libasprintf \
+                      --disable-openmp \
+                      --disable-curses \
+                      --disable-acl  \
+                      --disable-nls \
+                      --with-included-gettext \
+                      --with-included-glib \
+                      --with-included-libcroco \
+                      --with-included-libxml \
+                      --without-git \
+                      --without-cvs \
+                      --disable-shared
 
 LIBDYLIB=$(PLATFORM)/gettext-tools/src/.libs/libgettextsrc.a
 
@@ -38,19 +32,16 @@ all: .installed-$(PLATFORM)
 $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE)
 	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); sed -ie '/gets is a security hole/d' gettext-tools/gnulib-lib/stdio.in.h
-	cd $(PLATFORM); sed -ie '/gets is a security hole/d' gettext-tools/libgettextpo/stdio.in.h
-	cd $(PLATFORM); sed -ie '/gets is a security hole/d' gettext-runtime/gnulib-lib/stdio.in.h
-	cd $(PLATFORM); patch -p1 -i ../01-gettext-tools-stpncpy.patch
 	cd $(PLATFORM); patch -p1 -i ../02-disable-test-doc.patch
 	cd $(PLATFORM); $(CONFIGURE)
 
 $(LIBDYLIB): $(PLATFORM)
+	$(MAKE) -C $(PLATFORM)/gettext-runtime/intl libgnuintl.h
 	$(MAKE) -C $(PLATFORM)/libtextstyle
 	$(MAKE) -C $(PLATFORM)/gettext-tools
 
 .installed-$(PLATFORM): $(LIBDYLIB)
-	$(MAKE) -j1 -C $(PLATFORM)/gettext-tools install
+	$(MAKE) -C $(PLATFORM)/gettext-tools install
 	touch $@
 
 clean:

tools/depends/target/gettext/GETTEXT-VERSION

@@ -0,0 +1,4 @@
+LIBNAME=gettext
+VERSION=0.22.4
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
+SHA512=ad2fa2f69be996a637e9b51e8941a39e10050060245dcec1fe75c15b68d0ff973043c87b77e4e2830e407e3bdd040b578f8e24fd05bba43adb94eaee34001aa5

tools/depends/target/gettext/Makefile

@@ -1,13 +1,5 @@
-include ../../Makefile.include
-DEPS = ../../Makefile.include Makefile ../../download-files.include
-
-# lib name, version
-LIBNAME=gettext
-VERSION=0.21.1
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.xz
-SHA512=61e93bc9876effd3ca1c4e64ff6ba5bd84b24951ec2cc6f40a0e3248410e60f887552f29ca1f70541fb5524f6a4e8191fed288713c3e280e18922dd5bff1a2c9
-include ../../download-files.include
+include ../../Makefile.include GETTEXT-VERSION ../../download-files.include
+DEPS = ../../Makefile.include Makefile GETTEXT-VERSION ../../download-files.include
 
 # configuration settings
 CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) build-aux/; \