From 737ae68bc6b9c7982b33839ec0d9be29dc2cdbf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de>
Date: Sun, 17 Nov 2024 19:19:25 +0100
Subject: [PATCH] GitHub-CI (macos): Install and use the libiconv package from
 Homebrew (bug #66448).

* .github/workflows/make-macos.yaml (install dependencies): Install the libiconv
package from Homebrew. That is necessary because the Apple implementation of
libiconv is buggy in macOS 14 and no longer accepted by newer versions of
gnulib.
(configure): Use headers and libraries from the libiconv package from Homebrew.
---
 .github/workflows/make-macos.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/make-macos.yaml b/.github/workflows/make-macos.yaml
index 05e0de2932..3952d96fb6 100644
--- a/.github/workflows/make-macos.yaml
+++ b/.github/workflows/make-macos.yaml
@@ -76,7 +76,7 @@ jobs:
           brew install --overwrite python@3.12 python@3.13
           brew reinstall gcc
           brew install arpack epstool fftw fig2dev fltk fontconfig freetype \
-            ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 libsndfile \
+            ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 libiconv libsndfile \
             libtool openblas pcre2 portaudio pstoedit qhull qrupdate \
             qscintilla2 qt@${{ matrix.qt }} rapidjson readline suite-sparse sundials texinfo \
             ccache gnu-sed openjdk pkg-config \
@@ -89,6 +89,7 @@ jobs:
           echo "${HOMEBREW_PREFIX}/opt/texinfo/bin" >> $GITHUB_PATH
           echo "${HOMEBREW_PREFIX}/opt/bison/bin" >> $GITHUB_PATH
           echo "${HOMEBREW_PREFIX}/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
+          echo "${HOMEBREW_PREFIX}/opt/libiconv/bin" >> $GITHUB_PATH
 
       - name: prepare ccache
         # create key with human readable timestamp
@@ -150,9 +151,9 @@ jobs:
           cd .build && ../configure \
             CXX="${CXX} ${{ matrix.cxx-compiler-flags }}" \
             F77="ccache gfortran" \
-            CPPFLAGS="-I${HOMEBREW_PREFIX}/opt/gettext/include -I${HOMEBREW_PREFIX}/opt/icu4c/include -I${HOMEBREW_PREFIX}/opt/qt@${{ matrix.qt }}/include -I${HOMEBREW_PREFIX}/opt/readline/include -I${HOMEBREW_PREFIX}/opt/sqlite/include $MY_CPPFLAGS -I${HOMEBREW_PREFIX}/include" \
+            CPPFLAGS="-I${HOMEBREW_PREFIX}/opt/gettext/include -I${HOMEBREW_PREFIX}/opt/icu4c/include -I${HOMEBREW_PREFIX}/opt/libiconv/include -I${HOMEBREW_PREFIX}/opt/qt@${{ matrix.qt }}/include -I${HOMEBREW_PREFIX}/opt/readline/include -I${HOMEBREW_PREFIX}/opt/sqlite/include $MY_CPPFLAGS -I${HOMEBREW_PREFIX}/include" \
             CXXFLAGS="-O2 -g" \
-            LDFLAGS="-L${HOMEBREW_PREFIX}/opt/bison/lib -L${HOMEBREW_PREFIX}/opt/gettext/lib -L${HOMEBREW_PREFIX}/opt/icu4c/lib -L${HOMEBREW_PREFIX}/opt/readline/lib -L${HOMEBREW_PREFIX}/opt/sqlite/lib $MY_LDFLAGS -L${HOMEBREW_PREFIX}/lib" \
+            LDFLAGS="-L${HOMEBREW_PREFIX}/opt/bison/lib -L${HOMEBREW_PREFIX}/opt/gettext/lib -L${HOMEBREW_PREFIX}/opt/icu4c/lib -L${HOMEBREW_PREFIX}/opt/libiconv/lib -L${HOMEBREW_PREFIX}/opt/readline/lib -L${HOMEBREW_PREFIX}/opt/sqlite/lib $MY_LDFLAGS -L${HOMEBREW_PREFIX}/lib" \
             PKG_CONFIG_PATH="${HOMEBREW_PREFIX}/opt/openblas/lib/pkgconfig:${HOMEBREW_PREFIX}/opt/icu4c/lib/pkgconfig:${HOMEBREW_PREFIX}/${{ matrix.qt-pkg-config-path }}" \
             --with-qt=${{ matrix.qt }} \
             QCOLLECTIONGENERATOR="qhelpgenerator" \