diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2022-01-26 16:37:57 +0100 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2022-01-26 16:37:57 +0100 |
| commit | 0ab9fc343fdc21235bc24c80c78a13b1ea078208 (patch) | |
| tree | 1e78ec2c09e0e4ac0a86ed7a591d23d73dc36a09 /libmm-glib/generated | |
| parent | 86496bd326f2ec139101049fb19a10b255ee8ad5 (diff) | |
build,meson: Fix gdbus code generation
Changes on meson 0.61 makes the build to fail due to empty
annotations in some gdbus code generation[0].
Taking advantage of `kwargs` support, it has been changed to avoid
the issue.
Fixes #499
[0] https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/499
Diffstat (limited to 'libmm-glib/generated')
| -rw-r--r-- | libmm-glib/generated/meson.build | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/libmm-glib/generated/meson.build b/libmm-glib/generated/meson.build index a44115e5..798fd240 100644 --- a/libmm-glib/generated/meson.build +++ b/libmm-glib/generated/meson.build @@ -63,12 +63,12 @@ gen_sources += gnome.mkenums( fhead: '#include <ModemManager.h>\n#include "mm-errors-types.h"\n', ) -gdbus_ifaces = [ - ['bearer', mm_ifaces_bearer, [], false], - ['call', mm_ifaces_call, [], false], - ['manager', mm_ifaces, [], false], - ['sim', mm_ifaces_sim, [], false], -] +gdbus_ifaces = { + 'bearer': {'sources': mm_ifaces_bearer, 'object_manager': false}, + 'call': {'sources': mm_ifaces_call, 'object_manager': false}, + 'manager': {'sources': mm_ifaces, 'object_manager': false}, + 'sim': {'sources': mm_ifaces_sim, 'object_manager': false}, +} annotations = [ ['org.freedesktop.ModemManager1.Modem.ModemCdma', 'org.gtk.GDBus.C.Name', 'ModemCdma'], @@ -77,22 +77,20 @@ annotations = [ ['org.freedesktop.ModemManager1.Modem.Modem3gpp.ProfileManager', 'org.gtk.GDBus.C.Name', 'Modem3gppProfileManager'], ] -gdbus_ifaces += [['modem', mm_ifaces_modem, annotations, true]] +gdbus_ifaces += {'modem': {'sources': mm_ifaces_modem, 'annotations': annotations, 'object_manager': true}} annotations = [['org.freedesktop.ModemManager1.Sms:Data', 'org.gtk.GDBus.C.ForceGVariant', 'True']] -gdbus_ifaces += [['sms', mm_ifaces_sms, annotations, false]] +gdbus_ifaces += {'sms': {'sources': mm_ifaces_sms, 'annotations': annotations, 'object_manager': false}} -foreach gdbus_iface: gdbus_ifaces +foreach name, kwargs: gdbus_ifaces gdbus_sources = gnome.gdbus_codegen( - 'mm-gdbus-' + gdbus_iface[0], - sources: gdbus_iface[1], + 'mm-gdbus-' + name, interface_prefix: 'org.freedesktop.ModemManager1.', namespace: 'MmGdbus', docbook: 'mm-gdbus-doc', - annotations: gdbus_iface[2], - object_manager: gdbus_iface[3], autocleanup: 'objects', + kwargs: kwargs, # FIXME: due to the lack of possibility to add `docbook targets` to the `expand_content_files`. build_by_default: true, install_header: true, |