From d3f675a7088c419bc77ffaf3775ab1e09e9a1647 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Thu, 30 Jul 2026 08:50:57 +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. This also strips out the variable for test execution to work around buggy test suites like glib. Signed-off-by: Ophestra --- internal/rosa/package/meson/package.az | 5 ++++- internal/rosa/package/meson/test-strip-colour.patch | 13 +++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 internal/rosa/package/meson/test-strip-colour.patch diff --git a/internal/rosa/package/meson/package.az b/internal/rosa/package/meson/package.az index f4a3d17f..0af1b997 100644 --- a/internal/rosa/package/meson/package.az +++ b/internal/rosa/package/meson/package.az @@ -9,7 +9,10 @@ package meson { tag = version; checksum = "9AMilGxTOVqPA2DaGMASyuVs1BeTzgDZ0NH2oSYoRZk846ApvfOBa4cc18XEEK7M"; }; - patches = [ "respect-colour.patch" ]; + patches = [ + "respect-colour.patch", + "test-strip-colour.patch", + ]; env = [ "CMAKE_MAKE_PROGRAM=ninja", diff --git a/internal/rosa/package/meson/test-strip-colour.patch b/internal/rosa/package/meson/test-strip-colour.patch new file mode 100644 index 00000000..b7c8ad12 --- /dev/null +++ b/internal/rosa/package/meson/test-strip-colour.patch @@ -0,0 +1,13 @@ +diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py +index 0661fa529..34ab36aa9 100644 +--- a/mesonbuild/mtest.py ++++ b/mesonbuild/mtest.py +@@ -1817,6 +1817,8 @@ class TestHarness: + test.exe_wrapper and test.exe_wrapper.found()): + env['MESON_EXE_WRAPPER'] = join_args(test.exe_wrapper.get_command()) + env['MESON_TEST_ITERATION'] = str(iteration + 1) ++ env.pop('CLICOLOR_FORCE') ++ env.pop('FORCE_COLOR') + return SingleTestRunner(test, env, name, options) + + def process_test_result(self, result: TestRun) -> None: