diff options
| author | mjwybrow <mjwybrow@users.sourceforge.net> | 2009-09-08 01:59:06 +0000 |
|---|---|---|
| committer | mjwybrow <mjwybrow@users.sourceforge.net> | 2009-09-08 01:59:06 +0000 |
| commit | 01d4084c3d83e5cbe8adc0813448ae45436ea2dd (patch) | |
| tree | e4dba6ee5810baecb4f2bbb7eb90a1ab721f7b9b /packaging/macosx/Resources | |
| parent | Chinese (zh_CN), Breton and French translation update. (diff) | |
| download | inkscape-01d4084c3d83e5cbe8adc0813448ae45436ea2dd.tar.gz inkscape-01d4084c3d83e5cbe8adc0813448ae45436ea2dd.zip | |
- Fix bug #390024: "raster image extensions fail on osx: missing ImageMagick
config files/resources" Include the ImageMagick resources in the bundle.
Note that this only works when the user does not have a version installed
in the same prefix as the one originally built for the bundle. This should
be okay since the official package is built with a long obscure prefix.
- Fix bug #392693: "Conflict between bundled and system libxml dylib"
The official package no longer uses the DYLD_LIBRARY_PATH magic. Instead
all paths within the dylibs, executable and shared objects get rewritten
to be relative to the executable. Note: Packagers will need to install
Macports into a PREFIX of 50 characters in length to allow enough space
within all the libraries for path rewriting.
(bzr r8572)
Diffstat (limited to 'packaging/macosx/Resources')
| -rwxr-xr-x | packaging/macosx/Resources/bin/inkscape | 13 | ||||
| -rwxr-xr-x | packaging/macosx/Resources/script | 11 |
2 files changed, 15 insertions, 9 deletions
diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index a085ca498..f36865117 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -29,7 +29,8 @@ PYTHON_VERS=`python -V 2>&1 | cut -c 8-10` export PYTHONPATH="$TOP/python/site-packages/$ARCH/$PYTHON_VERS" # NB: we are only preprending some stuff to the default python path so if the directory does not exist it should not harm the rest -export DYLD_LIBRARY_PATH="$TOP/lib" +# No longer required if path rewriting has been conducted. +# export DYLD_LIBRARY_PATH="$TOP/lib" export FONTCONFIG_PATH="$TOP/etc/fonts" @@ -43,6 +44,16 @@ export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules" export XDG_DATA_DIRS="$TOP/share" export ASPELL_CONF="prefix $TOP;" +# Note: This requires the path with the exact ImageMagic version number. +# FIXME: Make the osx-app.sh script write the version into this file when +# building the package. Note, that ImageMagick will only work if +# it does not find a version installed into the same PREFIX as it +# was originally installed. Luckily, this is very unlikely given +# the extra long and strangely named install prefix we use. +export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-6.5.5/config:$TOP/share/ImageMagick-6.5.5/config" +export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-6.5.5/modules-Q16/filters" +export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-6.5.5/modules-Q16/coders" + export INKSCAPE_SHAREDIR="$TOP" # TODO: move the share directory to a its own folder to make things a bit cleaner in the app bundle export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape" diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script index c58361d86..f0fe88efe 100755 --- a/packaging/macosx/Resources/script +++ b/packaging/macosx/Resources/script @@ -37,15 +37,10 @@ if [[ $VERSION -le 4 ]]; then export DISPLAY=`cat /tmp/display.$UID` ps -wx -ocommand | grep -e '[X]11' > /dev/null || exit 11 - - # Warn the user about time-consuming generation of fontconfig caches. - test -f "${HOME}/.inkscape/.fccache-new" || exit 12 -else - # Leopard onwards... - - # Warn the user about time-consuming generation of fontconfig caches. - test -d "${HOME}/.fontconfig" || exit 12 fi + +# Warn the user about time-consuming generation of fontconfig caches. +test -f "${HOME}/.inkscape/.fccache-new" || exit 12 |