[Fontconfig] fontconfig: Branch 'master'

[Akira TAGOH]

 fc-cache/fc-cache.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f44157c809d280e2a0ce87fb078fc4b278d24a67
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Apr 10 19:27:55 2014 +0900

    Fix fc-cache fail with -r
    
    Do not unlink the cache even if --really-force is given.
    because re-scanning process expects the cache exists.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=77252

diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index 99e0e9f..90ebad3 100644
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -388,7 +388,7 @@ main (int argc, char **argv)
     list = FcStrListCreate (updateDirs);
     if (list)
     {
-	ret += scanDirs (list, config, FcTrue, really_force, verbose, FcFalse, &changed, NULL);
+	ret += scanDirs (list, config, FcTrue, FcFalse, verbose, FcFalse, &changed, NULL);
 	FcStrListDone (list);
     }
     FcStrSetDestroy (updateDirs);