From d4d629b77742e60caac3d120ff40e9f386380af2 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 4 Mar 2013 08:18:40 +0100
Subject: fontconfig libX11 mesalib pixman xserver xkeyboard-config git update
 4 Mar 2013

xserver          commit 8f4640bdb9d3988148e09a08d2c7e3bab1d538d6
xkeyboard-config commit fa2f330df22511c3846cb1cb0760551c6e244a81
libX11           commit c23d61d1b84dca3740bf4786978c7908d0065fb9
pixman           commit 5feda20fc39407879993ed4a6d861ef7f78d9432
fontconfig       commit 612ee2a5c91b8929b2cc5abce4af84d8d7e66bd0
mesa             commit e29124717eae4f8d329bb6a9707b802c0ff4bdd9
---
 fontconfig/conf.d/30-metric-aliases.conf | 16 ++++++++++++++++
 fontconfig/src/fcmatch.c                 | 10 +++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

(limited to 'fontconfig')

diff --git a/fontconfig/conf.d/30-metric-aliases.conf b/fontconfig/conf.d/30-metric-aliases.conf
index ccc3e246d..f25052a29 100644
--- a/fontconfig/conf.d/30-metric-aliases.conf
+++ b/fontconfig/conf.d/30-metric-aliases.conf
@@ -15,10 +15,12 @@
 
 		Microsoft fonts:
 			Arial
+			Arial Narrow
 			Times New Roman
 			Courier New
 		Liberation fonts:
 			Liberation Sans
+			Liberation Sans Narrow
 			Liberation Serif
 			Liberation Mono
 		StarOffice fonts:
@@ -92,6 +94,13 @@
 	  </default>
 	</alias>
 
+	<alias binding="same">
+	  <family>Liberation Sans Narrow</family>
+	  <default>
+	    <family>Arial Narrow</family>
+	  </default>
+	</alias>
+
 	<alias binding="same">
 	  <family>Albany</family>
 	  <default>
@@ -251,6 +260,13 @@
 	  </accept>
 	</alias>
 
+	<alias binding="same">
+	  <family>Arial Narrow</family>
+	  <accept>
+	    <family>Liberation Sans Narrow</family>
+	  </accept>
+	</alias>
+
 	<alias binding="same">
 	  <family>Times New Roman</family>
 	  <accept>
diff --git a/fontconfig/src/fcmatch.c b/fontconfig/src/fcmatch.c
index fa8800a04..23f985a6c 100644
--- a/fontconfig/src/fcmatch.c
+++ b/fontconfig/src/fcmatch.c
@@ -269,7 +269,8 @@ FcObjectToMatcher (FcObject object,
 	    break;
 	}
     }
-    if (!_FcMatchers[object].compare ||
+    if (object > FC_MAX_BASE_OBJECT ||
+	!_FcMatchers[object].compare ||
 	_FcMatchers[object].strong == -1 ||
 	_FcMatchers[object].weak == -1)
 	return NULL;
@@ -910,6 +911,13 @@ FcFontSetSort (FcConfig	    *config FC_UNUSED,
 			}
 			patternLangSat[i] = FcTrue;
 			satisfies = FcTrue;
+			/* adjust score to ensure it's not more than 10000.0
+			 * which would means the lang didn't satisfy the requirements
+			 */
+			if (nodeps[f]->score[PRI_LANG_STRONG] > 10000.0)
+			    nodeps[f]->score[PRI_LANG_STRONG] = 10000.0;
+			if (nodeps[f]->score[PRI_LANG_WEAK] > 10000.0)
+			    nodeps[f]->score[PRI_LANG_WEAK] = 10000.0;
 			break;
 		    }
 		}
-- 
cgit v1.2.3