diff --git a/meta/recipes-gnome/libadwaita/libadwaita/90d68222c184f681472d9d9ce2ae443ebd76386e.patch b/meta/recipes-gnome/libadwaita/libadwaita/90d68222c184f681472d9d9ce2ae443ebd76386e.patch new file mode 100644 index 0000000000..d3a3535013 --- /dev/null +++ b/meta/recipes-gnome/libadwaita/libadwaita/90d68222c184f681472d9d9ce2ae443ebd76386e.patch @@ -0,0 +1,38 @@ +From 90d68222c184f681472d9d9ce2ae443ebd76386e Mon Sep 17 00:00:00 2001 +From: Maximiliano Sandoval +Date: Sat, 15 Mar 2025 10:47:31 +0100 +Subject: [PATCH] meson: Check g-i before using --doc-format arg + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libadwaita/-/commit/90d68222c184f681472d9d9ce2ae443ebd76386e.patch] + +Signed-off-by: Markus Volk +--- + src/meson.build | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/meson.build b/src/meson.build +index 90cecc6a1..585fe3aad 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -450,11 +450,17 @@ meson.override_dependency(package_api_name, libadwaita_dep) + + if introspection + ++ gir_dep = dependency('gobject-introspection-1.0') + libadwaita_gir_extra_args = [ + '--quiet', +- '--doc-format=gi-docgen', + '-DADWAITA_COMPILATION', + ] ++ if gir_dep.version().version_compare('>=1.83.2') ++ libadwaita_gir_extra_args += [ ++ '--doc-format=gi-docgen', ++ ] ++ endif ++ + + libadwaita_gir = gnome.generate_gir(libadwaita, + sources: libadwaita_generated_headers + libadwaita_public_headers + libadwaita_public_sources, +-- +GitLab + diff --git a/meta/recipes-gnome/libadwaita/libadwaita_1.6.4.bb b/meta/recipes-gnome/libadwaita/libadwaita_1.7.0.bb similarity index 82% rename from meta/recipes-gnome/libadwaita/libadwaita_1.6.4.bb rename to meta/recipes-gnome/libadwaita/libadwaita_1.7.0.bb index a8cf642ff0..55985bf7cc 100644 --- a/meta/recipes-gnome/libadwaita/libadwaita_1.6.4.bb +++ b/meta/recipes-gnome/libadwaita/libadwaita_1.7.0.bb @@ -11,7 +11,8 @@ DEPENDS = " \ inherit gnomebase gobject-introspection gi-docgen vala features_check -SRC_URI[archive.sha256sum] = "1011a5a93dc3b87e82da19910d7fab01a3b9d7fcb0b09751babb476eedb3d9a3" +SRC_URI[archive.sha256sum] = "58bf99b8a9f8b0171964de0ae741d01d5a09db3662134fa67541c99a8ed7dec0" +SRC_URI += "file://90d68222c184f681472d9d9ce2ae443ebd76386e.patch" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" REQUIRED_DISTRO_FEATURES = "opengl"