fontconfig: Branch 'main' - 4 commits

[GitLab Mirror]

 Makefile.am |    2 +-
 meson.build |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 043f3e60fa40b3e63e42382cada5e0c33ecab2e1
Merge: daa175d 838a5cd
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Jun 6 08:23:12 2025 +0000

    Merge branch 'meson.options' into 'main'
    
    meson: rename meson_options.txt to meson.options
    
    See merge request fontconfig/fontconfig!421

commit 838a5cd46210b0822cbeac22720a8954ab3b505e
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Jun 6 14:41:27 2025 +0900

    meson: rename meson_options.txt to meson.options

diff --git a/Makefile.am b/Makefile.am
index 6d4cd32..b4f88e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,7 @@ MESON_FILES = \
 	fc-case/fc-case.py \
 	fc-lang/fc-lang.py \
 	meson.build \
-	meson_options.txt \
+	meson.options \
 	src/cutout.py \
 	src/fcstdint.h.in \
 	src/fcwindows.h \
diff --git a/meson_options.txt b/meson.options
similarity index 100%
rename from meson_options.txt
rename to meson.options
commit daa175d234b8a362eedd4c18c33537cc2d19cd98
Merge: 18894df 59de10a
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Jun 5 06:05:22 2025 +0000

    Merge branch 'issues/475' into 'main'
    
    meson: Fix additional-fonts-dirs build option that not taking effect
    
    Closes #475
    
    See merge request fontconfig/fontconfig!420

commit 59de10ae80cb2165975a917036b7e9a8cd5b0cb4
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Jun 5 12:27:59 2025 +0900

    meson: Fix additional-fonts-dirs build option that not taking effect
    
    Fixes https://gitlab.freedesktop.org/fontconfig/fontconfig/-/issues/475
    
    Changelog: fixed

diff --git a/meson.build b/meson.build
index 9001c25..14c2cea 100644
--- a/meson.build
+++ b/meson.build
@@ -370,10 +370,10 @@ endif
 xml_path = ''
 escaped_xml_path = ''
 foreach p : fc_add_fonts
-  s = '\t<dir>' + p + '</dir>\n'
+  s = '<dir>' + p + '</dir>\n\t'
   xml_path += s
   # No substitution method for string
-  s = '\\t<dir>' + p + '</dir>\\n'
+  s = '<dir>' + p + '</dir>\\n\\t'
   escaped_xml_path += s
 endforeach
 conf.set_quoted('FC_FONTPATH', escaped_xml_path)
@@ -420,9 +420,7 @@ conf.set_quoted('CONFIGDIR', fc_configdir)
 conf.set_quoted('FC_CACHEDIR', fc_cachedir)
 conf.set_quoted('FC_TEMPLATEDIR', fc_templatedir)
 conf.set_quoted('FONTCONFIG_PATH', fc_baseconfigdir)
-conf.set_quoted('FC_FONTPATH', '')
 
-fonts_conf.set('FC_FONTPATH', '')
 fonts_conf.set('FC_CACHEDIR', fc_cachedir)
 fonts_conf.set('CONFIGDIR', fc_configdir)
 # strip off fc_baseconfigdir prefix if that is the prefix