fontconfig: Branch 'main' - 2 commits

[GitLab Mirror]

 src/fcdir.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit d9580deeb052e0c9bd7f5e22c8f08a56c6db9bd7
Merge: 8e8e385 e150197
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Jun 26 12:29:29 2025 +0000

    Merge branch 'fixFontationsIndexingBuild' into 'main'
    
    Fix fontations indexing build
    
    See merge request fontconfig/fontconfig!442

commit e1501970ca9a2719a7ca1a8840848ac8af213778
Author: Dominik Röttsches <drott at chromium.org>
Date:   Wed Jun 25 16:02:44 2025 +0300

    [Fontations] Fix downstream build of indexing with Fontations
    
    Needs to include fcfontations.h, and getenv() check simplified.

diff --git a/src/fcdir.c b/src/fcdir.c
index 1387f6b..9527d94 100644
--- a/src/fcdir.c
+++ b/src/fcdir.c
@@ -28,6 +28,10 @@
 #  include <dirent.h>
 #endif
 
+#if ENABLE_FONTATIONS
+#  include "fontconfig/fcfontations.h"
+#endif
+
 FcBool
 FcFileIsDir (const FcChar8 *file)
 {
@@ -79,7 +83,7 @@ FcFileScanFontConfig (FcFontSet     *set,
 
     unsigned int (*query_function) (const FcChar8 *, unsigned int, FcBlanks *, int *, FcFontSet *) = FcFreeTypeQueryAll;
 #if ENABLE_FONTATIONS
-    if (getenv ("FC_FONTATIONS") != NULL) {
+    if (getenv ("FC_FONTATIONS")) {
 	query_function = FcFontationsQueryAll;
     }
 #endif