colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build,meson: Fix gdbus code generation

Browse Source 
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
This commit is contained in:
Iñigo Martínez
2022-01-26 16:37:57 +01:00
parent 86496bd326
commit 0ab9fc343f
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
libmm-glib/generated/meson.build
View File

@@ -63,12 +63,12 @@ gen_sources += gnome.mkenums(
fhead: '#include <ModemManager.h>\n#include "mm-errors-types.h"\n', fhead: '#include <ModemManager.h>\n#include "mm-errors-types.h"\n',
) )
gdbus_ifaces = [ gdbus_ifaces = {
['bearer', mm_ifaces_bearer, [], false], 'bearer': {'sources': mm_ifaces_bearer, 'object_manager': false},
['call', mm_ifaces_call, [], false], 'call': {'sources': mm_ifaces_call, 'object_manager': false},
['manager', mm_ifaces, [], false], 'manager': {'sources': mm_ifaces, 'object_manager': false},
['sim', mm_ifaces_sim, [], false], 'sim': {'sources': mm_ifaces_sim, 'object_manager': false},
] }
annotations = [ annotations = [
['org.freedesktop.ModemManager1.Modem.ModemCdma', 'org.gtk.GDBus.C.Name', 'ModemCdma'], ['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'], ['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']] 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( gdbus_sources = gnome.gdbus_codegen(
'mm-gdbus-' + gdbus_iface[0], 'mm-gdbus-' + name,
sources: gdbus_iface[1],
interface_prefix: 'org.freedesktop.ModemManager1.', interface_prefix: 'org.freedesktop.ModemManager1.',
namespace: 'MmGdbus', namespace: 'MmGdbus',
docbook: 'mm-gdbus-doc', docbook: 'mm-gdbus-doc',
annotations: gdbus_iface[2],
object_manager: gdbus_iface[3],
autocleanup: 'objects', autocleanup: 'objects',
kwargs: kwargs,
# FIXME: due to the lack of possibility to add `docbook targets` to the `expand_content_files`. # FIXME: due to the lack of possibility to add `docbook targets` to the `expand_content_files`.
build_by_default: true, build_by_default: true,
install_header: true, install_header: true,