44 lines
1005 B
Diff
44 lines
1005 B
Diff
https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/107
|
|
|
|
Reversion of part of:
|
|
https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/f5dd8512bdf9fd8e01c30ae36f593758b29385cf
|
|
|
|
--- /src/fcdir.c
|
|
+++ /src/fcdir.c
|
|
@@ -421,13 +421,6 @@
|
|
/* 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;
|
|
}
|
|
--- /test/run-test.sh
|
|
+++ /test/run-test.sh
|
|
@@ -239,19 +239,4 @@
|
|
|
|
rm -rf $MyPWD/sysroot
|
|
|
|
-dotest "deleting .uuid file on empty dir"
|
|
-prep
|
|
-cp $FONT1 $FONT2 $FONTDIR
|
|
-$FCCACHE $FONTDIR
|
|
-sleep 1
|
|
-rm -f $FONTDIR/*pcf
|
|
-$FCCACHE $FONTDIR
|
|
-rmdir $FONTDIR > /dev/null 2>&1
|
|
-if [ $? != 0 ]; then
|
|
- echo "*** Test failed: $TEST"
|
|
- echo "$FONTDIR isn't empty"
|
|
- ls -al $FONTDIR
|
|
- exit 1
|
|
-fi
|
|
-
|
|
rm -rf $FONTDIR $CACHEFILE $CACHEDIR $FONTCONFIG_FILE out
|