fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

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

New commits:
commit 367495e5fd150cfcf51873cb429207ecbacb5fc2
Merge: a1ac589 d80c22a
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Jul 30 10:09:15 2025 +0000

    Merge branch 'fixWarningFormat' into 'main'
    
    Architecture-dependent hex formatting of int64_t in fccache.c
    
    See merge request fontconfig/fontconfig!460

commit d80c22a79f7b2d5a97866cff96838053b711899a
Author: Dominik Röttsches <drott at chromium.org>
Date:   Wed Jul 30 10:54:38 2025 +0300

    Architecture-dependent hex formatting of int64_t in fccache.c
    
    Building on 32bit with -Wformat leads to errors such as:
    error: format specifies type 'unsigned long' but the argument
    has type 'int64_t' (aka 'long long')
    Fix this by using the architecture specific macro.

diff --git a/src/fccache.c b/src/fccache.c
index 56451a3..7769515 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -31,6 +31,7 @@
 #ifdef HAVE_DIRENT_H
 #  include <dirent.h>
 #endif
+#include <inttypes.h>
 #include <limits.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -791,7 +792,7 @@ FcCacheIsNewVersion (FcConfig *config, FcCache *cache)
 	return !flag;
     if (cache->fc_version > version && !warn) {
 	warn = FcTrue;
-	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);
+	fprintf (stderr, "Fontconfig warning: We will not regenerate the cache because some cache files were generated by a newer version (0x%" PRIx64 ") of Fontconfig. Please regenerate the cache with the latest version of Fontconfig to avoid any unexpected behavior. (current version: 0x%" PRIx64 ")\n", cache->fc_version, version);
     }
 
     return cache->fc_version > version;