diff options
| -rwxr-xr-x | packaging/macosx/Resources/bin/inkscape | 22 | ||||
| -rwxr-xr-x | packaging/macosx/osx-app.sh | 32 |
2 files changed, 27 insertions, 27 deletions
diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 3ba4672fe..775f94e5c 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -71,17 +71,11 @@ fi PYTHON_VERS="$(python -V 2>&1 | cut -c 8-10)" export PYTHONPATH="$TOP/lib/python$PYTHON_VERS/site-packages/" -# fallback for missing $INK_CACHE_DIR -if [ -z "$INK_CACHE_DIR" ]; then - INK_CACHE_DIR="${HOME}/.cache/inkscape" - mkdir -p "$INK_CACHE_DIR" - [ $_DEBUG ] && echo "INK_CACHE_DIR: falling back to $INK_CACHE_DIR" -fi - export FONTCONFIG_PATH="$TOP/etc/fonts" -export PANGO_RC_FILE="${INK_CACHE_DIR}/pangorc" -export GTK_IM_MODULE_FILE="${INK_CACHE_DIR}/immodules.cache" -export GDK_PIXBUF_MODULE_FILE="${INK_CACHE_DIR}/loaders.cache" +export PANGO_RC_FILE="$TOP/etc/pango/pangorc" +export PANGO_SYSCONFDIR="$TOP/etc" +export GTK_IM_MODULE_FILE="$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache" +export GDK_PIXBUF_MODULE_FILE="$TOP/lib/gdk-pixbuf-2.0/__gtk_version__/loaders.cache" export GTK_DATA_PREFIX="$TOP" export GTK_EXE_PREFIX="$TOP" export GTK_PATH="$TOP" @@ -153,14 +147,6 @@ fi [ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2 export LC_ALL="$LANG" -sed 's|${INK_CACHE_DIR}|'"$INK_CACHE_DIR|g" "$TOP/etc/pango/pangorc" > "${INK_CACHE_DIR}/pangorc" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ - > "${INK_CACHE_DIR}/pango.modules" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache" \ - > "${INK_CACHE_DIR}/immodules.cache" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gdk-pixbuf-2.0/__gdk_pixbuf_version__/loaders.cache" \ - > "${INK_CACHE_DIR}/loaders.cache" - case "$INK_DEBUG" in gdb) EXEC="gdb --args" ;; diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index e35448f19..753ae64bc 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -511,13 +511,7 @@ echo "APPLInks" > $package/Contents/PkgInfo # Pull in extra requirements for Pango and GTK mkdir -p $pkgetc/pango - -# Need to adjust path and quote in case of spaces in path. -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=\${INK_CACHE_DIR}/pango.modules -END_PANGO +touch "$pkgetc/pango/pangorc" # We use a modified fonts.conf file so only need the dtd mkdir -p $pkgshare/xml/fontconfig @@ -543,8 +537,28 @@ $cp_cmd $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/*.so $pkglib/g sed -e "s,__gtk_version__,$gtk_version,g" -i "" "$scrpath" sed -e "s,__gdk_pixbuf_version__,$gdk_pixbuf_version,g" -i "" "$scrpath" -sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gtk-2.0/$gtk_version/immodules.cache > $pkglib/gtk-2.0/$gtk_version/immodules.cache -sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders.cache > $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders.cache +#sed -e "s,$LIBPREFIX,@loader_path/..,g" "$LIBPREFIX/etc/pango/pango.modules" > "$pkgetc/pango/pango.modules" +#sed -e "s,$LIBPREFIX,@loader_path/..,g" "$LIBPREFIX/lib/gtk-2.0/$gtk_version/immodules.cache" > "$pkglib/gtk-2.0/$gtk_version/immodules.cache" +#sed -e "s,$LIBPREFIX,@loader_path/..,g" "$LIBPREFIX/lib/gdk-pixbuf-2.0/$gtk_version/loaders.cache" > "$pkglib/gdk-pixbuf-2.0/$gtk_version/loaders.cache" + +# recreate loaders and modules caches based on actually included modules + +# Pango modules +pango-querymodules "$pkglib/pango/$pango_version"/modules/*.so \ + | sed -e "s,$PWD/$pkgresources,@loader_path/..,g" \ + > "$pkgetc"/pango/pango.modules + +# Gtk immodules +gtk-query-immodules-2.0 "$pkglib/gtk-2.0/$gtk_version"/immodules/*.so \ + | sed -e "s,$PWD/$pkgresources,@loader_path/..,g" \ + > "$pkglib/gtk-2.0/$gtk_version/"immodules.cache + +# Gdk pixbuf loaders +GDK_PIXBUF_MODULEDIR="$pkglib/gdk-pixbuf-2.0/$gtk_version/"loaders gdk-pixbuf-query-loaders \ + | sed -e "s,$pkgresources,@loader_path/..,g" > "$pkglib/gdk-pixbuf-2.0/$gtk_version/"loaders.cache + +# GIO modules +#gio-querymodules "$pkglib/gio/modules" # Gnome-vfs modules (deprecated, optional in inkscape) if [ $WITH_GNOME_VFS ] ; then |