From dd21876e64db4eaf592297e97355ffdf87f7d2f6 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Mon, 18 Dec 2017 12:09:14 +0900
Subject: [PATCH] Update .uuid only when -r is given but not -f.

---
 fc-cache/fc-cache.c     | 3 +++
 fontconfig/fontconfig.h | 5 +++++
 src/fcdir.c             | 2 +-
 src/fcint.h             | 5 -----
 4 files changed, 9 insertions(+), 6 deletions(-)

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);