From c49eac2147de25dedd91ad624d4bc45a203f4f7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= Date: Tue, 9 Feb 2021 19:42:55 +0100 Subject: [PATCH] meson: convert -Dterminfo from a boolean to a feature option Patch from Jan Beich --- .builds/freebsd-x64.yml | 4 ++-- doc/foot.ini.5.scd | 2 +- foot.ini | 2 +- meson_options.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.builds/freebsd-x64.yml b/.builds/freebsd-x64.yml index 8481c67f..8615ecef 100644 --- a/.builds/freebsd-x64.yml +++ b/.builds/freebsd-x64.yml @@ -34,11 +34,11 @@ tasks: ln -s ../../fcft foot/subprojects/fcft - debug: | mkdir -p bld/debug - meson --buildtype=debug -Dterminfo=false -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true foot bld/debug + meson --buildtype=debug -Dterminfo=disabled -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true foot bld/debug ninja -C bld/debug -k0 meson test -C bld/debug --print-errorlogs - release: | mkdir -p bld/release - meson --buildtype=minsize -Dterminfo=false -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true foot bld/release + meson --buildtype=minsize -Dterminfo=disabled -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true foot bld/release ninja -C bld/release -k0 meson test -C bld/release --print-errorlogs diff --git a/doc/foot.ini.5.scd b/doc/foot.ini.5.scd index 94596fdf..8d9960e0 100644 --- a/doc/foot.ini.5.scd +++ b/doc/foot.ini.5.scd @@ -112,7 +112,7 @@ in this order: *term* Value to set the environment variable *TERM* to. Default: _foot_ - or _xterm-256color_ if built with _-Dterminfo=false_ + or _xterm-256color_ if built with _-Dterminfo=disabled_ *title* Initial window title. Default: _foot_. diff --git a/foot.ini b/foot.ini index 98e25b93..baf0df84 100644 --- a/foot.ini +++ b/foot.ini @@ -10,7 +10,7 @@ # initial-window-mode=windowed # pad=2x2 # shell=$SHELL (if set, otherwise user's default shell from /etc/passwd) -# term=foot (or xterm-256color if built with -Dterminfo=false) +# term=foot (or xterm-256color if built with -Dterminfo=disabled) # login-shell=no # workers= # bold-text-in-bright=no diff --git a/meson_options.txt b/meson_options.txt index 0a5b0a3d..b21bc7a4 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,2 +1,2 @@ option('ime', type: 'boolean', value: true, description: 'IME (Input Method Editor) support') -option('terminfo', type: 'boolean', value: true, description: 'Install terminfo') +option('terminfo', type: 'feature', description: 'Install terminfo')