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

[Akira TAGOH]

 fc-cache/fc-cache.c     |    3 +++
 fontconfig/fontconfig.h |    5 +++++
 src/fcdir.c             |    2 +-
 src/fcint.h             |    5 -----
 test/Makefile.am        |    4 +++-
 5 files changed, 12 insertions(+), 7 deletions(-)

New commits:
commit dd21876e64db4eaf592297e97355ffdf87f7d2f6
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Dec 18 12:09:14 2017 +0900

    Update .uuid only when -r is given but not -f.

diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index 7605989..1cea5c7 100644
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -188,7 +188,10 @@ scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force,
 	was_processed = FcTrue;
 
 	if (really_force)
+	{
 	    FcDirCacheUnlink (dir, config);
+	    FcDirCacheCreateUUID ((FcChar8 *) dir, FcTrue, config);
+	}
 
 	cache = NULL;
 	was_valid = FcFalse;
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 89f3bae..721982b 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -371,6 +371,11 @@ FcDirCacheClean (const FcChar8 *cache_dir, FcBool verbose);
 FcPublic void
 FcCacheCreateTagFile (const FcConfig *config);
 
+FcPublic FcBool
+FcDirCacheCreateUUID (FcChar8  *dir,
+		      FcBool    force,
+		      FcConfig *config);
+
 /* fccfg.c */
 FcPublic FcChar8 *
 FcConfigHome (void);
diff --git a/src/fcdir.c b/src/fcdir.c
index c6514a4..d6be0be 100644
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -409,7 +409,7 @@ FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config)
 {
     FcCache		*cache = NULL;
 
-    FcDirCacheCreateUUID ((FcChar8 *) dir, force, config);
+    FcDirCacheCreateUUID ((FcChar8 *) dir, FcFalse, config);
     /* Try to use existing cache file */
     if (!force)
 	cache = FcDirCacheLoad (dir, config, NULL);
diff --git a/src/fcint.h b/src/fcint.h
index e1c9a9f..3559ad6 100644
--- a/src/fcint.h
+++ b/src/fcint.h
@@ -596,11 +596,6 @@ struct _FcValuePromotionBuffer {
 
 /* fccache.c */
 
-FcPrivate FcBool
-FcDirCacheCreateUUID (FcChar8  *dir,
-		      FcBool    force,
-		      FcConfig *config);
-
 FcPrivate FcCache *
 FcDirCacheScan (const FcChar8 *dir, FcConfig *config);
 
commit dd1a92911b1abc4c266ad33d88ec8161342f0d69
Author: Akira TAGOH <akira at tagoh.org>
Date:   Mon Dec 18 11:53:25 2017 +0900

    cleanup files

diff --git a/test/Makefile.am b/test/Makefile.am
index e13014a..75e326c 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -57,6 +57,8 @@ TESTS += test-bz96676
 
 EXTRA_DIST=run-test.sh $(TESTDATA) out.expected-long-family-names out.expected-no-long-family-names
 
-CLEANFILES=
+CLEANFILES=out fonts.conf
+
+MAINTAINERCLEANFILES=out.expected
 
 -include $(top_srcdir)/git.mk