xserver: Branch 'master'

[GitLab Mirror]

 man/meson.build |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b9c31cc9bc3b6468620bf5f12edca16860365ca2
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Sat Apr 5 15:41:15 2025 -0700

    Xserver.man: allow line breaks in default font path
    
    Allows nroff to insert a line break between iterm in the font path
    instead of displaying it as a single, very overlength line.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1891>

diff --git a/man/meson.build b/man/meson.build
index 2961469c5..eca10561b 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -27,7 +27,8 @@ manpage_config.set('modulepath', module_dir)
 # wtf doesn't this work
 # manpage_config.set('suid_wrapper_dir', join_paths(get_option('prefix'), libexecdir))
 manpage_config.set('suid_wrapper_dir', join_paths(get_option('prefix'), 'libexec'))
-manpage_config.set('default_font_path', default_font_path)
+# \: allows nroff to insert a line break at that position
+manpage_config.set('default_font_path', default_font_path.replace(',', ',\\:'))
 
 install_man(configure_file(
     input: 'Xserver.man',