From 55c05b8a12944349b00053253d3a49b223a9f4de Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 20 Sep 2013 11:47:27 +0200
Subject: fontconfig mesa pixman git update 20 Sep 2013

pixman           commit aa5c45254eb60ce4c85a25b5343474fb160ffa7c
fontconfig       commit 643f8088f0d51107e58d142df47124efec6afab1
mesa             commit 1cc3b90d47f92aa0be2d914191fd2f46d2b127d7
---
 fontconfig/src/fcmatch.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'fontconfig/src')

diff --git a/fontconfig/src/fcmatch.c b/fontconfig/src/fcmatch.c
index dec92b9cf..627aa1a16 100644
--- a/fontconfig/src/fcmatch.c
+++ b/fontconfig/src/fcmatch.c
@@ -552,14 +552,16 @@ FcFontRenderPrepare (FcConfig	    *config,
 
 		continue;
 	    }
+	    FcPatternObjectAdd (new, fe->object, v, FcFalse);
 	}
 	else
 	{
 	    if (fel)
 		goto copy_lang;
-	    v = FcValueCanonicalize(&FcPatternEltValues (fe)->value);
+	    FcPatternObjectListAdd (new, fe->object,
+				    FcValueListDuplicate (FcPatternEltValues (fe)),
+				    FcTrue);
 	}
-	FcPatternObjectAdd (new, fe->object, v, FcFalse);
     }
     for (i = 0; i < pat->num; i++)
     {
-- 
cgit v1.2.3