>
> No need to use it when we can actually specify the parameters in the
> actual gnome.generate_gir() function calls. We still keep it in the case
> of gnome.gtkdoc(), as there is no way to specify the libraries to link
> with.
>
> Signed-off-by: Eduardo Lima (Etrunko) <etrunko@xxxxxxxxxx>
In previous commit you used (title) "Remove" instead of "Drop".
Otherwise,
Acked-by: Frediano Ziglio <fziglio@xxxxxxxxxx>
Still CI is not succeeding.
Frediano
> ---
> doc/reference/meson.build | 4 ++--
> src/meson.build | 12 ++++--------
> 2 files changed, 6 insertions(+), 10 deletions(-)
>
> diff --git a/doc/reference/meson.build b/doc/reference/meson.build
> index 2ec333b..7cb94f3 100644
> --- a/doc/reference/meson.build
> +++ b/doc/reference/meson.build
> @@ -36,8 +36,7 @@ ignore_headers = [
> 'win-usb-dev.h',
> ]
>
> -spice_gtk_doc_dep = declare_dependency(include_directories:
> spice_gtk_include,
> - link_with : [spice_client_gtk_lib,
> spice_client_glib_lib])
> +spice_gtk_doc_dep = declare_dependency(link_with : [spice_client_gtk_lib,
> spice_client_glib_lib])
>
> gnome.gtkdoc('spice-gtk',
> content_files : ['spice-gtk-overrides.txt',
> 'spice-gtk-overrides.txt'],
> @@ -45,6 +44,7 @@ gnome.gtkdoc('spice-gtk',
> main_xml : 'spice-gtk-docs.xml',
> gobject_typesfile : files('spice-gtk.types'),
> ignore_headers : ignore_headers,
> + include_directories: spice_gtk_include,
> install : true,
> scan_args : ['--deprecated-guards="SPICE_DISABLE_DEPRECATED"',
> '--ignore-decorators="G_GNUC_INTERNAL"'],
> src_dir : join_paths(meson.source_root(), 'src'))
> diff --git a/src/meson.build b/src/meson.build
> index c777546..8c9199e 100644
> --- a/src/meson.build
> +++ b/src/meson.build
> @@ -206,17 +206,15 @@ spice_client_glib_dep = declare_dependency(sources :
> [spice_marshals[1], spice_c
> #
> # SpiceClientGLib-2.0.gir
> #
> -spice_client_glib_introspection_dep =
> declare_dependency(include_directories: spice_gtk_include,
> - link_with :
> spice_client_glib_lib)
> -
> spice_client_glib_gir = gnome.generate_gir(spice_client_glib_lib,
> build_by_default :
> spice_gtk_has_introspection,
> - dependencies :
> spice_client_glib_introspection_dep,
> export_packages :
> 'spice-client-glib-2.0',
> extra_args :
> ['--accept-unprefixed'],
> header : 'spice-client.h',
> includes : ['GObject-2.0',
> 'Gio-2.0'],
> identifier_prefix : 'Spice',
> + include_directories:
> spice_gtk_include,
> + link_with :
> spice_client_glib_lib,
> symbol_prefix : 'spice',
> install :
> spice_gtk_has_introspection,
> namespace : 'SpiceClientGLib',
> @@ -355,16 +353,14 @@ if spice_gtk_has_gtk
> #
> # SpiceClientGtk-3.0.gir
> #
> - spice_client_gtk_introspection_dep =
> declare_dependency(include_directories : spice_gtk_include,
> - link_with :
> [spice_client_gtk_lib, spice_client_glib_lib])
> -
> spice_client_gtk_gir = gnome.generate_gir(spice_client_gtk_lib,
> build_by_default :
> spice_gtk_has_introspection,
> - dependencies :
> spice_client_gtk_introspection_dep,
> export_packages :
> 'spice-client-gtk-3.0',
> extra_args :
> ['--accept-unprefixed'],
> header : 'spice-widget.h',
> includes : ['GObject-2.0',
> 'Gtk-3.0',
> spice_client_glib_gir[0]],
> + include_directories:
> spice_gtk_include,
> + link_with :
> spice_client_glib_lib,
> identifier_prefix : 'Spice',
> symbol_prefix : 'spice',
> install :
> spice_gtk_has_introspection,
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel