From dd09c72c57b2960a4336b373ca7262219c5eb11f Mon Sep 17 00:00:00 2001
From: su_v <suv-sf@users.sourceforge.net>
Date: Wed, 20 Aug 2014 03:29:43 +0200
Subject: update custom fonts.conf to latest upstream changes

(bzr r13506.1.10)
---
 packaging/macosx/Resources/etc/fonts/fonts.conf | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packaging/macosx/Resources/etc/fonts/fonts.conf b/packaging/macosx/Resources/etc/fonts/fonts.conf
index 476aca105..316043814 100644
--- a/packaging/macosx/Resources/etc/fonts/fonts.conf
+++ b/packaging/macosx/Resources/etc/fonts/fonts.conf
@@ -24,12 +24,14 @@
 <!-- Font directory list -->
 
 	<dir>/usr/share/fonts</dir>
-	<dir>/usr/X11R6/lib/X11/fonts</dir>
+	<dir>/usr/X11/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 prefix="xdg">fonts</dir>
+	<!-- the following element will be removed in the future -->
 	<dir>~/.fonts</dir>
 
 <!--
@@ -39,7 +41,7 @@
 		<test qual="any" name="family">
 			<string>mono</string>
 		</test>
-		<edit name="family" mode="assign">
+		<edit name="family" mode="assign" binding="same">
 			<string>monospace</string>
 		</edit>
 	</match>
@@ -51,7 +53,7 @@
 		<test qual="any" name="family">
 			<string>sans serif</string>
 		</test>
-		<edit name="family" mode="assign">
+		<edit name="family" mode="assign" binding="same">
 			<string>sans-serif</string>
 		</edit>
 	</match>
@@ -63,7 +65,7 @@
 		<test qual="any" name="family">
 			<string>sans</string>
 		</test>
-		<edit name="family" mode="assign">
+		<edit name="family" mode="assign" binding="same">
 			<string>sans-serif</string>
 		</edit>
 	</match>
@@ -75,6 +77,8 @@
 
 <!-- Font cache directory list -->
 
+	<cachedir prefix="xdg">fontconfig</cachedir>
+	<!-- the following element will be removed in the future -->
 	<cachedir>~/.fontconfig</cachedir>
 
 	<config>
-- 
cgit v1.2.3