summaryrefslogtreecommitdiffstats
path: root/packaging/macosx
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2015-09-17 23:03:43 +0000
committer~suv <suv-sf@users.sourceforge.net>2015-09-17 23:03:43 +0000
commita793fa612e56046d6ae6e89b8596a64916515c0d (patch)
treef53e11c09a4a3ee59c2d96832e86cac2201624e5 /packaging/macosx
parentImprovements to transform by two knots pointed by Ivan Louette (diff)
downloadinkscape-a793fa612e56046d6ae6e89b8596a64916515c0d.tar.gz
inkscape-a793fa612e56046d6ae6e89b8596a64916515c0d.zip
packaging/macosx: fix for bug #1497020 (Inkscape.app (0.91) crashes when attempting to stop defunct spell checker)
(bzr r14376)
Diffstat (limited to 'packaging/macosx')
-rwxr-xr-xpackaging/macosx/osx-app.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh
index ad41e844a..f91a33b0d 100755
--- a/packaging/macosx/osx-app.sh
+++ b/packaging/macosx/osx-app.sh
@@ -252,7 +252,9 @@ if ! pkg-config --exists ImageMagick; then
exit 1
fi
-if [ ! -e "$LIBPREFIX/lib/aspell-0.60/en.dat" ]; then
+# FIXME: retrieve aspell version from installed files (no pkg-config support)
+ASPELL_VERSION="0.60"
+if [ ! -e "$LIBPREFIX/lib/aspell-$ASPELL_VERSION/en.dat" ]; then
echo "Missing aspell en dictionary -- please install at least 'aspell-dict-en', but" >&2
echo "preferably more dictionaries ('aspell-dict-*') and try again." >&2
exit 1
@@ -625,7 +627,8 @@ sed -e "s,IMAGEMAGICKVER,$IMAGEMAGICKVER,g" -i "" "$scrpath"
sed -e "s,IMAGEMAGICKVER_MAJOR,$IMAGEMAGICKVER_MAJOR,g" -i "" "$scrpath"
# Copy aspell dictionary files:
-$cp_cmd -r "$LIBPREFIX/share/aspell" "$pkgresources/share/"
+$cp_cmd -r "$LIBPREFIX/lib/aspell-$ASPELL_VERSION" "$pkglib/"
+$cp_cmd -r "$LIBPREFIX/share/aspell" "$pkgshare/"
# Copy Poppler data:
$cp_cmd -r "$LIBPREFIX/share/poppler" "$pkgshare"