| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667 |
- From e5d86ebed5624ef62342c820a5868b1075deb300 Mon Sep 17 00:00:00 2001
- From: James Hilliard <james.hilliard1@gmail.com>
- Date: Sun, 11 Jul 2021 04:39:33 -0600
- Subject: [PATCH] Add meson option to disable urlify.
- Useful for systems that don't use a version of less with hyperlink
- support.
- Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
- [james.hilliard1@gmail.com: backport from upstream commit
- e5d86ebed5624ef62342c820a5868b1075deb300]
- ---
- meson.build | 1 +
- meson_options.txt | 2 ++
- src/shared/pretty-print.c | 4 ++++
- 3 files changed, 7 insertions(+)
- diff --git a/meson.build b/meson.build
- index 5735cfc7ad..a2ee15bf32 100644
- --- a/meson.build
- +++ b/meson.build
- @@ -278,6 +278,7 @@ conf.set_quoted('USER_PRESET_DIR', userpresetdir)
- conf.set_quoted('VENDOR_KEYRING_PATH', join_paths(rootlibexecdir, 'import-pubring.gpg'))
-
- conf.set('ANSI_OK_COLOR', 'ANSI_' + get_option('ok-color').underscorify().to_upper())
- +conf.set10('ENABLE_URLIFY', get_option('urlify'))
- conf.set10('ENABLE_FEXECVE', get_option('fexecve'))
- conf.set10('MEMORY_ACCOUNTING_DEFAULT', memory_accounting_default)
- conf.set('STATUS_UNIT_FORMAT_DEFAULT', 'STATUS_UNIT_FORMAT_' + status_unit_format_default.to_upper())
- diff --git a/meson_options.txt b/meson_options.txt
- index 163c8df87d..b60261ac24 100644
- --- a/meson_options.txt
- +++ b/meson_options.txt
- @@ -444,6 +444,8 @@ option('ok-color', type : 'combo',
- 'highlight-cyan', 'highlight-white'],
- value : 'green',
- description: 'color of the "OK" status message')
- +option('urlify', type : 'boolean', value : 'true',
- + description : 'enable pager Hyperlink ANSI sequence support')
- option('fexecve', type : 'boolean', value : 'false',
- description : 'use fexecve() to spawn children')
-
- diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c
- index 137ba77b3a..7983c0a33a 100644
- --- a/src/shared/pretty-print.c
- +++ b/src/shared/pretty-print.c
- @@ -19,6 +19,7 @@
- #include "util.h"
-
- bool urlify_enabled(void) {
- +#if ENABLE_URLIFY
- static int cached_urlify_enabled = -1;
-
- if (cached_urlify_enabled < 0) {
- @@ -32,6 +33,9 @@ bool urlify_enabled(void) {
- }
-
- return cached_urlify_enabled;
- +#else
- + return 0;
- +#endif
- }
-
- int terminal_urlify(const char *url, const char *text, char **ret) {
- --
- 2.25.1
|
