From 283490965cfabc61eae0d9186dd87766e104b0cb Mon Sep 17 00:00:00 2001
From: John Ralls <jralls@ceridwen.us>
Date: Tue, 18 Oct 2022 14:23:45 -0700
Subject: [PATCH] Update macOS dependencies tarball to support AQBanking
 version update.

---
 .github/workflows/mac-tests.yaml              |  2 +-
 util/ci/macos-ci-deps/macos_bin.manifest      |  4 +-
 util/ci/macos-ci-deps/macos_include.manifest  |  3 +-
 util/ci/macos-ci-deps/macos_lib.manifest      | 75 +++++++++----------
 util/ci/macos-ci-deps/macos_share.manifest    |  5 +-
 .../macos-ci-deps/make-macos-deps-tarball.sh  |  1 +
 6 files changed, 41 insertions(+), 49 deletions(-)

diff --git a/.github/workflows/mac-tests.yaml b/.github/workflows/mac-tests.yaml
index b61e252296..069d97e272 100644
--- a/.github/workflows/mac-tests.yaml
+++ b/.github/workflows/mac-tests.yaml
@@ -18,7 +18,7 @@ jobs:
       uses: carlosperate/download-file-action@v1.0.3
       id: dependencies
       with:
-        file-url: 'https://downloads.sourceforge.net/gnucash/Dependencies/gnucash-4.x-mac-dependencies.tar.xz'
+        file-url: 'https://downloads.sourceforge.net/gnucash/Dependencies/gnucash-4.900-mac-dependencies.tar.xz'
         file-name: gnucash-dependencies.tar.xz
     - name: download googletest
       uses: carlosperate/download-file-action@v1.0.3
diff --git a/util/ci/macos-ci-deps/macos_bin.manifest b/util/ci/macos-ci-deps/macos_bin.manifest
index 519b6cb902..d088375b58 100644
--- a/util/ci/macos-ci-deps/macos_bin.manifest
+++ b/util/ci/macos-ci-deps/macos_bin.manifest
@@ -22,7 +22,7 @@ ninja
 pkg-config
 python3
 python3-config
-python3.8
-python3.8-config
+python3.10
+python3.10-config
 swig
 xgettext
diff --git a/util/ci/macos-ci-deps/macos_include.manifest b/util/ci/macos-ci-deps/macos_include.manifest
index b02a3703e0..0ef9d4db44 100644
--- a/util/ci/macos-ci-deps/macos_include.manifest
+++ b/util/ci/macos-ci-deps/macos_include.manifest
@@ -24,8 +24,7 @@ lzma
 lzma.h
 pango-1.0
 pixman-1
-pygobject-3.0
-python3.8
+python3.10
 unicase.h
 unicode
 uniconv.h
diff --git a/util/ci/macos-ci-deps/macos_lib.manifest b/util/ci/macos-ci-deps/macos_lib.manifest
index 4acba4961c..396063d2fd 100644
--- a/util/ci/macos-ci-deps/macos_lib.manifest
+++ b/util/ci/macos-ci-deps/macos_lib.manifest
@@ -24,11 +24,9 @@ libchipcard.6.dylib
 libchipcard.dylib
 libcord.1.dylib
 libcord.dylib
-libcroco-0.6.3.dylib
-libcroco-0.6.dylib
 libcrypto.1.1.dylib
 libcrypto.dylib
-libdbi.1.dylib
+libdbi.3.dylib
 libdbi.dylib
 libecpg.6.12.dylib
 libecpg.6.dylib
@@ -36,21 +34,17 @@ libecpg.dylib
 libecpg_compat.3.12.dylib
 libecpg_compat.3.dylib
 libecpg_compat.dylib
-libenchant.1.dylib
-libenchant.dylib
+libenchant-2.2.dylib
+libenchant-2.dylib
 libepoxy.0.dylib
 libepoxy.dylib
 libexslt.0.dylib
 libexslt.dylib
 libffi.7.dylib
 libffi.dylib
-libfl.2.dylib
-libfl.dylib
-libfl_pic.2.dylib
-libfl_pic.dylib
 libfontconfig.1.dylib
 libfontconfig.dylib
-libfreetype.6.17.2.dylib
+libfreetype.6.18.1.dylib
 libfreetype.6.dylib
 libfreetype.dylib
 libfribidi.0.dylib
@@ -65,11 +59,11 @@ libgdk-3.0.dylib
 libgdk-3.dylib
 libgdk_pixbuf-2.0.0.dylib
 libgdk_pixbuf-2.0.dylib
-libgettextlib-0.20.2.dylib
+libgettextlib-0.21.dylib
 libgettextlib.dylib
 libgettextpo.0.dylib
 libgettextpo.dylib
-libgettextsrc-0.20.2.dylib
+libgettextsrc-0.21.dylib
 libgettextsrc.dylib
 libgio-2.0.0.dylib
 libgio-2.0.dylib
@@ -83,7 +77,7 @@ libgmp.10.dylib
 libgmp.dylib
 libgnutls.30.dylib
 libgnutls.dylib
-libgnutlsxx.28.dylib
+libgnutlsxx.30.dylib
 libgnutlsxx.dylib
 libgobject-2.0.0.dylib
 libgobject-2.0.dylib
