[gettext] Update to 0.22.4 (#35585)

ports/gettext-libintl/android.patch

@@ -1,12 +0,0 @@
-diff --color -ruN a/gettext-runtime/intl/dcigettext.c src/gettext-runtime/intl/dcigettext.c
---- a/gettext-runtime/intl/dcigettext.c	2021-05-26 16:27:55.420544597 +0200
-+++ src/gettext-runtime/intl/dcigettext.c	2021-05-26 16:29:14.546516701 +0200
-@@ -143,7 +143,7 @@
- # else
- #  if VMS
- #   define getcwd(buf, max) (getcwd) (buf, max, 0)
--#  else
-+#  elif !(defined(__clang__) && defined(__BIONIC_FORTIFY))
- char *getcwd ();
- #  endif
- # endif

ports/gettext-libintl/portfile.cmake

@@ -16,14 +16,12 @@ vcpkg_download_distfile(ARCHIVE
     URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${VERSION}.tar.gz"
          "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${VERSION}.tar.gz"
     FILENAME "gettext-${VERSION}.tar.gz"
-    SHA512 ccd43a43fab3c90ed99b3e27628c9aeb7186398153b137a4997f8c7ddfd9729b0ba9d15348567e5206af50ac027673d2b8a3415bb3fc65f87ad778f85dc03a05
+    SHA512 ad2fa2f69be996a637e9b51e8941a39e10050060245dcec1fe75c15b68d0ff973043c87b77e4e2830e407e3bdd040b578f8e24fd05bba43adb94eaee34001aa5
 )
 
 vcpkg_extract_source_archive(SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     PATCHES
-        # Shared with port gettext
-        android.patch
         uwp.patch
         0003-Fix-win-unicode-paths.patch
 )
@@ -43,29 +41,19 @@ endif()
 set(OPTIONS
     --no-recursion
     --enable-relocatable #symbol duplication with glib-init.c?
-    --enable-c++
-    --disable-acl
-    --disable-csharp
-    --disable-curses
-    --disable-java
-    --disable-libasprintf
-    --disable-openmp
     --with-included-gettext
     --without-libintl-prefix
-    --disable-dependency-tracking # Faster ?
+    --disable-dependency-tracking
-    ac_cv_path_DVIPS=:
+    ac_cv_path_GMSGFMT=false
-    ac_cv_path_GMSGFMT=:
+    ac_cv_path_MSGFMT=false
-    ac_cv_path_MSGFMT=:
+    ac_cv_path_MSGMERGE=false
-    ac_cv_path_MSGMERGE=:
+    ac_cv_path_XGETTEXT=false
-    ac_cv_path_TEXI2PDF=:
+    ac_cv_prog_INTLBISON=false
-    ac_cv_path_XGETTEXT=:
-    ac_cv_prog_INTLBISON=:
 )
 if(VCPKG_TARGET_IS_WINDOWS)
     list(APPEND OPTIONS
         # Avoid unnecessary tests.
         am_cv_func_iconv_works=yes
-        "--with-libiconv-prefix=${CURRENT_INSTALLED_DIR}"
         ## This is required. For some reason these do not get correctly identified for release builds.
         ac_cv_func_wcslen=yes
         ac_cv_func_memmove=yes
@@ -88,7 +76,7 @@ endif()
 
 file(REMOVE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-rel.log")
 file(REMOVE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-dbg.log")
-vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}/gettext-runtime"
+vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}/gettext-runtime/intl"
     DETERMINE_BUILD_TRIPLET
     USE_WRAPPERS
     OPTIONS
@@ -103,17 +91,18 @@ vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}/gettext-runtime"
 # - Avoid an extra command to move a temporary file, we are building out of source.
 # - Avoid a subshell just to add comments, the build dir is temporary.
 # - Avoid cygpath -w when other tools handle this for us.
-file(GLOB_RECURSE makefiles "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}*/intl/Makefile")
+file(GLOB_RECURSE makefiles "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}*/Makefile")
 foreach(file IN LISTS makefiles)
     file(READ "${file}" rules)
     string(REGEX REPLACE "(\n\ttest -d [^ ]* [|][|] [\$][(]MKDIR_P[)][^\n;]*)(\n\t)" "\\1 || exit 1 ; \\\\\\2" rules "${rules}")
     string(REGEX REPLACE "(\n\t){ echo '/[*] [^*]* [*]/'; \\\\\n\t  cat ([^;\n]*); \\\\\n\t[}] > [\$]@-t\n\tmv -f [\$]@-t ([\$]@\n)" "\\1cp \\2 \\3" rules "${rules}")
     string(REGEX REPLACE " > [\$]@-t\n\t[\$][(]AM_V_at[)]mv [\$]@-t ([\$]@\n)" "> \\1" rules "${rules}")
     string(REGEX REPLACE "([\$}[(]COMPILE[)] -c -o [\$]@) `[\$][(]CYGPATH_W[)] '[\$]<'`" "\\1 \$<" rules "${rules}")
+    string(REPLACE "  ../config.h" "  config.h" rules "${rules}")
     file(WRITE "${file}" "${rules}")
 endforeach()
 
-vcpkg_install_make(SUBPATH intl)
+vcpkg_install_make()
 vcpkg_copy_pdbs()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

ports/gettext-libintl/uwp.patch

@@ -1,20 +1,3 @@
-diff --git a/gettext-runtime/gnulib-lib/fcntl.c b/gettext-runtime/gnulib-lib/fcntl.c
-index f9753c4..3a3caee 100644
---- a/gettext-runtime/gnulib-lib/fcntl.c
-+++ b/gettext-runtime/gnulib-lib/fcntl.c
-@@ -38,6 +38,12 @@
- # define WIN32_LEAN_AND_MEAN
- # include <windows.h>
- 
-+# if defined(WINAPI_FAMILY_PARTITION)
-+#  if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
-+#   define HANDLE_FLAG_INHERIT 0
-+#  endif
-+# endif
-+
- /* Get _get_osfhandle.  */
- # if GNULIB_MSVC_NOTHROW
- #  include "msvc-nothrow.h"
 diff --git a/gettext-runtime/intl/langprefs.c b/gettext-runtime/intl/langprefs.c
 index f774ba2..f488b7f 100644
 --- a/gettext-runtime/intl/langprefs.c
@@ -31,10 +14,10 @@ index f774ba2..f488b7f 100644
  #endif
  
  #ifdef WIN32_NATIVE
-diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c
+diff --git a/gettext-runtime/intl/gnulib-lib/localcharset.c b/gettext-runtime/intl/gnulib-lib/localcharset.c
 index ec75427..9e063e4 100644
---- a/gettext-runtime/intl/localcharset.c
+--- a/gettext-runtime/intl/gnulib-lib/localcharset.c
-+++ b/gettext-runtime/intl/localcharset.c
++++ b/gettext-runtime/intl/gnulib-lib/localcharset.c
 @@ -34,6 +34,9 @@
  #if defined _WIN32 && !defined __CYGWIN__
  # define WINDOWS_NATIVE
@@ -54,19 +37,3 @@ index ec75427..9e063e4 100644
  # elif defined WINDOWS_NATIVE
  
    char buf[2 + 10 + 1];
-diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c
-index d77bb81..3c6e055 100644
---- a/gettext-runtime/intl/localename.c
-+++ b/gettext-runtime/intl/localename.c
-@@ -69,6 +69,11 @@ extern char * getlocalename_l(int, locale_t);
- 
- #if defined _WIN32 && !defined __CYGWIN__
- # define WINDOWS_NATIVE
-+# if defined(WINAPI_FAMILY_PARTITION)
-+#  if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
-+#   undef WIN32_NATIVE
-+#  endif
-+# endif
- # if !defined IN_LIBINTL
- #  include "glthread/lock.h"
- # endif

ports/gettext-libintl/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "gettext-libintl",
-  "version": "0.21.1",
+  "version": "0.22.4",
-  "port-version": 1,
   "description": "The libintl C library from GNU gettext-runtime.",
   "homepage": "https://www.gnu.org/software/gettext/",
   "license": "LGPL-2.1-or-later",

ports/gettext/android.patch

@@ -1,12 +0,0 @@
-diff --color -ruN a/gettext-runtime/intl/dcigettext.c src/gettext-runtime/intl/dcigettext.c
---- a/gettext-runtime/intl/dcigettext.c	2021-05-26 16:27:55.420544597 +0200
-+++ src/gettext-runtime/intl/dcigettext.c	2021-05-26 16:29:14.546516701 +0200
-@@ -143,7 +143,7 @@
- # else
- #  if VMS
- #   define getcwd(buf, max) (getcwd) (buf, max, 0)
--#  else
-+#  elif !(defined(__clang__) && defined(__BIONIC_FORTIFY))
- char *getcwd ();
- #  endif
- # endif

ports/gettext/config-step-order.patch

@@ -0,0 +1,76 @@
+diff --git a/gettext-runtime/configure b/gettext-runtime/configure
+index ed6cb37..780cc84 100644
+--- a/gettext-runtime/configure
++++ b/gettext-runtime/configure
+@@ -22346,6 +22346,12 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; }
+ 
+ 
+ 
++### Configuration step reordering
++### Similar to AM_GNU_GETTEXT(external,...), cf. gettext-runtime/m4/gettext.m4
++### Pull iconv lookup before actual GNU gettext lookup.
++for configuration_step in gettext-iconv gettext-main; do
++case "$configuration_step" in
++gettext-main)
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+ printf %s "checking for CFPreferencesCopyAppValue... " >&6; }
+ if test ${gt_cv_func_CFPreferencesCopyAppValue+y}
+@@ -29535,6 +29541,9 @@ printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h
+ 
+ 
+ 
++### Configuration step reordering
++;;
++gettext-iconv)
+     use_additional=yes
+ 
+   acl_save_prefix="$prefix"
+@@ -30464,6 +30473,10 @@ printf "%s\n" "$gl_cv_next_iconv_h" >&6; }
+        gl_next_as_first_directive=$gl_cv_next_iconv_h
+      fi
+      NEXT_AS_FIRST_DIRECTIVE_ICONV_H=$gl_next_as_first_directive
++### Configuration step reordering
++;;
++esac
++done
+ 
+ 
+ 
+diff --git a/gettext-tools/configure b/gettext-tools/configure
+index b4a4f93..17b05c8 100644
+--- a/gettext-tools/configure
++++ b/gettext-tools/configure
+@@ -25735,6 +25735,12 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; }
+ 
+ 
+ 
++### Configuration step reordering
++### Similar to AM_GNU_GETTEXT(external,...), cf. gettext-runtime/m4/gettext.m4
++### Pull iconv lookup before actual GNU gettext lookup.
++for configuration_step in gettext-iconv gettext-main; do
++case "$configuration_step" in
++gettext-main)
+     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+ printf %s "checking for CFPreferencesCopyAppValue... " >&6; }
+ if test ${gt_cv_func_CFPreferencesCopyAppValue+y}
+@@ -37529,6 +37535,9 @@ printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h
+ 
+ 
+ 
++### Configuration step reordering
++;;
++gettext-iconv)
+     use_additional=yes
+ 
+   acl_save_prefix="$prefix"
+@@ -38458,6 +38467,10 @@ printf "%s\n" "$gl_cv_next_iconv_h" >&6; }
+        gl_next_as_first_directive=$gl_cv_next_iconv_h
+      fi
+      NEXT_AS_FIRST_DIRECTIVE_ICONV_H=$gl_next_as_first_directive
++### Configuration step reordering
++;;
++esac
++done
+ 
+ 
+ 

