diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2d23497fa..997fde164 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,13 +8,14 @@ permissions: jobs: macos_build: - # macos-11 and macos-12 are broken at this time being. + # macos-11, macos-12 & macos-13 are broken at this time being. # https://github.com/koreader/koreader/issues/8686, # https://github.com/koreader/koreader/issues/8686#issuecomment-1172950236 # Please don't update to newer macOS version unless you can test that the new # action produces working binaries. - runs-on: macos-10.15 + # 10.15 is no longer supported so we are running 13 just to make sure the build does not break. + runs-on: macos-13 steps: - name: XCode version diff --git a/platform/mac/do_mac_bundle.sh b/platform/mac/do_mac_bundle.sh index 6c04d89fe..d0d36dfef 100755 --- a/platform/mac/do_mac_bundle.sh +++ b/platform/mac/do_mac_bundle.sh @@ -146,14 +146,16 @@ done # 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 +cp "${BREW}/gettext/lib/libintl.8.dylib" "${BREW}/webp/lib/libwebp.7.dylib" "${BREW}/webp/lib/libsharpyuv.0.dylib" "${BREW}/libsodium/lib/libsodium.23.dylib" libs +chmod 777 libs/libintl.8.dylib libs/libwebp.7.dylib libs/libsharpyuv.0.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 libsharpyuv.0.dylib libs/libsharpyuv.0.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/libsharpyuv.0.dylib" libs/libsharpyuv.0.dylib libs/libwebp.7.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