diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2014-08-20 11:46:30 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2014-08-20 11:46:30 +0000 |
| commit | 6f9d4072f2b664ca790428ea1ce0b349f3eb4544 (patch) | |
| tree | 994510aca2f449e898bbe1c933d3174947f014db | |
| parent | Enable lcms2 support on OS X (diff) | |
| download | inkscape-6f9d4072f2b664ca790428ea1ce0b349f3eb4544.tar.gz inkscape-6f9d4072f2b664ca790428ea1ce0b349f3eb4544.zip | |
revert PREFDIR changes because ~/.inkscape-etc is still referenced elsewhere.
(bzr r13506.1.20)
| -rwxr-xr-x | packaging/macosx/Resources/bin/inkscape | 17 | ||||
| -rwxr-xr-x | packaging/macosx/osx-app.sh | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index ea52602a2..dd0fa5bae 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -42,13 +42,12 @@ export PYTHONPATH="$TOP/python/site-packages/$ARCH/$PYTHON_VERS" # No longer required if path rewriting has been conducted. # export DYLD_LIBRARY_PATH="$TOP/lib" -PREFDIR="${HOME}/Library/Application Support/org.inkscape.Inkscape/0.91" -mkdir -p "$PREFDIR" +mkdir -p "${HOME}/.inkscape-etc" export FONTCONFIG_PATH="$TOP/etc/fonts" -export PANGO_RC_FILE="$PREFDIR/pangorc" -export GTK_IM_MODULE_FILE="$PREFDIR/gtk.immodules" -export GDK_PIXBUF_MODULE_FILE="$PREFDIR/gdk-pixbuf.loaders" +export PANGO_RC_FILE="${HOME}/.inkscape-etc/pangorc" +export GTK_IM_MODULE_FILE="${HOME}/.inkscape-etc/gtk.immodules" +export GDK_PIXBUF_MODULE_FILE="${HOME}/.inkscape-etc/gdk-pixbuf.loaders" export GTK_DATA_PREFIX="$TOP" export GTK_EXE_PREFIX="$TOP" export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" @@ -116,12 +115,12 @@ fi [ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2 export LC_ALL="$LANG" -sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "$PREFDIR/pangorc" +sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "${HOME}/.inkscape-etc/pangorc" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ - > "$PREFDIR/pango.modules" + > "${HOME}/.inkscape-etc/pango.modules" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gtk.immodules" \ - > "$PREFDIR/gtk.immodules" + > "${HOME}/.inkscape-etc/gtk.immodules" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gdk-pixbuf.loaders" \ - > "$PREFDIR/gdk-pixbuf.loaders" + > "${HOME}/.inkscape-etc/gdk-pixbuf.loaders" exec "$CWD/inkscape-bin" "$@" diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index c3af0f5d2..5254f9934 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -300,7 +300,7 @@ mkdir -p $pkgetc/pango sed -e "s,$LIBPREFIX,\"\${CWD},g" -e 's,\.so ,.so" ,g' $LIBPREFIX/etc/pango/pango.modules > $pkgetc/pango/pango.modules cat > $pkgetc/pango/pangorc <<END_PANGO [Pango] -ModuleFiles=\${HOME}/Library/Application Support/org.inkscape.Inkscape/0.91/pango.modules +ModuleFiles=\${HOME}/.inkscape-etc/pango.modules END_PANGO mkdir -p $pkgetc/fonts |