From 30cd96011759f80b723e00fdac05af001c15b01b Mon Sep 17 00:00:00 2001 From: Ophestra Date: Thu, 30 Jul 2026 07:15:51 +0900 Subject: [PATCH] internal/rosa/package/meson: respect CLICOLOR_FORCE Upstream had ticket and patch available since 2017, still unmerged and refuses to support the environment variable, so patch it in. Signed-off-by: Ophestra --- .../rosa/package/{meson.az => meson/package.az} | 1 + internal/rosa/package/meson/respect-colour.patch | 13 +++++++++++++ 2 files changed, 14 insertions(+) rename internal/rosa/package/{meson.az => meson/package.az} (96%) create mode 100644 internal/rosa/package/meson/respect-colour.patch diff --git a/internal/rosa/package/meson.az b/internal/rosa/package/meson/package.az similarity index 96% rename from internal/rosa/package/meson.az rename to internal/rosa/package/meson/package.az index 6d8b97f6..f4a3d17f 100644 --- a/internal/rosa/package/meson.az +++ b/internal/rosa/package/meson/package.az @@ -9,6 +9,7 @@ package meson { tag = version; checksum = "9AMilGxTOVqPA2DaGMASyuVs1BeTzgDZ0NH2oSYoRZk846ApvfOBa4cc18XEEK7M"; }; + patches = [ "respect-colour.patch" ]; env = [ "CMAKE_MAKE_PROGRAM=ninja", diff --git a/internal/rosa/package/meson/respect-colour.patch b/internal/rosa/package/meson/respect-colour.patch new file mode 100644 index 00000000..8a43ebfa --- /dev/null +++ b/internal/rosa/package/meson/respect-colour.patch @@ -0,0 +1,13 @@ +diff --git a/mesonbuild/mlog.py b/mesonbuild/mlog.py +index e1d998a5d..83d6cf9d2 100644 +--- a/mesonbuild/mlog.py ++++ b/mesonbuild/mlog.py +@@ -404,6 +404,8 @@ class _Logger: + _colorize_console = os.isatty(output.fileno()) and _windows_ansi() + else: + _colorize_console = os.isatty(output.fileno()) and os.environ.get('TERM', 'dumb') != 'dumb' ++ if os.environ.get('CLICOLOR_FORCE', '') != '': ++ _colorize_console = True + except Exception: + _colorize_console = False + output.colorize_console = _colorize_console # type: ignore