ports/gettext/macosx-libs.patch

@@ -1,13 +0,0 @@
-diff --git a/gettext-runtime/configure b/gettext-runtime/configure
-index c21955a..902729a 100755
---- a/gettext-runtime/configure
-+++ b/gettext-runtime/configure
-@@ -26819,7 +26819,7 @@ else $as_nop
-   gt_save_CPPFLAGS="$CPPFLAGS"
-             CPPFLAGS="$CPPFLAGS $INCINTL"
-             gt_save_LIBS="$LIBS"
--            LIBS="$LIBS $LIBINTL"
-+            LIBS="$LIBS $LIBINTL $INTL_MACOSX_LIBS"
-                         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 

ports/gettext/portfile.cmake

@@ -16,22 +16,17 @@ vcpkg_download_distfile(ARCHIVE
     URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${VERSION}.tar.gz"
          "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${VERSION}.tar.gz"
     FILENAME "gettext-${VERSION}.tar.gz"
-    SHA512 ccd43a43fab3c90ed99b3e27628c9aeb7186398153b137a4997f8c7ddfd9729b0ba9d15348567e5206af50ac027673d2b8a3415bb3fc65f87ad778f85dc03a05
+    SHA512 ad2fa2f69be996a637e9b51e8941a39e10050060245dcec1fe75c15b68d0ff973043c87b77e4e2830e407e3bdd040b578f8e24fd05bba43adb94eaee34001aa5
 )
 
 vcpkg_extract_source_archive(SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     PATCHES
-        # shared with port gettext-libintl
-        android.patch
         uwp.patch
-        0003-Fix-win-unicode-paths.patch
-        # unique to port gettext
-        win-gethostname.patch
         rel_path.patch
         subdirs.patch
         parallel-gettext-tools.patch
-        macosx-libs.patch
+        config-step-order.patch
 )
 
 set(subdirs "")
