[Fontconfig] fontconfig: Branch 'master' - 3 commits

[Behdad Esfahbod]

 fc-query/Makefile.am |    2 +-
 fc-query/fc-query.c  |    1 -
 src/fcfreetype.c     |    5 +----
 3 files changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 339de167c71264c18775d96160d1504192a89d11
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Sep 12 17:01:57 2017 -0400

    [fc-query] Fix linking order

diff --git a/fc-query/Makefile.am b/fc-query/Makefile.am
index 6e8ef5c..6fe357b 100644
--- a/fc-query/Makefile.am
+++ b/fc-query/Makefile.am
@@ -41,7 +41,7 @@ EXTRA_DIST=fc-query.sgml $(BUILT_MANS)
 
 CLEANFILES =
 
-fc_query_LDADD = $(FREETYPE_LIBS) ${top_builddir}/src/libfontconfig.la
+fc_query_LDADD = ${top_builddir}/src/libfontconfig.la $(FREETYPE_LIBS)
 
 if USEDOCBOOK
 
commit b56207a069be2574df455ede0a6ab61f44d5ca2b
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Sep 12 13:25:46 2017 -0400

    Remove stray printf()
    
    Ouch.

diff --git a/fc-query/fc-query.c b/fc-query/fc-query.c
index 842a8b6..6cd5abd 100644
--- a/fc-query/fc-query.c
+++ b/fc-query/fc-query.c
@@ -170,7 +170,6 @@ main (int argc, char **argv)
 	    FcPattern *pat;
 
 	    id = ((instance_num << 16) + face_num);
-	    printf("id %d\n", id);
 	    if (FT_New_Face (ftLibrary, argv[i], id, &face))
 	      break;
 	    num_faces = face->num_faces;
commit 6fb9b8fe49a2862cccdd25c278f437a620aaac5d
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Sep 12 11:42:18 2017 -0400

    Minor

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 724f275..4be025a 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -1219,14 +1219,11 @@ FcFreeTypeQueryFace (const FT_Face  face,
 	int has_outline = !!(face->face_flags & FT_FACE_FLAG_SCALABLE);
 	int has_color = 0;
 
-#ifdef FT_FACE_FLAG_COLOR
-	has_color = !!(face->face_flags & FT_FACE_FLAG_COLOR);
-#endif
-
 	if (!FcPatternAddBool (pat, FC_OUTLINE, has_outline))
 	    goto bail1;
 
 #ifdef FT_FACE_FLAG_COLOR
+	has_color = !!(face->face_flags & FT_FACE_FLAG_COLOR);
 	if (!FcPatternAddBool (pat, FC_COLOR, has_color))
 	    goto bail1;
 #endif