From: jiho-sf <jiho-sf@users.sourceforge.net>
Date: Sun, 17 May 2009 21:19:38 +0000 (+0000)
Subject: Fix bug 215906
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=26f350926d4f18e4111d8ae9776f23a0a05332a5;p=inkscape.git

Fix bug 215906

The comments:
https://bugs.launchpad.net/inkscape/+bug/215906
highlight that the user ~/Library/fonts folder is not used by Inkscape, which is weird because it most likely was before. We provide our own fonts.conf and this fixes it to add ~/Library/fonts.

In addition, it currently comments the system fonts because most of them are in dfont format and are not yet handled well by pango.
---

diff --git a/packaging/macosx/Resources/etc/fonts/fonts.conf b/packaging/macosx/Resources/etc/fonts/fonts.conf
index a44f823f7..c7a3fa295 100644
--- a/packaging/macosx/Resources/etc/fonts/fonts.conf
+++ b/packaging/macosx/Resources/etc/fonts/fonts.conf
@@ -24,7 +24,12 @@
 <!-- Font directory list -->
 
 	<dir>/usr/share/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>/usr/X11R6/lib/X11/fonts</dir>
+	<dir>/opt/local/share/fonts</dir>
+	<!-- <dir>/System/Library/Fonts</dir> -->
+	<dir>/Network/Library/Fonts</dir>
+	<dir>/Library/Fonts</dir>
+	<dir>~/Library/Fonts</dir>
 	<dir>~/.fonts</dir>
 
 <!--