[gettext,gettext-libintl] Update

ports/gettext-libintl/0003-Fix-win-unicode-paths.patch

@@ -59,4 +59,4 @@ index d5a5fe1..5c47f48 100644
 +}
  #endif
 
- /* For those losing systems which don't have `alloca' we have to add
+ /* For systems that distinguish between text and binary I/O.

ports/gettext-libintl/portfile.cmake

@@ -24,10 +24,10 @@ endif()
 set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)
 
 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 d8b22d7fba10052a2045f477f0a5b684d932513bdb3b295c22fbd9dfc2a9d8fccd9aefd90692136c62897149aa2f7d1145ce6618aa1f0be787cb88eba5bc09be
+    URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${VERSION}.tar.xz"
+         "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${VERSION}.tar.xz"
+    FILENAME "gettext-${VERSION}.tar.xz"
+    SHA512 544e41c9390695df1c21542842e9ca027a03cb7d4045d8cd759dec1a3dfb624aae900751b458bdb31d6454b37c40c474a952059b884555a03c7c95d6d0e687b1
 )
 
 vcpkg_extract_source_archive(SOURCE_PATH

ports/gettext-libintl/vcpkg.json

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

ports/gettext/config-step-order.patch

@@ -1,8 +1,8 @@
 diff --git a/gettext-runtime/configure b/gettext-runtime/configure
-index 2a376c6..a984774 100755
+index 3fab6ea..2dc6e07 100755
 --- a/gettext-runtime/configure
 +++ b/gettext-runtime/configure
-@@ -22346,6 +22346,12 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; }
+@@ -25216,6 +25216,12 @@ printf '%s\n' "$acl_cv_libdirstems" >&6; }
 
 
 
@@ -12,10 +12,10 @@ index 2a376c6..a984774 100755
 +for configuration_step in gettext-independent gettext-main ; do
 +case "$configuration_step" in
 +gettext-main)
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+     { 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}
-@@ -23288,6 +23294,9 @@ printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h
+@@ -26156,6 +26162,9 @@ printf '%s\n' "#define HAVE_DCGETTEXT 1" >>confdefs.h
 
 
 
@@ -25,7 +25,7 @@ index 2a376c6..a984774 100755
                          # Check whether --enable-cross-guesses was given.
  if test ${enable_cross_guesses+y}
  then :
-@@ -30464,6 +30473,10 @@ printf "%s\n" "$gl_cv_next_iconv_h" >&6; }
+@@ -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
@@ -37,10 +37,10 @@ index 2a376c6..a984774 100755
 
 
 diff --git a/gettext-tools/configure b/gettext-tools/configure
-index 5ce6cf1..ee64b69 100755
+index 049d8fe..cce0097 100755
 --- a/gettext-tools/configure
 +++ b/gettext-tools/configure
-@@ -25735,6 +25735,12 @@ printf "%s\n" "$acl_cv_libdirstems" >&6; }
+@@ -28963,6 +28963,12 @@ printf '%s\n' "$acl_cv_libdirstems" >&6; }
 
 
 
@@ -50,10 +50,10 @@ index 5ce6cf1..ee64b69 100755
 +for configuration_step in gettext-independent gettext-main; do
 +case "$configuration_step" in
 +gettext-main)
-     { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+     { 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}
-@@ -27588,6 +27594,9 @@ fi
+@@ -30870,6 +30876,9 @@ fi
 
 
 
@@ -63,7 +63,7 @@ index 5ce6cf1..ee64b69 100755
                          # Check whether --enable-cross-guesses was given.
  if test ${enable_cross_guesses+y}
  then :
-@@ -38458,6 +38467,10 @@ printf "%s\n" "$gl_cv_next_iconv_h" >&6; }
+@@ -44473,6 +44482,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

ports/gettext/portfile.cmake

@@ -12,41 +12,52 @@
 set(VCPKG_BUILD_TYPE release)
 set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
 
+# gettext hates msys2. Turn off msys2 heurisics for command line arguments.
+set(ENV{MSYS2_ARG_CONV_EXCL} "*")
+include("${CURRENT_PORT_DIR}/vcpkg_make.cmake")
+include("${CURRENT_PORT_DIR}/vcpkg_make_common.cmake")
+
 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 d8b22d7fba10052a2045f477f0a5b684d932513bdb3b295c22fbd9dfc2a9d8fccd9aefd90692136c62897149aa2f7d1145ce6618aa1f0be787cb88eba5bc09be
+    URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${VERSION}.tar.xz"
+         "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${VERSION}.tar.xz"
+    FILENAME "gettext-${VERSION}.tar.xz"
+    SHA512 544e41c9390695df1c21542842e9ca027a03cb7d4045d8cd759dec1a3dfb624aae900751b458bdb31d6454b37c40c474a952059b884555a03c7c95d6d0e687b1
 )
 
 vcpkg_extract_source_archive(SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     PATCHES
-        assume-modern-darwin.patch
-        uwp.patch
+        # assume-modern-darwin.patch
+        # uwp.patch
         rel_path.patch
         subdirs.patch
-        parallel-gettext-tools.patch
+        # parallel-gettext-tools.patch
         config-step-order.patch
-        0001-xgettext-Fix-some-test-failures-on-MSVC.patch
+        # 0001-xgettext-Fix-some-test-failures-on-MSVC.patch
 )
 
+macro(execute_process)
+    _execute_process(TIMEOUT 1800 ${ARGN})
+endmacro()
+
 set(subdirs "")
 if("runtime-tools" IN_LIST FEATURES)
-    string(APPEND subdirs " gettext-runtime")
+    list(APPEND subdirs "gettext-runtime")
 endif()
 if("tools" IN_LIST FEATURES)
-    string(APPEND subdirs " libtextstyle gettext-tools")
+    list(APPEND subdirs "libtextstyle" "gettext-tools")
 endif()
 if(subdirs)
-    set(ENV{VCPKG_GETTEXT_SUBDIRS} "${subdirs}")
+    list(JOIN subdirs " " subdirs_string)
+    set(ENV{VCPKG_GETTEXT_SUBDIRS} "${subdirs_string}")
 
     vcpkg_find_acquire_program(BISON)
     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)
+elseif(0)
         message(STATUS "Modifying build system for less forks")
         set(ENV{CONFIG_SHELL} "/usr/bin/bash")
         vcpkg_execute_required_process(
@@ -64,7 +75,9 @@ if(subdirs)
         --disable-acl
         --disable-csharp
         --disable-curses
+        --disable-d
         --disable-java
+        --disable-modula2
         --disable-openmp
         --disable-dependency-tracking
         # Avoiding system dependencies and unnecessary tests
@@ -77,16 +90,17 @@ if(subdirs)
         --without-git
         --without-libcurses-prefix
         --without-libncurses-prefix
+        --without-selinux
         --without-libtermcap-prefix
         --without-libxcurses-prefix
         "INTLBISON=${BISON_NAME}"
         "TOOLS_BISON=${BISON_NAME}"
     )
 
     if("nls" IN_LIST FEATURES)
-        vcpkg_list(APPEND options "--enable-nls")
+        vcpkg_list(APPEND OPTIONS "--enable-nls")
     else()
-        vcpkg_list(APPEND options "--disable-nls")
+        vcpkg_list(APPEND OPTIONS "--disable-nls")
     endif()
 
     if(VCPKG_TARGET_IS_LINUX)
@@ -139,22 +153,37 @@ if(subdirs)
         endif()
     endif()
 
+set(msys_require_packages gzip)
     file(REMOVE "${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-rel.log")
-    vcpkg_configure_make(SOURCE_PATH "${SOURCE_PATH}"
-        DETERMINE_BUILD_TRIPLET
-        USE_WRAPPERS
-        ADDITIONAL_MSYS_PACKAGES gzip
+    vcpkg_make_configure(SOURCE_PATH "${SOURCE_PATH}"
+        #[[ADDITIONAL_MSYS_PACKAGES gzip]]
         OPTIONS
             ${OPTIONS}
         OPTIONS_RELEASE
             "--cache-file=${CURRENT_BUILDTREES_DIR}/config.cache-${TARGET_TRIPLET}-rel.log"
     )
 
+    foreach(subdir IN LISTS subdirs)
+        file(COPY_FILE
+            "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${subdir}/config.log"
+            "${CURRENT_BUILDTREES_DIR}/config-${TARGET_TRIPLET}-rel-${subdir}-config.log"
+        )
+    endforeach()
+
+# Considered for fixup in vcpkg-make:
+# https://savannah.gnu.org/support/?111257,
+# isolated in https://github.com/microsoft/vcpkg/pull/45913
+file(GLOB_RECURSE libtool_scripts "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*libtool")
+foreach(script IN LISTS libtool_scripts)
+    vcpkg_replace_string("${script}" "lt_ar_flags=([^\"\n]+)" "lt_ar_flags=\"\\1\"" REGEX IGNORE_UNCHANGED)
+endforeach()
+
     # This helps with Windows build times, but should work everywhere in vcpkg.
     # - 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}*/*Makefile")
