Merge pull request #1 from jamesbannan/jamesbannan/macos-enchant-applespell-only

macOS: bundle only the enchant applespell backend

Author: markiehill

.github/workflows/build-mac.yml

@@ -170,16 +170,22 @@ jobs:
           # the enchant backend plugins are dlopen-ed at runtime, so Mach-O
           # dependency analysis never sees them. Without this the shipped app
           # has an empty dictionary list (see issue #2705). We add libenchant
-          # and its backends from Homebrew, keeping the lib/ + lib/enchant-2/
-          # sibling layout that relocatable enchant-2 uses to find backends.
-          # The macOS applespell backend is what exposes the OS dictionaries.
+          # and the applespell backend from Homebrew, keeping the lib/ +
+          # lib/enchant-2/ sibling layout that relocatable enchant-2 uses to
+          # find backends. The applespell backend delegates to the macOS
+          # system spell checker (NSSpellChecker), so it exposes the OS
+          # dictionaries with no bundled dictionary data. The aspell backend
+          # is deliberately NOT bundled: its word-list data is not shipped, so
+          # on a clean Mac it would register zero dictionaries while dragging
+          # in libaspell — dead weight with no benefit over applespell.
           # brew --prefix is arch-agnostic (/opt/homebrew or /usr/local).
           ENCHANT_PREFIX="$(brew --prefix enchant)"
           LIBENCHANT="$(ls "$ENCHANT_PREFIX"/lib/libenchant-2.*.dylib | head -n1)"
+          APPLESPELL="$ENCHANT_PREFIX/lib/enchant-2/enchant_applespell.so"
+          test -f "$APPLESPELL" \
+            || { echo "ERROR: enchant applespell backend not found at $APPLESPELL"; exit 1; }
           EXTRA+=(--add-binary "$LIBENCHANT:lib")
-          for so in "$ENCHANT_PREFIX"/lib/enchant-2/*.so; do
-            EXTRA+=(--add-binary "$so:lib/enchant-2")
-          done
+          EXTRA+=(--add-binary "$APPLESPELL:lib/enchant-2")
           # Runtime hook points pyenchant at the bundled libenchant (via
           # PYENCHANT_LIBRARY_PATH) before novelWriter lazily imports enchant.
           EXTRA+=(--runtime-hook setup/macos/pyinstaller_rthook_enchant.py)
@@ -235,12 +241,13 @@ jobs:
           test -n "$(find "$APP_FW/assets/icons" -name '*.icons' 2>/dev/null)" \
             || { echo "ERROR: icon themes not bundled"; exit 1; }
           # Guard against silently shipping a spell checker with no backend
-          # (the empty-dropdown regression from #2705). libenchant and at
-          # least one enchant-2 backend plugin must be present.
+          # (the empty-dropdown regression from #2705). libenchant and the
+          # applespell backend (which exposes the OS dictionaries) must both
+          # be present.
           test -n "$(ls "$APP_FW"/lib/libenchant-2.*.dylib 2>/dev/null)" \
             || { echo "ERROR: libenchant not bundled"; exit 1; }
-          test -n "$(find "$APP_FW/lib/enchant-2" -name '*.so' 2>/dev/null)" \
-            || { echo "ERROR: enchant backend plugins not bundled"; exit 1; }
+          test -f "$APP_FW/lib/enchant-2/enchant_applespell.so" \
+            || { echo "ERROR: enchant applespell backend not bundled"; exit 1; }
           plutil -extract CFBundleIdentifier raw dist/novelWriter.app/Contents/Info.plist
           plutil -extract CFBundleShortVersionString raw dist/novelWriter.app/Contents/Info.plist