From 2fe4d492f39a5a5b67c4444805f7b1eaa1e745a9 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 15 Jan 2013 08:09:32 +0100
Subject: mesa fontconfig xkeyboard-config git update 15 jan 2013

mesa: 1c9833ba70466906d3d2ad3aee6a10642a39abdd
fontconfig: 8b8f0d21534aa9b82276815c84429ffca8941d2a
xkeyboard-config: 89f25045cb14ff9f08a047494a0d5966f2c1727d
---
 fontconfig/src/fcmatch.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'fontconfig/src')

diff --git a/fontconfig/src/fcmatch.c b/fontconfig/src/fcmatch.c
index 6778967b9..fc891cb50 100644
--- a/fontconfig/src/fcmatch.c
+++ b/fontconfig/src/fcmatch.c
@@ -549,8 +549,9 @@ FcFontRenderPrepare (FcConfig	    *config,
 	fe = FcPatternObjectFindElt (font, pe->object);
 	if (!fe)
 	{
-	    v = FcValueCanonicalize(&FcPatternEltValues(pe)->value);
-	    FcPatternObjectAdd (new, pe->object, v, FcTrue);
+	    FcPatternObjectListAdd (new, pe->object,
+				    FcValueListDuplicate (FcPatternEltValues(pe)),
+				    FcFalse);
 	}
     }
 
-- 
cgit v1.2.3