From 7045802f057edadfdcf2f3cfd66300231352fae0 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Sat, 10 Feb 2024 03:19:09 +0900
Subject: [PATCH] Delete .uuid with fc-cache -f.

  Resolves: rhbz#1761885
---
 fontconfig-remove-uuid.patch | 67 ++++++++++++++++++++++++++++++++++++
 fontconfig.spec              |  7 +++-
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 fontconfig-remove-uuid.patch

diff --git a/fontconfig-remove-uuid.patch b/fontconfig-remove-uuid.patch
new file mode 100644
index 0000000..16c0d04
--- /dev/null
+++ b/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
+
diff --git a/fontconfig.spec b/fontconfig.spec
index 28999b7..2462e60 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -5,7 +5,7 @@
 Summary:	Font configuration and customization library
 Name:		fontconfig
 Version:	2.14.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 # src/ftglue.[ch] is in Public Domain
 # src/fccache.c contains Public Domain code
 # fc-case/CaseFolding.txt is in the UCD
@@ -21,6 +21,7 @@ Source3:	10-sub-pixel-rgb-for-kde.conf
 Patch0:		%{name}-sleep-less.patch
 Patch4:		%{name}-drop-lang-from-pkgkit-format.patch
 Patch5:		%{name}-disable-network-required-test.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.14.2-2
+- Delete .uuid with fc-cache -f.
+  Resolves: rhbz#1761885
+
 * Fri Jan 27 2023 Akira TAGOH <tagoh@redhat.com> - 2.14.2-1
 - New upstream release.