fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 meson.build |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 7b711e5f0677599e1d8c4c8303d74387b028ae37
Merge: 309e5c7 fa089ad
Author: Akira TAGOH <akira at tagoh.org>
Date:   Tue Apr 1 03:29:09 2025 +0000

    Merge branch 'bugfix/issue-456' into 'main'
    
    meson.build: define a 'c' standard for the project
    
    Closes #456
    
    See merge request fontconfig/fontconfig!374

commit fa089ad13e0b92f64c4c0fb2e99b39d8fbf6a96a
Author: Thomas Devoogdt <thomas at devoogdt.com>
Date:   Mon Mar 31 12:11:06 2025 +0200

    meson.build: define a 'c' standard for the project (C99 and C11)
    
    ../src/fcserialize.c: In function ‘FcSerializeFind’:
    ../src/fcserialize.c:123:5: error: ‘for’ loop initial declarations are only allowed in C99 or C11 mode
         for (size_t n = 0; n < buckets_count; ++n) {
         ^
    ../src/fcserialize.c:123:5: note: use option -std=c99, -std=gnu99, -std=c11 or -std=gnu11 to compile your code
    
    Fixes: https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/456
    Changelog: fixed
    
    Signed-off-by: Thomas Devoogdt <thomas at devoogdt.com>

diff --git a/meson.build b/meson.build
index 6385da1..8952d28 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,10 @@
 project('fontconfig', 'c',
   version: '2.16.1',
   meson_version : '>= 1.6.0',
-  default_options: [ 'buildtype=debugoptimized', ]
+  default_options: [
+    'c_std=c11,c99',
+    'buildtype=debugoptimized',
+  ]
 )
 
 fs = import('fs')