diff options
| author | Victor Kareh <[email protected]> | 2026-06-25 15:21:05 -0400 |
|---|---|---|
| committer | Victor Kareh <[email protected]> | 2026-06-26 07:57:58 -0400 |
| commit | bef4b119077a0f30adc844fcfa53ea1cdd655d74 (patch) | |
| tree | 36c5c97a35d1e72580c1071c9552e7a9178733c2 | |
| parent | 674d373387933a884785b478df1ada591ddcaca1 (diff) | |
| download | mate-menus-master.tar.bz2 mate-menus-master.tar.xz | |
PR #120 fixed the autotools build to conditionally include GioUnix-2.0
in GIR scanning when gio-unix-2.0 >= 2.80 is present, but the meson
build was not updated. Apply the equivalent fix.
| -rw-r--r-- | libmenu/meson.build | 2 | ||||
| -rw-r--r-- | meson.build | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libmenu/meson.build b/libmenu/meson.build index 5fbc93e..0f3448b 100644 --- a/libmenu/meson.build +++ b/libmenu/meson.build @@ -55,7 +55,7 @@ if get_option('introspection') export_packages: 'libmatemenu', identifier_prefix : 'MateMenu', link_with: libmate_menu, - includes : ['Gio-2.0'], + includes : ['Gio-2.0'] + (gio_unix_280_dep.found() ? ['GioUnix-2.0'] : []), install : true, install_dir_gir: girdir, install_dir_typelib: typelibdir, diff --git a/meson.build b/meson.build index a0e7e52..97de3a5 100644 --- a/meson.build +++ b/meson.build @@ -152,6 +152,10 @@ endif gio_req = '>= 2.50.0' gio_unix_dep = dependency('gio-unix-2.0', version: gio_req) +# Under GIO >= 2.80 we need to include GioUnix-2.0 in GIR scanning, see +# https://gitlab.gnome.org/GNOME/gnome-menus/-/commit/fe1eca74e1b6d75941d56088ea2aeca97b639926 +gio_unix_280_dep = dependency('gio-unix-2.0', version: '>= 2.80.0', required: false) + configure_file( output: 'config.h', configuration: config_h |