From 912e0a483c6e4c05bcd10732d4ae57f5c5d19ea2 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 22:19:17 +0100 Subject: [PATCH 1/2] Stick with icu4c 74.2 --- .github/actions/brew/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/brew/action.yml b/.github/actions/brew/action.yml index 51d37aa56d470..cffca4a790f03 100644 --- a/.github/actions/brew/action.yml +++ b/.github/actions/brew/action.yml @@ -33,4 +33,5 @@ runs: libjpeg \ libxslt \ postgresql + brew reinstall icu4c@74 brew link icu4c gettext --force From ce191b75f14fbf9ac7528f099f5f24d470117054 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Wed, 13 Nov 2024 22:32:04 +0100 Subject: [PATCH 2/2] fix --- .github/actions/brew/action.yml | 1 - .github/actions/configure-macos/action.yml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/brew/action.yml b/.github/actions/brew/action.yml index cffca4a790f03..3b36ec446ddca 100644 --- a/.github/actions/brew/action.yml +++ b/.github/actions/brew/action.yml @@ -21,7 +21,6 @@ runs: webp \ freetype \ intltool \ - icu4c \ libiconv \ zlib \ t1lib \ diff --git a/.github/actions/configure-macos/action.yml b/.github/actions/configure-macos/action.yml index 7312ff5d69f19..b21f6466c444c 100644 --- a/.github/actions/configure-macos/action.yml +++ b/.github/actions/configure-macos/action.yml @@ -18,7 +18,7 @@ runs: export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxml2/lib/pkgconfig" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxslt/lib/pkgconfig" export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/zlib/lib/pkgconfig" - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig" + export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c@74/lib/pkgconfig" sed -i -e 's/Requires.private:.*//g' "$BREW_OPT/curl/lib/pkgconfig/libcurl.pc" ./buildconf --force ./configure \