@@ -45,7 +40,8 @@ if(subdirs)
     set(ENV{VCPKG_GETTEXT_SUBDIRS} "${subdirs}")
 
     vcpkg_find_acquire_program(BISON)
-    get_filename_component(BISON_PATH "${BISON}" DIRECTORY)
+    cmake_path(GET BISON FILENAME BISON_NAME)
+    cmake_path(GET BISON PARENT_PATH BISON_PATH)
     vcpkg_add_to_path("${BISON_PATH}")
 
     if(VCPKG_HOST_IS_WINDOWS)
@@ -81,7 +77,23 @@ if(subdirs)
         --without-libncurses-prefix
         --without-libtermcap-prefix
         --without-libxcurses-prefix
+        "INTLBISON=${BISON_NAME}"
+        "TOOLS_BISON=${BISON_NAME}"
     )
+
+    if("nls" IN_LIST FEATURES)
+        vcpkg_list(APPEND options "--enable-nls")
+    else()
+        vcpkg_list(APPEND options "--disable-nls")
+    endif()
+
+    if(VCPKG_TARGET_IS_LINUX)
+        # Cannot use gettext-libintl, empty port on linux
+        set(ENV{VCPKG_INTL} intl)
+    else()
+        # Relying on gettext-libintl
+        list(APPEND OPTIONS --with-included-gettext=no)
+    endif()
     if(VCPKG_TARGET_IS_WINDOWS)
         list(APPEND OPTIONS
             # Faster, but not for export
@@ -176,6 +188,7 @@ endif()
 # We want to install these files also for fast "core" builds without "tools".
 # Cf. PACKAGING for the file list.
 file(INSTALL
+    "${SOURCE_PATH}/gettext-runtime/m4/build-to-host.m4"
     "${SOURCE_PATH}/gettext-runtime/m4/gettext.m4"
     "${SOURCE_PATH}/gettext-runtime/m4/iconv.m4"
     "${SOURCE_PATH}/gettext-runtime/m4/intlmacosx.m4"

ports/gettext/subdirs.patch

@@ -7,7 +7,7 @@ index 904bdf5..e751ffc 100755
  
  
 -subdirs="$subdirs gettext-runtime libtextstyle gettext-tools"
-+subdirs="$subdirs $VCPKG_GETTEXT_SUBDIRS"
++subdirs="$subdirs gettext-runtime ${VCPKG_GETTEXT_SUBDIRS/gettext-runtime/}"
  
  
  
@@ -47,9 +47,9 @@ index a7594ed..296f3b7 100644
             || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
 -                && test "$PACKAGE" != gettext-runtime \
 +                && test "$PACKAGE" != pristine-gettext-runtime \
-                 && test "$PACKAGE" != gettext-tools; }; then
+                 && test "$PACKAGE" != gettext-tools \
+                 && test "$PACKAGE" != libintl; }; then
            gt_use_preinstalled_gnugettext=yes
