slackware-current/source/x/fontconfig/patches/fontconfig-remove-uuid.patch
Patrick J Volkerding 6e6f0c6efb Thu Nov 28 00:18:02 UTC 2024
a/tcsh-6.24.14-x86_64-1.txz:  Upgraded.
ap/sudo-1.9.16p2-x86_64-1.txz:  Upgraded.
n/netatalk-4.0.7-x86_64-2.txz:  Rebuilt.
  Fixed config file handling. Thanks to marav.
n/openldap-2.6.9-x86_64-1.txz:  Upgraded.
t/texlive-2024.240409-x86_64-3.txz:  Rebuilt.
  Move files from /etc/fonts/conf.avail to /usr/share/fontconfig/fonts.avail.
x/dejavu-fonts-ttf-2.37-noarch-7.txz:  Rebuilt.
  Move files from /etc/fonts/conf.avail to /usr/share/fontconfig/fonts.avail.
x/font-bh-ttf-1.0.4-noarch-2.txz:  Rebuilt.
  Move files from /etc/fonts/conf.avail to /usr/share/fontconfig/fonts.avail.
x/fontconfig-2.15.0-x86_64-1.txz:  Upgraded.
  Thanks to Didier Spaier for the updated patches and meson build script!
x/liberation-fonts-ttf-2.1.5-noarch-2.txz:  Rebuilt.
  Move files from /etc/fonts/conf.avail to /usr/share/fontconfig/fonts.avail.
x/noto-cjk-fonts-ttf-2.001-noarch-4.txz:  Rebuilt.
  Move files from /etc/fonts/conf.avail to /usr/share/fontconfig/fonts.avail.
x/ttf-indic-fonts-0.5.14-noarch-6.txz:  Rebuilt.
  Move files from /etc/fonts/conf.avail to /usr/share/fontconfig/fonts.avail.
x/ttf-tlwg-0.7.3-noarch-2.txz:  Rebuilt.
  Move files from /etc/fonts/conf.avail to /usr/share/fontconfig/fonts.avail.
x/wqy-zenhei-font-ttf-0.8.38_1-noarch-10.txz:  Rebuilt.
  Move files from /etc/fonts/conf.avail to /usr/share/fontconfig/fonts.avail.
xap/xlockmore-5.81-x86_64-1.txz:  Upgraded.
testing/packages/mesa-24.3.0-x86_64-1.txz:  Added.
2024-11-28 02:04:23 +01:00

67 lines
1.7 KiB
Diff

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