summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2014-08-21 17:18:39 +0000
committer~suv <suv-sf@users.sourceforge.net>2014-08-21 17:18:39 +0000
commit963a90531a042d793f0f2e0fddbe9df0de35bf6d (patch)
tree2ba247408454caef04e4c760c93cc1c1f2804716 /packaging
parentadd custom ports for Inkscape.app (Python 2.6.1 to be used on Leopard and SL,... (diff)
downloadinkscape-963a90531a042d793f0f2e0fddbe9df0de35bf6d.tar.gz
inkscape-963a90531a042d793f0f2e0fddbe9df0de35bf6d.zip
add poppler data to bundle, fix relocation support (see bug #956282)
(bzr r13506.1.40)
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/macosx/Resources/bin/inkscape1
-rwxr-xr-xpackaging/macosx/osx-app.sh3
2 files changed, 4 insertions, 0 deletions
diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape
index b1ff5a85a..dcdeb0aaf 100755
--- a/packaging/macosx/Resources/bin/inkscape
+++ b/packaging/macosx/Resources/bin/inkscape
@@ -63,6 +63,7 @@ export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules"
export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules"
export XDG_DATA_DIRS="$TOP/share"
export ASPELL_CONF="prefix $TOP;"
+export POPPLER_DATADIR="$TOP/share/poppler"
# Note: This requires the path with the exact ImageMagic version number.
# Also, that ImageMagick will only work if it does not find a
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh
index 696f137fa..73e4714fc 100755
--- a/packaging/macosx/osx-app.sh
+++ b/packaging/macosx/osx-app.sh
@@ -402,6 +402,9 @@ cp -r "$LIBPREFIX/share/ImageMagick-6" "$pkgresources/share/"
# Copy aspell dictionary files:
cp -r "$LIBPREFIX/share/aspell" "$pkgresources/share/"
+# Copy Poppler data:
+cp -r "$LIBPREFIX/share/poppler" "$pkgshare"
+
# Copy all linked libraries into the bundle
#----------------------------------------------------------
# get list of *.so modules from python modules