-         else
 diff --git a/gettext-runtime/libasprintf/configure b/gettext-runtime/libasprintf/configure
 --- a/gettext-runtime/libasprintf/configure
 +++ b/gettext-runtime/libasprintf/configure
@@ -70,8 +70,8 @@ index 59e81a8..107856d 100644
  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 = 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              po its projects styles       misc
++SUBDIRS = gnulib-lib libgrep src              po its projects styles       misc
  
  # Allow users to use "gnulib-tool --update".
  
@@ -83,11 +83,11 @@ index 056a830..9abca7e 100644
                                          if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
             || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
                  && test "$PACKAGE" != gettext-runtime \
--                && test "$PACKAGE" != gettext-tools; }; then
+-                && test "$PACKAGE" != gettext-tools \
-+                && test "$PACKAGE" != pristine-gettext-tools; }; then
++                && test "$PACKAGE" != pristine-gettext-tools \
+                 && test "$PACKAGE" != libintl; }; then
            gt_use_preinstalled_gnugettext=yes
          else
-                     LIBINTL=
 diff --git a/gettext-tools/examples/configure b/gettext-tools/examples/configure
 --- a/gettext-tools/examples/configure
 +++ b/gettext-tools/examples/configure
@@ -100,6 +100,18 @@ index ff1c212..0c0dbcd 100644
  ## -------------------- ##
  ## M4sh Initialization. ##
  ## -------------------- ##
