[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 src/fcmatch.c |    1 +
 src/fcobjs.h  |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 084cf7c44e985dd48c088d921ad0d9a43b0b00b4
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Aug 14 12:51:26 2013 +0900

    Bug 16818 - fontformat in match pattern is not respected?

diff --git a/src/fcmatch.c b/src/fcmatch.c
index 8b285f6..dec92b9 100644
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -245,6 +245,7 @@ typedef enum _FcMatcherPriorityDummy {
 typedef enum _FcMatcherPriority {
     PRI1(HASH),
     PRI1(FILE),
+    PRI1(FONTFORMAT),
     PRI1(SCALABLE),
     PRI1(FOUNDRY),
     PRI1(CHARSET),
diff --git a/src/fcobjs.h b/src/fcobjs.h
index c09a40e..87c7319 100644
--- a/src/fcobjs.h
+++ b/src/fcobjs.h
@@ -35,7 +35,7 @@ FC_OBJECT (CHARSET,		FcTypeCharSet,	FcCompareCharSet)
 FC_OBJECT (LANG,		FcTypeLangSet,	FcCompareLang)
 FC_OBJECT (FONTVERSION,		FcTypeInteger,	FcCompareNumber)
 FC_OBJECT (CAPABILITY,		FcTypeString,	NULL)
-FC_OBJECT (FONTFORMAT,		FcTypeString,	NULL)
+FC_OBJECT (FONTFORMAT,		FcTypeString,	FcCompareString)
 FC_OBJECT (EMBOLDEN,		FcTypeBool,	NULL)
 FC_OBJECT (EMBEDDED_BITMAP,	FcTypeBool,	NULL)
 FC_OBJECT (DECORATIVE,		FcTypeBool,	FcCompareBool)