summaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2014-08-20 02:27:21 +0000
committer~suv <suv-sf@users.sourceforge.net>2014-08-20 02:27:21 +0000
commit38704943098b40869a7761bec59bf443f38dd50e (patch)
tree7f458b6e12016a4e3f2543e5510e6ff5e2f13050 /packaging
parentfollow-up to previous commit (adjust fallback for LIBPREFIX, adjust comment) (diff)
downloadinkscape-38704943098b40869a7761bec59bf443f38dd50e.tar.gz
inkscape-38704943098b40869a7761bec59bf443f38dd50e.zip
fontconfig: fix copying of conf.avail; disable bitmap fonts (see bug #714859)
(bzr r13506.1.15)
Diffstat (limited to 'packaging')
-rwxr-xr-xpackaging/macosx/osx-app.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh
index 848b70080..5b147cb8e 100755
--- a/packaging/macosx/osx-app.sh
+++ b/packaging/macosx/osx-app.sh
@@ -314,10 +314,11 @@ ModuleFiles=\${HOME}/Library/Application Support/org.inkscape.Inkscape/0.91/pang
END_PANGO
mkdir -p $pkgetc/fonts
-#cp -r $LIBPREFIX/etc/fonts/fonts.conf $pkgetc/fonts/
cp -r $LIBPREFIX/etc/fonts/conf.d $pkgetc/fonts/
+mkdir -p $pkgshare/fontconfig
cp -r $LIBPREFIX/share/fontconfig/conf.avail $pkgshare/fontconfig/
-(cd $pkgetc/fonts/conf.d && ln -s ../../../share/fontconfig/conf.avail/10-autohint.conf . )
+(cd $pkgetc/fonts/conf.d && ln -s ../../../share/fontconfig/conf.avail/10-autohint.conf)
+(cd $pkgetc/fonts/conf.d && ln -s ../../../share/fontconfig/conf.avail/70-no-bitmaps.conf)
for item in gnome-vfs-mime-magic gnome-vfs-2.0