From b34f16e9df5cbcdd488175a7e4a1ab8e605d3a53 Mon Sep 17 00:00:00 2001 From: Ailin Nemui Date: Sat, 19 Feb 2022 21:51:12 +0100 Subject: [PATCH] remove enable-true-color compile time switch --- .github/workflows/termuxpkg.yml | 1 - meson.build | 4 +--- meson_options.txt | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/termuxpkg.yml b/.github/workflows/termuxpkg.yml index f46915e8..cbf7d3b2 100644 --- a/.github/workflows/termuxpkg.yml +++ b/.github/workflows/termuxpkg.yml @@ -37,7 +37,6 @@ jobs: TERMUX_PKG_BREAKS="irssi" TERMUX_PKG_REPLACES="irssi" TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" - -Denable-true-color=yes -Dfhs-prefix=$TERMUX_PREFIX " diff --git a/meson.build b/meson.build index 31bdfa9f..f2a15ee1 100644 --- a/meson.build +++ b/meson.build @@ -32,7 +32,6 @@ want_fuzzer = get_option('with-fuzzer') == 'yes' fuzzer_lib = get_option('with-fuzzer-lib') fuzzer_link_language = get_option('fuzzer-link-language') want_proxy = get_option('with-proxy') == 'yes' -want_truecolor = get_option('enable-true-color') == 'yes' want_gregex = get_option('disable-gregex') != 'yes' require_capsicum = get_option('with-capsicum') == 'yes' @@ -521,7 +520,7 @@ conf = configuration_data() conf.set('HAVE_CAPSICUM', have_capsicum, description : 'Build with Capsicum support') conf.set('HAVE_GMODULE', true) conf.set('HAVE_SOCKS', false, description : 'Build with socks support') -conf.set('TERM_TRUECOLOR', want_truecolor, description : 'true color support in terminal') +conf.set('TERM_TRUECOLOR', true) conf.set('USE_GREGEX', want_gregex, description : 'use GRegex for regular expressions') conf.set10('_DARWIN_USE_64_BIT_INODE', true, description : 'Enable large inode numbers on Mac OS X 10.5.') conf.set_quoted('FHS_PREFIX', get_option('fhs-prefix')) @@ -627,7 +626,6 @@ if have_perl endif message('Install prefix ................... : ' + get_option('prefix')) message('') -message('Building with true color support.. : ' + want_truecolor.to_string('yes', 'no')) message('Building with GRegex ............. : ' + want_gregex.to_string('yes', 'no')) message('Building with Capsicum ........... : ' + have_capsicum.to_string('yes', 'no')) message('Building with utf8proc ........... : ' + have_libutf8proc.to_string('yes', 'no')) diff --git a/meson_options.txt b/meson_options.txt index 1013166d..617de554 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -7,7 +7,6 @@ option('with-proxy', type : 'combo', description : 'Build irssi-proxy', option('with-perl-lib', type : 'string', description : 'Specify where to install the Perl libraries for Irssi') option('with-perl', type : 'combo', description : 'Build with Perl support', choices : ['auto', 'yes', 'no']) option('with-otr', type : 'combo', description : 'Build with OTR support', choices : ['auto', 'yes', 'no']) -option('enable-true-color', type : 'combo', description : 'Build with true color support in terminal', choices : ['no', 'yes']) option('disable-gregex', type : 'combo', description : 'Build without GRegex (fall back to regex.h)', choices : ['no', 'yes']) option('disable-utf8proc', type : 'combo', description : 'Build without Julia\'s utf8proc', choices : ['auto', 'yes', 'no']) option('with-capsicum', type : 'combo', description : 'Build with Capsicum support', choices : ['auto', 'yes', 'no'])