fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 src/fccache.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a1ac589b0640a763b493065d5048a92b8a291802
Merge: 203d948 70e1bd6
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Jul 30 03:59:56 2025 +0000

    Merge branch 'improve-message' into 'main'
    
    Improve a warning message
    
    Closes #489
    
    See merge request fontconfig/fontconfig!459

commit 70e1bd6d8997f5de80ca1497616efe6752201a0c
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Jul 30 12:38:57 2025 +0900

    Improve a warning message
    
    Suggested by @correctmost
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/489

diff --git a/src/fccache.c b/src/fccache.c
index 5847c8e..56451a3 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -791,7 +791,7 @@ FcCacheIsNewVersion (FcConfig *config, FcCache *cache)
 	return !flag;
     if (cache->fc_version > version && !warn) {
 	warn = FcTrue;
-	fprintf (stderr, "Fontconfig warning: Some cache files was generated by the newer version (0x%lx) of Fontconfig but caches is outdated. We won't regenearate it to avoid an unexpected behavior. Please regenerate caches with the latest version of Fontconfig. (current: 0x%lx)\n", cache->fc_version, version);
+	fprintf (stderr, "Fontconfig warning: We will not regenerate the cache because some cache files were generated by a newer version (0x%lx) of Fontconfig. Please regenerate the cache with the latest version of Fontconfig to avoid any unexpected behavior. (current version: 0x%lx)\n", cache->fc_version, version);
     }
 
     return cache->fc_version > version;