Add iconv dependency to gettext

Author: ychin

.github/actions/universal-package/action.yml

@@ -31,10 +31,15 @@ runs:
         # version and stomp what we have here.
         brew update
 
-        # Patch the official Homebrew formula to explicitly build for min deployment target and a universal binary. We
-        # also need to explicitly use system Clang because Homebrew's bundled clang script tries to inject -march
+        # Patch the official Homebrew formula to explicitly build for min deployment target and a universal binary.
+        #
+        # We also need to explicitly use system Clang because Homebrew's bundled clang script tries to inject -march
         # compiler flags that will cause universal builds to fail as Clang does not like that.
+        #
+        # We also manually depend on GNU libiconv as Apple iconv is broken since macOS 14. This is necessary as MacVim
+        # itself it built against it and we need both to match.
         brew cat ${formula} | \
+          sed '/^[[:blank:]]*def install$/i\'$'\n  depends_on "libiconv"\n' | \
           sed '/^[[:blank:]]*def install$/a\'$'\n    ENV["MACOSX_DEPLOYMENT_TARGET"] = "'${MACOSX_DEPLOYMENT_TARGET}$'"\n' | \
           sed '/^[[:blank:]]*def install$/a\'$'\n    ENV["CC"] = "/usr/bin/clang"\n' | \
           sed '/^[[:blank:]]*def install$/a\'$'\n    ENV["CFLAGS"] = "-arch x86_64 -arch arm64"\n' | \

.github/workflows/macvim-buildtest.yaml

@@ -111,7 +111,8 @@ jobs:
 
       - name: Install packages
         run: |
-          brew install --quiet libtool
+          # GNU iconv is installed to work around broken Apple iconv
+          brew install --quiet libtool libiconv
 
       - name: Install packages for testing
         run: |

ci/config.mk.brew-libiconv.sed

@@ -1,5 +1,6 @@
-# Use Homebrew libiconv to work around broken Apple version. Use static linking
-# as we don't want our binary releases to pull in third-party dependencies.
+# Use Homebrew GNU libiconv to work around broken Apple version. Use static
+# linking as we don't want our binary releases to pull in third-party
+# dependencies.
 #
 # If gettext is configured in the build, this only works libintl is also built
 # against Homebrew libiconv (which is not the default in Homebrew).