+diff --git a/gettext-tools/src/Makefile.in b/gettext-tools/src/Makefile.in
+--- a/gettext-tools/src/Makefile.in
++++ b/gettext-tools/src/Makefile.in
+index ff1c212..0c0dbcd 100644
+@@ -4381,6 +4381,7 @@
+ 	$(AM_V_GEN)$(msgfilter_LINK) $(msgfilter_OBJECTS) $(msgfilter_LDADD) $(LIBS)
+ ../../gettext-runtime/intl/$(am__dirstamp):
+ 	@$(MKDIR_P) ../../gettext-runtime/intl
++	@$(MAKE) -C ../../gettext-runtime/intl libgnuintl.h
+ 	@: > ../../gettext-runtime/intl/$(am__dirstamp)
+ ../../gettext-runtime/intl/msgfmt-hash-string.$(OBJEXT):  \
+ 	../../gettext-runtime/intl/$(am__dirstamp)
 diff --git a/libtextstyle/Makefile.in b/libtextstyle/Makefile.in
 index ff1c212..0c0dbcd 100644
 --- a/libtextstyle/Makefile.in

ports/gettext/uwp.patch

@@ -15,26 +15,10 @@ index f9753c4..3a3caee 100644
  /* Get _get_osfhandle.  */
  # if GNULIB_MSVC_NOTHROW
  #  include "msvc-nothrow.h"
-diff --git a/gettext-runtime/intl/langprefs.c b/gettext-runtime/intl/langprefs.c
+diff --git a/gettext-runtime/gnulib-lib/localcharset.c b/gettext-runtime/gnulib-lib/localcharset.c
-index f774ba2..f488b7f 100644
---- a/gettext-runtime/intl/langprefs.c
-+++ b/gettext-runtime/intl/langprefs.c
-@@ -38,6 +38,11 @@ extern void _nl_locale_name_canonicalize (char *name);
- 
- #if defined _WIN32
- # define WIN32_NATIVE
-+# if defined(WINAPI_FAMILY_PARTITION)
-+#  if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
-+#   undef WIN32_NATIVE
-+#  endif
-+# endif
- #endif
- 
- #ifdef WIN32_NATIVE
-diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c
 index ec75427..9e063e4 100644
---- a/gettext-runtime/intl/localcharset.c
+--- a/gettext-runtime/gnulib-lib/localcharset.c
-+++ b/gettext-runtime/intl/localcharset.c
++++ b/gettext-runtime/gnulib-lib/localcharset.c
 @@ -34,6 +34,9 @@
  #if defined _WIN32 && !defined __CYGWIN__
  # define WINDOWS_NATIVE
@@ -54,10 +38,10 @@ index ec75427..9e063e4 100644
  # elif defined WINDOWS_NATIVE
  
    char buf[2 + 10 + 1];
-diff --git a/gettext-runtime/intl/localename.c b/gettext-runtime/intl/localename.c
+diff --git a/gettext-runtime/gnulib-lib/localename.c b/gettext-runtime/gnulib-lib/localename.c
 index d77bb81..3c6e055 100644
---- a/gettext-runtime/intl/localename.c
+--- a/gettext-runtime/gnulib-lib/localename.c
-+++ b/gettext-runtime/intl/localename.c
++++ b/gettext-runtime/gnulib-lib/localename.c
 @@ -69,6 +69,11 @@ extern char * getlocalename_l(int, locale_t);
  
  #if defined _WIN32 && !defined __CYGWIN__
