Module Name:    xsrc
Committed By:   nakayama
Date:           Thu May 16 09:59:37 UTC 2019

Modified Files:
        xsrc/external/mit/fontconfig/dist/src: fcdir.c

Log Message:
Do not remove UUID file when a scanned directory is empty.

pulled from the following upstream change:
https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/5f12f564f8748deaa603adb7a4b8f616b6390ad4

It fixes that a cache file for an empty font directory is created
every time fc-cache is executed.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8 -r1.2 xsrc/external/mit/fontconfig/dist/src/fcdir.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/fontconfig/dist/src/fcdir.c
diff -u xsrc/external/mit/fontconfig/dist/src/fcdir.c:1.1.1.8 xsrc/external/mit/fontconfig/dist/src/fcdir.c:1.2
--- xsrc/external/mit/fontconfig/dist/src/fcdir.c:1.1.1.8	Fri Mar  8 09:40:41 2019
+++ xsrc/external/mit/fontconfig/dist/src/fcdir.c	Thu May 16 09:59:37 2019
@@ -421,13 +421,6 @@ FcDirCacheRead (const FcChar8 *dir, FcBo
     /* Not using existing cache file, construct new cache */
     if (!cache)
 	cache = FcDirCacheScan (dir, config);
-    if (cache)
-    {
-	FcFontSet *fs = FcCacheSet (cache);
-
-	if (cache->dirs_count == 0 && (!fs || fs->nfont == 0))
-	    FcDirCacheDeleteUUID (dir, config);
-    }
 
     return cache;
 }

Reply via email to