macOS: Comment the brew shenanigans (#7013)

* Comment the brew shenanigans
  (And support non-standard brew prefixes, just in case)
* Bump base to pickup https://github.com/koreader/koreader-base/pull/1260
* Handle libsodium, too
Co-authored-by: Martín Fernández <paziusss@gmail.com>

base

@@ -1 +1 @@
-Subproject commit b00f7f1370ec48cd0fb20f662d9974f817aeb6a4
+Subproject commit 59a97a56fdfccda7fc6df7aee581f721d92b296e

platform/mac/do_mac_bundle.sh

@@ -143,14 +143,23 @@ for dir in common libs; do
     popd || exit 1
 done
 
-BREW=/usr/local/opt
-cp "${BREW}/gettext/lib/libintl.8.dylib" "${BREW}/webp/lib/libwebp.7.dylib" libs
-chmod 777 libs/libintl.8.dylib libs/libwebp.7.dylib
+# Brew has a tendency to infiltrate our builds and take over some of the dependencies...
+BREW="$(brew --prefix)/opt"
+# So, because it made us pick those up, ship 'em
+cp "${BREW}/gettext/lib/libintl.8.dylib" "${BREW}/webp/lib/libwebp.7.dylib" "${BREW}/libsodium/lib/libsodium.23.dylib" libs
+chmod 777 libs/libintl.8.dylib libs/libwebp.7.dylib libs/libsodium.23.dylib
+# Update their name
 install_name_tool -id libintl.8.dylib libs/libintl.8.dylib
 install_name_tool -id libwebp.7.dylib libs/libwebp.7.dylib
+install_name_tool -id libsodium.23.dylib libs/libsodium.23.dylib
+# And make sure anything that depends on them points to ours
 install_name_tool -change ${BREW}/gettext/lib/libintl.8.dylib libs/libintl.8.dylib libs/libglib-2.0.dylib
 install_name_tool -change ${BREW}/webp/lib/libwebp.7.dylib libs/libwebp.7.dylib libs/liblept.5.dylib
 install_name_tool -change ${BREW}/webp/lib/libwebp.7.dylib libs/libwebp.7.dylib libs/libtesseract.3.dylib
+install_name_tool -change ${BREW}/libsodium/lib/libsodium.23.dylib libs/libsodium.23.dylib libs/libczmq.1.dylib
+install_name_tool -change ${BREW}/libsodium/lib/libsodium.23.dylib libs/libsodium.23.dylib libs/libfmq.1.dylib
+install_name_tool -change ${BREW}/libsodium/lib/libsodium.23.dylib libs/libsodium.23.dylib libs/libzmq.4.dylib
+install_name_tool -change ${BREW}/libsodium/lib/libsodium.23.dylib libs/libsodium.23.dylib libs/libzyre.1.dylib
 
 # prepare bundle for distribution
 ln -s /usr/bin/tar tar