fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 meson.build |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 88ee3ad460eaed85e8994948b9c7dba7797ee506
Merge: a795743 7ebfd57
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Apr 23 06:58:10 2025 +0000

    Merge branch 'issues/462' into 'main'
    
    meson: don't try to call run_command for gperf on --wrap-mode=forcefallback
    
    Closes #462
    
    See merge request fontconfig/fontconfig!392

commit 7ebfd573e4abe427f2ef9ad5a063883f3534c943
Author: Akira TAGOH <akira at tagoh.org>
Date:   Wed Apr 23 15:40:01 2025 +0900

    meson: don't try to call run_command for gperf on --wrap-mode=forcefallback
    
    .found() always returns true for find_program('gperf') when giving
    --wrap-mode=forcefallback and unable to run_command() because of
    no binaries yet.  We can't test to know gperf len type.
    So just assume it may be size_t.
    
    Patch from Kjell Ahlstedt
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/462
    
    Changelog: fixed

diff --git a/meson.build b/meson.build
index eb5c618..cce3585 100644
--- a/meson.build
+++ b/meson.build
@@ -431,7 +431,7 @@ endif
 gperf = find_program('gperf', required: false)
 gperf_len_type = ''
 
-if gperf.found()
+if gperf.found() and get_option('wrap_mode') != 'forcefallback'
   gperf_test_format = '''
   #include <string.h>
   const char * in_word_set(const char *, @0@);