90d68222c184f681472d9d9ce2ae443ebd76386e.patch 1.2 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From 90d68222c184f681472d9d9ce2ae443ebd76386e Mon Sep 17 00:00:00 2001
  2. From: Maximiliano Sandoval <msandova@gnome.org>
  3. Date: Sat, 15 Mar 2025 10:47:31 +0100
  4. Subject: [PATCH] meson: Check g-i before using --doc-format arg
  5. Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libadwaita/-/commit/90d68222c184f681472d9d9ce2ae443ebd76386e.patch]
  6. Signed-off-by: Markus Volk <f_l_k@t-online.de>
  7. ---
  8. src/meson.build | 8 +++++++-
  9. 1 file changed, 7 insertions(+), 1 deletion(-)
  10. diff --git a/src/meson.build b/src/meson.build
  11. index 90cecc6a1..585fe3aad 100644
  12. --- a/src/meson.build
  13. +++ b/src/meson.build
  14. @@ -450,11 +450,17 @@ meson.override_dependency(package_api_name, libadwaita_dep)
  15. if introspection
  16. + gir_dep = dependency('gobject-introspection-1.0')
  17. libadwaita_gir_extra_args = [
  18. '--quiet',
  19. - '--doc-format=gi-docgen',
  20. '-DADWAITA_COMPILATION',
  21. ]
  22. + if gir_dep.version().version_compare('>=1.83.2')
  23. + libadwaita_gir_extra_args += [
  24. + '--doc-format=gi-docgen',
  25. + ]
  26. + endif
  27. +
  28. libadwaita_gir = gnome.generate_gir(libadwaita,
  29. sources: libadwaita_generated_headers + libadwaita_public_headers + libadwaita_public_sources,
  30. --
  31. GitLab