Delete .uuid with fc-cache -f.

Resolves: rhbz#1761885

fontconfig-remove-uuid.patch

@@ -0,0 +1,67 @@
+From c22908828fb2dbfdf38733d119adc1cf5fe00173 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Sat, 10 Feb 2024 00:20:54 +0900
+Subject: [PATCH 1/2] Clean up .uuid files with fc-cache -f too
+
+.uuid file was obsoleted >5 years ago and it was supposed to
+be cleaned up by fc-cache -r but not -f.
+This change tries to clean it up by fc-cache -f.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1761885
+---
+ src/fcdir.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/fcdir.c b/src/fcdir.c
+index 6f7b3835..2e4fdc69 100644
+--- a/src/fcdir.c
++++ b/src/fcdir.c
+@@ -234,7 +234,7 @@ FcDirScanConfig (FcFontSet	*set,
+ 
+     if (FcDebug () & FC_DBG_SCAN)
+ 	printf ("\tScanning dir %s\n", s_dir);
+-	
++
+     d = opendir ((char *) s_dir);
+     if (!d)
+     {
+@@ -459,7 +459,10 @@ FcDirCacheRead (const FcChar8 *dir, FcBool force, FcConfig *config)
+ 
+     /* Not using existing cache file, construct new cache */
+     if (!cache)
++    {
++	FcDirCacheDeleteUUID (dir, config);
+ 	cache = FcDirCacheScan (dir, config);
++    }
+     FcConfigDestroy (config);
+ 
+     return cache;
+-- 
+2.43.0
+
+From a76b95105ca26c600279b2daf4bd43b37a918823 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira@tagoh.org>
+Date: Sat, 10 Feb 2024 02:15:45 +0900
+Subject: [PATCH 2/2] Fix undesired unref of FcConfig on Win32
+
+---
+ src/fccache.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/fccache.c b/src/fccache.c
+index cebbb810..54f76ac1 100644
+--- a/src/fccache.c
++++ b/src/fccache.c
+@@ -106,8 +106,8 @@ FcDirCacheDeleteUUID (const FcChar8  *dir,
+     FcStrFree (target);
+ bail:
+     FcStrFree (d);
+-#endif
+     FcConfigDestroy (config);
++#endif
+ 
+     return ret;
+ }
+-- 
+2.43.0
+

fontconfig.spec

@@ -5,7 +5,7 @@
 Summary:	Font configuration and customization library
 Name:		fontconfig
 Version:	2.15.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 # src/ftglue.[ch] is in Public Domain
 # src/fccache.c contains Public Domain code
 ## https://gitlab.com/fedora/legal/fedora-license-data/-/issues/177
@@ -22,6 +22,7 @@ Patch0:		%{name}-sleep-less.patch
 Patch4:		%{name}-drop-lang-from-pkgkit-format.patch
 Patch5:		%{name}-disable-network-required-test.patch
 Patch6:		%{name}-lower-nonlatin-conf.patch
+Patch7:		%{name}-remove-uuid.patch
 
 BuildRequires:	libxml2-devel
 BuildRequires:	freetype-devel >= %{freetype_version}
@@ -192,6 +193,10 @@ fi
 %doc fontconfig-devel.txt fontconfig-devel
 
 %changelog
+* Sat Feb 10 2024 Akira TAGOH <tagoh@redhat.com> - 2.15.0-4
+- Delete .uuid with fc-cache -f.
+  Resolves: rhbz#1761885
+
 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.15.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild