Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/doc/fcformat.fncs
	fontconfig/fc-cat/fc-cat.c
	fontconfig/fc-list/fc-list.c
	fontconfig/fc-match/fc-match.c
	fontconfig/src/fcdir.c
	fontconfig/src/fcformat.c
	fontconfig/src/fcname.c
	mesalib/src/glsl/linker.cpp
	mesalib/src/mesa/state_tracker/st_format.c

1 files changed, 4 insertions, 13 deletions

diff --git a/fontconfig/fc-list/fc-list.c b/fontconfig/fc-list/fc-list.c
index 9f16224e0..97ed8225b 100644
--- a/fontconfig/fc-list/fc-list.c
+++ b/fontconfig/fc-list/fc-list.c
@@ -156,7 +156,9 @@ main (int argc, char **argv)
     if (quiet && !os)

 	os = FcObjectSetCreate ();

     if (!verbose && !format && !os)

-	os = FcObjectSetBuild (FC_FAMILY, FC_STYLE, (char *) 0);

+	os = FcObjectSetBuild (FC_FAMILY, FC_STYLE, FC_FILE, (char *) 0);

+    if (!format)

+        format = "%{=fclist}\n";

     fs = FcFontList (0, pat, os);

     if (os)

 	FcObjectSetDestroy (os);

@@ -173,7 +175,7 @@ main (int argc, char **argv)
 	    {

 		FcPatternPrint (fs->fonts[j]);

 	    }

-	    else if (format)

+	    else

 	    {

 	        FcChar8 *s;

 

@@ -184,17 +186,6 @@ main (int argc, char **argv)
 		    free (s);

 		}

 	    }

-	    else

-	    {

-		FcChar8 *str;

-		FcChar8 *file;

-

-		str = FcNameUnparse (fs->fonts[j]);

-		if (FcPatternGetString (fs->fonts[j], FC_FILE, 0, &file) == FcResultMatch)

-		    printf ("%s: ", file);

-		printf ("%s\n", str);

-		free (str);

-	    }

 	}

     }