diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2014-08-20 12:22:02 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2014-08-20 12:22:02 +0000 |
| commit | d73bfb898c94b5433068ff5816a347abf090e7dd (patch) | |
| tree | 5140eef89c2ae91d19687892e3b427bd70c2fbc1 | |
| parent | revert PREFDIR changes because ~/.inkscape-etc is still referenced elsewhere. (diff) | |
| download | inkscape-d73bfb898c94b5433068ff5816a347abf090e7dd.tar.gz inkscape-d73bfb898c94b5433068ff5816a347abf090e7dd.zip | |
update name and location of loader caches (upstream changes)
(bzr r13506.1.21)
| -rwxr-xr-x | packaging/macosx/Resources/bin/inkscape | 12 | ||||
| -rwxr-xr-x | packaging/macosx/osx-app.sh | 14 |
2 files changed, 14 insertions, 12 deletions
diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index dd0fa5bae..207a4a8a4 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -46,8 +46,8 @@ mkdir -p "${HOME}/.inkscape-etc" export FONTCONFIG_PATH="$TOP/etc/fonts" 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_IM_MODULE_FILE="${HOME}/.inkscape-etc/immodules.cache" +export GDK_PIXBUF_MODULE_FILE="${HOME}/.inkscape-etc/loaders.cache" export GTK_DATA_PREFIX="$TOP" export GTK_EXE_PREFIX="$TOP" export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" @@ -118,9 +118,9 @@ export LC_ALL="$LANG" sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "${HOME}/.inkscape-etc/pangorc" sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ > "${HOME}/.inkscape-etc/pango.modules" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gtk.immodules" \ - > "${HOME}/.inkscape-etc/gtk.immodules" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gdk-pixbuf.loaders" \ - > "${HOME}/.inkscape-etc/gdk-pixbuf.loaders" +sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache" \ + > "${HOME}/.inkscape-etc/immodules.cache" +sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/lib/gdk-pixbuf-2.0/__gdk_pixbuf_version__/loaders.cache" \ + > "${HOME}/.inkscape-etc/loaders.cache" exec "$CWD/inkscape-bin" "$@" diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 5254f9934..435d5c541 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -327,12 +327,14 @@ cp -r $LIBPREFIX/lib/gtk-2.0/$gtk_version/* $pkglib/gtk-2.0/$gtk_version/ mkdir -p $pkglib/gnome-vfs-2.0/modules cp $LIBPREFIX/lib/gnome-vfs-2.0/modules/*.so $pkglib/gnome-vfs-2.0/modules/ -mkdir -p $pkglib/gdk-pixbuf-2.0/$gtk_version/loaders -cp $LIBPREFIX/lib/gdk-pixbuf-2.0/$gtk_version/loaders/*.so $pkglib/gdk-pixbuf-2.0/$gtk_version/loaders/ - -mkdir -p "$pkgetc/gtk-2.0/" -sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gtk-2.0/$gtk_version/immodules.cache > $pkgetc/gtk-2.0/gtk.immodules -sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/lib/gdk-pixbuf-2.0/$gtk_version/loaders.cache > $pkgetc/gtk-2.0/gdk-pixbuf.loaders +gdk_pixbuf_version=`pkg-config --variable=gdk_pixbuf_binary_version gdk-pixbuf-2.0` +mkdir -p $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders +cp $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/*.so $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/ + +sed -e "s,__gtk_version__,$gtk_version,g" -i "" $pkgbin/inkscape +sed -e "s,__gdk_pixbuf_version__,$gdk_pixbuf_version,g" -i "" $pkgbin/inkscape +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 cp -r "$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER" "$pkglib/" cp -r "$LIBPREFIX/share/ImageMagick-6" "$pkgresources/share/" |