[Fontconfig] fontconfig: Branch 'master'

[Behdad Esfahbod]

 src/fcmatch.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 8828fffd93c6b19bcfd7626ddc472aa8f055d034
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jan 14 14:36:38 2013 -0600

    Copy all values from pattern to font if the font doesn't have the element
    
    Bug 59376 - FcFontRenderPrepare enhancement

diff --git a/src/fcmatch.c b/src/fcmatch.c
index 6778967..3d15605 100644
--- a/src/fcmatch.c
+++ b/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)),
+				    1);
 	}
     }