From d5253b138582d89da2df93072f908807126ea954 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Tue, 24 Oct 2023 23:21:24 +0800 Subject: [PATCH] build: Make input-capture use declarative D-Bus code generation This was cleaned up, but a input capture rebased didn't port to the new way of declaring what D-Bus protocol files that should go through code generation. Part-of: --- src/meson.build | 12 +++++------- src/tests/meson.build | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/meson.build b/src/meson.build index 139b747e0..4be9b2bd4 100644 --- a/src/meson.build +++ b/src/meson.build @@ -924,6 +924,11 @@ dbus_interfaces = [ 'prefix': 'org.gnome.Mutter.', 'object_manager': true, }, + { + 'name': 'meta-dbus-input-capture', + 'interface': 'org.gnome.Mutter.InputCapture.xml', + 'prefix': 'org.gnome.Mutter', + }, { 'name': 'meta-dbus-input-mapping', 'interface': 'org.gnome.Mutter.InputMapping.xml', @@ -1036,13 +1041,6 @@ foreach dbus_interface: dbus_interfaces mutter_built_sources += dbus_sources endforeach -dbus_input_capture_built_sources = gnome.gdbus_codegen('meta-dbus-input-capture', - dbus_interfaces_dir / 'org.gnome.Mutter.InputCapture.xml', - interface_prefix: 'org.gnome.Mutter', - namespace: 'MetaDBus', -) -mutter_built_sources += dbus_input_capture_built_sources - wayland_protocol_server_headers = [] wayland_protocol_client_headers = [] wayland_protocol_sources = [] diff --git a/src/tests/meson.build b/src/tests/meson.build index de9e16efa..558105842 100644 --- a/src/tests/meson.build +++ b/src/tests/meson.build @@ -322,7 +322,7 @@ if have_native_tests 'input-capture-test-client.c', '../backends/meta-fd-source.c', '../backends/meta-fd-source.h', - dbus_input_capture_built_sources, + built_dbus_sources['meta-dbus-input-capture'], ], include_directories: tests_includes, c_args: [