From 505449f16588471b84ab8f18fe42ae4255a9cc39 Mon Sep 17 00:00:00 2001 From: deepend Date: Wed, 18 Feb 2026 11:53:12 -0700 Subject: [PATCH] =?UTF-8?q?Updated=20Meson=E2=80=99s=20DBus=20dependency?= =?UTF-8?q?=20gating=20so=20that=20on=20macOS=20(darwin)=20with=20-Ddbus?= =?UTF-8?q?=3Dauto,=20dbus-glib-1=20is=20treated=20as=20optional=20instead?= =?UTF-8?q?=20of=20hard-required.=20This=20prevents=20configure-time=20fai?= =?UTF-8?q?lure=20in=20Homebrew=20CI=20environments=20where=20dbus-glib-1?= =?UTF-8?q?=20is=20absent,=20while=20preserving=20strict=20behavior=20when?= =?UTF-8?q?=20-Ddbus=3Denabled=20is=20explicitly=20set.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Kept the existing libcanberra and surrounding dependency flow intact; only the required: logic for dbus-glib-1 was adjusted. --- meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index ea3bea56..956f3202 100644 --- a/meson.build +++ b/meson.build @@ -18,7 +18,11 @@ libgmodule_dep = dependency('gmodule-2.0') libcanberra_dep = dependency('libcanberra', version: '>= 0.22', required: get_option('libcanberra')) -dbus_glib_dep = dependency('dbus-glib-1', required: get_option('dbus')) +dbus_required = get_option('dbus') +if host_machine.system() == 'darwin' and dbus_required.auto() + dbus_required = false +endif +dbus_glib_dep = dependency('dbus-glib-1', required: dbus_required) global_deps = [] if cc.get_id() == 'msvc'