@@ -67,6 +51,6 @@ index d77bb81..3c6e055 100644
 +#   undef WIN32_NATIVE
 +#  endif
 +# endif
- # if !defined IN_LIBINTL
+ # include "glthread/lock.h"
- #  include "glthread/lock.h"
+ #endif
- # endif
+

ports/gettext/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "gettext",
-  "version": "0.21.1",
+  "version": "0.22.4",
-  "port-version": 3,
   "description": "A GNU framework to help produce multi-lingual messages.",
   "homepage": "https://www.gnu.org/software/gettext/",
   "license": "GPL-3.0-only",
@@ -10,9 +9,15 @@
     "gettext-libintl"
   ],
   "features": {
+    "nls": {
+      "description": "Enable native language support"
+    },
     "runtime-tools": {
       "description": "Build runtime tools for internationalization of scripts",
-      "supports": "!uwp"
+      "supports": "!uwp",
+      "dependencies": [
+        "libiconv"
+      ]
     },
     "tools": {
       "description": "Build gettext tools",

ports/gettext/win-gethostname.patch

@@ -1,45 +0,0 @@
-diff --git a/gettext-tools/src/hostname.c b/gettext-tools/src/hostname.c
-index e909637..c2e8065 100644
---- a/gettext-tools/src/hostname.c
-+++ b/gettext-tools/src/hostname.c
-@@ -29,7 +29,9 @@
- #include <locale.h>
- 
- #if defined _WIN32
-+# if !HAVE_GETHOSTNAME
- # define WIN32_NATIVE
-+# endif
- #endif
- 
- /* Get gethostname().  */
-@@ -56,6 +58,9 @@
- 
- /* Support for using gethostbyname().  */
- #if HAVE_GETHOSTBYNAME
-+# if HAVE_WINSOCK2_H
-+#  include <winsock2.h>
-+# else
- # include <sys/types.h>
- # include <sys/socket.h> /* defines AF_INET, AF_INET6 */
- # include <netinet/in.h> /* declares ntohs(), defines struct sockaddr_in */
-@@ -76,6 +81,7 @@
- #  endif
- # endif
- # include <netdb.h> /* defines struct hostent, declares gethostbyname() */
-+# endif
- #endif
- 
- /* Include this after <sys/socket.h>, to avoid a syntax error on BeOS.  */
-diff --git a/libtextstyle/lib/unistd.in.h b/libtextstyle/lib/unistd.in.h
-index fd69a48..4ebdcaa 100644
---- a/libtextstyle/lib/unistd.in.h
-+++ b/libtextstyle/lib/unistd.in.h
-@@ -1240,7 +1240,7 @@ _GL_WARN_ON_USE (getgroups, "getgroups is unportable - "
-    Null terminate it if the name is shorter than LEN.
-    If the host name is longer than LEN, set errno = EINVAL and return -1.
-    Return 0 if successful, otherwise set errno and return -1.  */
--# if @UNISTD_H_HAVE_WINSOCK2_H@
-+# if @UNISTD_H_HAVE_WINSOCK2_H@ && !@HAVE_GETHOSTNAME@
- #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
- #   undef gethostname
- #   define gethostname rpl_gethostname

versions/baseline.json

@@ -2933,12 +2933,12 @@
       "port-version": 0
     },
     "gettext": {
-      "baseline": "0.21.1",
+      "baseline": "0.22.4",
-      "port-version": 3
+      "port-version": 0
     },
     "gettext-libintl": {
-      "baseline": "0.21.1",
+      "baseline": "0.22.4",
-      "port-version": 1
+      "port-version": 0
     },
     "gettimeofday": {
       "baseline": "2017-10-14",

versions/g-/gettext-libintl.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "003232270da6a899ac59d4e61d7fead638584deb",
+      "version": "0.22.4",
+      "port-version": 0
+    },
     {
       "git-tree": "25450f3473f6c62f28af9702a772d8b48a6170b7",
       "version": "0.21.1",

versions/g-/gettext.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e30ed5daac31351d72a221b74c1b8c4ecd06b694",
+      "version": "0.22.4",
+      "port-version": 0
+    },
     {
       "git-tree": "20e8e3535959bba6066d8887bb1c95e622d86f5a",
       "version": "0.21.1",