From: mjwybrow <mjwybrow@users.sourceforge.net>
Date: Wed, 12 Mar 2008 11:47:07 +0000 (+0000)
Subject:  *  macosx/Resources/bin/inkscape, macosx/Resources/etc/fonts/fonts.conf:
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a419b18191b1b9de7ee74c6e485c735fa694f555;p=inkscape.git

 *  macosx/Resources/bin/inkscape, macosx/Resources/etc/fonts/fonts.conf:
    Fix fontconfig configuration on machines where Macport's fontconfig is
    not installed.
---

diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape
index 093cb3550..e661c8754 100755
--- a/packaging/macosx/Resources/bin/inkscape
+++ b/packaging/macosx/Resources/bin/inkscape
@@ -30,10 +30,7 @@ export PYTHONPATH="$TOP/python/site-packages/$ARCH/$PYTHON_VERS"
 
 export DYLD_LIBRARY_PATH="$TOP/lib"
 
-# For Panther and Tiger, override the default fontconfig configuration
-if [[ $VERSION -le 4 ]]; then
-	export FONTCONFIG_PATH="$TOP/etc/fonts"
-fi
+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"
diff --git a/packaging/macosx/Resources/etc/fonts/fonts.conf b/packaging/macosx/Resources/etc/fonts/fonts.conf
index 8394ffdd2..a44f823f7 100644
--- a/packaging/macosx/Resources/etc/fonts/fonts.conf
+++ b/packaging/macosx/Resources/etc/fonts/fonts.conf
@@ -23,18 +23,9 @@
 
 <!-- Font directory list -->
 
-	<dir>/Library/Fonts</dir>
-	<dir>/Network/Library/Fonts</dir>
-	<dir>/System/Library/Fonts</dir>
-	<dir>/usr/X11R6/lib/X11/fonts</dir>
 	<dir>/usr/share/fonts</dir>
-	<dir>/var/root/Library/Fonts</dir>
+	<dir>/usr/X11R6/lib/X11/fonts</dir> <dir>/Library/Fonts</dir> <dir>/Network/Library/Fonts</dir> <dir>/System/Library/Fonts</dir> <dir>/opt/local/share/fonts</dir>
 	<dir>~/.fonts</dir>
-	<dir>~/Library/Fonts</dir>
-
-<!-- Font cache directory list -->
-
-	<cachedir>~/.fontconfig</cachedir>
 
 <!--
   Accept deprecated 'mono' alias, replacing it with 'monospace'
@@ -77,6 +68,11 @@
 -->
 	<include ignore_missing="yes">conf.d</include>
 
+<!-- Font cache directory list -->
+
+	<cachedir>/opt/local/var/cache/fontconfig</cachedir>
+	<cachedir>~/.fontconfig</cachedir>
+
 	<config>
 <!--
   These are the default Unicode chars that are expected to be blank
@@ -135,6 +131,7 @@
 			<int>0x206D</int>	<!-- ACTIVATE ARABIC FORM SHAPING -->
 			<int>0x206E</int>	<!-- NATIONAL DIGIT SHAPES -->
 			<int>0x206F</int>	<!-- NOMINAL DIGIT SHAPES -->
+			<int>0x2800</int>	<!-- BRAILLE PATTERN BLANK -->
 			<int>0x3000</int>	<!-- IDEOGRAPHIC SPACE -->
 			<int>0x3164</int>	<!-- HANGUL FILLER -->
 			<int>0xFEFF</int>	<!-- ZERO WIDTH NO-BREAK SPACE -->