+set(makefiles "")
     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}")
@@ -164,7 +193,10 @@ if(subdirs)
         file(WRITE "${file}" "${rules}")
     endforeach()
 
-    vcpkg_install_make()
+    # ... but libtool needs msys2 conversions
+    set(ENV{MSYS2_ARG_CONV_EXCL} "")
+
+    vcpkg_make_install()
     vcpkg_copy_pdbs()
     vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin")
     file(GLOB unix_runtime LIST_DIRECTORIES false
@@ -179,7 +211,8 @@ if(subdirs)
 endif()
 
 if("tools" IN_LIST FEATURES)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/gettext/user-email" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../.." IGNORE_UNCHANGED)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/libexec/gettext/user-email" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../.." IGNORE_UNCHANGED)
+    vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/libexec/gettext")
 else()
     # A fast installation of the autopoint tool and data, needed for autoconfig
     include("${CMAKE_CURRENT_LIST_DIR}/install-autopoint.cmake")
@@ -192,12 +225,13 @@ endif()
 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"
+    "${SOURCE_PATH}/gettext-runtime/m4/glibc2.m4"
     "${SOURCE_PATH}/gettext-runtime/m4/nls.m4"
     "${SOURCE_PATH}/gettext-runtime/m4/po.m4"
     "${SOURCE_PATH}/gettext-runtime/m4/progtest.m4"
     "${SOURCE_PATH}/gettext-runtime/gnulib-m4/host-cpu-c-abi.m4"
+    "${SOURCE_PATH}/gettext-runtime/gnulib-m4/iconv.m4"
+    "${SOURCE_PATH}/gettext-runtime/gnulib-m4/intlmacosx.m4"
     "${SOURCE_PATH}/gettext-runtime/gnulib-m4/lib-ld.m4"
     "${SOURCE_PATH}/gettext-runtime/gnulib-m4/lib-link.m4"
     "${SOURCE_PATH}/gettext-runtime/gnulib-m4/lib-prefix.m4"