Attachment #547264 for bug #666418




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

Lines 36-41 PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig ) Link Here

(-)a/media-libs/fontconfig/fontconfig-2.13.1-r1.ebuild (-1 / +1 lines)
36	PATCHES=(	36	PATCHES=(
37	"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157	37	"${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157
38	"${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default	38	"${FILESDIR}"/${PN}-2.12.3-latin-update.patch # 130466 + make liberation default
		39	"${FILESDIR}"/${P}-revert_delete_.uuid_for_empty_directory.patch # 666418
39		40
40	# Patches from upstream (can usually be removed with next version bump)	41	# Patches from upstream (can usually be removed with next version bump)
41	"${FILESDIR}"/${P}-static_build.patch	42	"${FILESDIR}"/${P}-static_build.patch
42	-

Return to bug 666418

Line 0 Link Here

(-)a/media-libs/fontconfig/files/fontconfig-2.13.1-revert_delete_.uuid_for_empty_directory.patch (+43 lines)
	1	https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/107
	2
	3	Reversion of part of:
	4	https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/f5dd8512bdf9fd8e01c30ae36f593758b29385cf
	5
	6	--- /src/fcdir.c
	7	+++ /src/fcdir.c
	8	@@ -421,13 +421,6 @@
	9	/* Not using existing cache file, construct new cache */
	10	if (!cache)
	11	cache = FcDirCacheScan (dir, config);
	12	- if (cache)
	13	- {
	14	- FcFontSet *fs = FcCacheSet (cache);
	15	-
	16	- if (cache->dirs_count == 0 && (!fs \|\| fs->nfont == 0))
	17	- FcDirCacheDeleteUUID (dir, config);
	18	- }
	19
	20	return cache;
	21	}
	22	--- /test/run-test.sh
	23	+++ /test/run-test.sh
	24	@@ -239,19 +239,4 @@
	25
	26	rm -rf $MyPWD/sysroot
	27
	28	-dotest "deleting .uuid file on empty dir"
	29	-prep
	30	-cp $FONT1 $FONT2 $FONTDIR
	31	-$FCCACHE $FONTDIR
	32	-sleep 1
	33	-rm -f $FONTDIR/*pcf
	34	-$FCCACHE $FONTDIR
	35	-rmdir $FONTDIR > /dev/null 2>&1
	36	-if [ $? != 0 ]; then
	37	- echo "*** Test failed: $TEST"
	38	- echo "$FONTDIR isn't empty"
	39	- ls -al $FONTDIR
	40	- exit 1
	41	-fi
	42	-
	43	rm -rf $FONTDIR $CACHEFILE $CACHEDIR $FONTCONFIG_FILE out