@@ -93,7 +87,7 @@ libgthread-2.0.0.dylib
 libgthread-2.0.dylib
 libgtk-3.0.dylib
 libgtk-3.dylib
-libgtkmacintegration-gtk3.2.dylib
+libgtkmacintegration-gtk3.4.dylib
 libgtkmacintegration-gtk3.dylib
 libguile-2.2.1.dylib
 libguile-2.2.dylib
@@ -111,33 +105,33 @@ libharfbuzz-subset.0.dylib
 libharfbuzz-subset.dylib
 libharfbuzz.0.dylib
 libharfbuzz.dylib
-libhistory.8.0.dylib
+libhistory.8.1.dylib
 libhistory.8.dylib
 libhistory.dylib
-libhogweed.5.0.dylib
-libhogweed.5.dylib
+libhogweed.6.3.dylib
+libhogweed.6.dylib
 libhogweed.dylib
-libicudata.66.1.dylib
-libicudata.66.dylib
+libicudata.68.2.dylib
+libicudata.68.dylib
 libicudata.dylib
-libicui18n.66.1.dylib
-libicui18n.66.dylib
+libicui18n.68.2.dylib
+libicui18n.68.dylib
 libicui18n.dylib
-libicuio.66.1.dylib
-libicuio.66.dylib
+libicuio.68.2.dylib
+libicuio.68.dylib
 libicuio.dylib
-libicutest.66.1.dylib
-libicutest.66.dylib
+libicutest.68.2.dylib
+libicutest.68.dylib
 libicutest.dylib
-libicutu.66.1.dylib
-libicutu.66.dylib
+libicutu.68.2.dylib
+libicutu.68.dylib
 libicutu.dylib
-libicuuc.66.1.dylib
-libicuuc.66.dylib
+libicuuc.68.2.dylib
+libicuuc.68.dylib
 libicuuc.dylib
 libintl.8.dylib
 libintl.dylib
-libjavascriptcoregtk-4.0.18.17.10.dylib
+libjavascriptcoregtk-4.0.18.18.4.dylib
 libjavascriptcoregtk-4.0.18.dylib
 libjavascriptcoregtk-4.0.dylib
 libjpeg.9.dylib
@@ -146,10 +140,8 @@ libltdl.7.dylib
 libltdl.dylib
 liblzma.5.dylib
 liblzma.dylib
-libmysqlclient.18.dylib
-libmysqlclient.dylib
-libnettle.7.0.dylib
-libnettle.7.dylib
+libnettle.8.3.dylib
+libnettle.8.dylib
 libnettle.dylib
 libofx.7.dylib
 libofx.dylib
@@ -181,8 +173,8 @@ libpq.5.dylib
 libpq.dylib
 libpsl.5.dylib
 libpsl.dylib
-libpython3.8.dylib
-libreadline.8.0.dylib
+libpython3.10.dylib
+libreadline.8.1.dylib
 libreadline.8.dylib
 libreadline.dylib
 librsvg-2.2.dylib
@@ -205,9 +197,9 @@ libtiffxx.5.dylib
 libtiffxx.dylib
 libunistring.2.dylib
 libunistring.dylib
-libvala-0.36.0.dylib
-libvala-0.36.dylib
-libwebkit2gtk-4.0.37.49.6.dylib
+libvala-0.52.0.dylib
+libvala-0.52.dylib
+libwebkit2gtk-4.0.37.53.1.dylib
 libwebkit2gtk-4.0.37.dylib
 libwebkit2gtk-4.0.dylib
 libwebp.7.dylib
@@ -230,8 +222,9 @@ libxmlsec1.1.dylib
 libxmlsec1.dylib
 libxslt.1.dylib
 libxslt.dylib
-libz.1.2.11.dylib
+libz.1.2.13.dylib
 libz.1.dylib
 libz.dylib
+mariadb
 pkgconfig
-python3.8
+python3.10
diff --git a/util/ci/macos-ci-deps/macos_share.manifest b/util/ci/macos-ci-deps/macos_share.manifest
index cde5ea6d8d..6adc6f6225 100644
--- a/util/ci/macos-ci-deps/macos_share.manifest
+++ b/util/ci/macos-ci-deps/macos_share.manifest
@@ -1,7 +1,6 @@
-cmake
-cmake-3.17
+cmake-3.20
 gettext
-gettext-0.20.2
+gettext-0.21
 guile
 itstool
 pkgconfig
diff --git a/util/ci/macos-ci-deps/make-macos-deps-tarball.sh b/util/ci/macos-ci-deps/make-macos-deps-tarball.sh
index 3416a1fd97..5736d0d554 100755
--- a/util/ci/macos-ci-deps/make-macos-deps-tarball.sh
+++ b/util/ci/macos-ci-deps/make-macos-deps-tarball.sh
@@ -12,6 +12,7 @@ jhbuild build
 
 cd /Users/runner/gnucash
 mv inst arch
+cp $(which ninja) arch/bin/
 mkdir inst
 for i in 'bin' 'include' 'lib' 'share'; do
     j="$DIR/util/ci/macos-ci-deps/macos_$i.manifest"