diff options
-rw-r--r-- | meta/recipes-gnome/libadwaita/libadwaita/90d68222c184f681472d9d9ce2ae443ebd76386e.patch | 38 | ||||
-rw-r--r-- | meta/recipes-gnome/libadwaita/libadwaita_1.7.2.bb (renamed from meta/recipes-gnome/libadwaita/libadwaita_1.7.0.bb) | 3 |
2 files changed, 1 insertions, 40 deletions
diff --git a/meta/recipes-gnome/libadwaita/libadwaita/90d68222c184f681472d9d9ce2ae443ebd76386e.patch b/meta/recipes-gnome/libadwaita/libadwaita/90d68222c184f681472d9d9ce2ae443ebd76386e.patch deleted file mode 100644 index d3a3535013..0000000000 --- a/meta/recipes-gnome/libadwaita/libadwaita/90d68222c184f681472d9d9ce2ae443ebd76386e.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
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 | |||
6 | Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libadwaita/-/commit/90d68222c184f681472d9d9ce2ae443ebd76386e.patch] | ||
7 | |||
8 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
9 | --- | ||
10 | src/meson.build | 8 +++++++- | ||
11 | 1 file changed, 7 insertions(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/src/meson.build b/src/meson.build | ||
14 | index 90cecc6a1..585fe3aad 100644 | ||
15 | --- a/src/meson.build | ||
16 | +++ b/src/meson.build | ||
17 | @@ -450,11 +450,17 @@ meson.override_dependency(package_api_name, libadwaita_dep) | ||
18 | |||
19 | if introspection | ||
20 | |||
21 | + gir_dep = dependency('gobject-introspection-1.0') | ||
22 | libadwaita_gir_extra_args = [ | ||
23 | '--quiet', | ||
24 | - '--doc-format=gi-docgen', | ||
25 | '-DADWAITA_COMPILATION', | ||
26 | ] | ||
27 | + if gir_dep.version().version_compare('>=1.83.2') | ||
28 | + libadwaita_gir_extra_args += [ | ||
29 | + '--doc-format=gi-docgen', | ||
30 | + ] | ||
31 | + endif | ||
32 | + | ||
33 | |||
34 | libadwaita_gir = gnome.generate_gir(libadwaita, | ||
35 | sources: libadwaita_generated_headers + libadwaita_public_headers + libadwaita_public_sources, | ||
36 | -- | ||
37 | GitLab | ||
38 | |||
diff --git a/meta/recipes-gnome/libadwaita/libadwaita_1.7.0.bb b/meta/recipes-gnome/libadwaita/libadwaita_1.7.2.bb index 55985bf7cc..4dc583ab39 100644 --- a/meta/recipes-gnome/libadwaita/libadwaita_1.7.0.bb +++ b/meta/recipes-gnome/libadwaita/libadwaita_1.7.2.bb | |||
@@ -11,8 +11,7 @@ DEPENDS = " \ | |||
11 | 11 | ||
12 | inherit gnomebase gobject-introspection gi-docgen vala features_check | 12 | inherit gnomebase gobject-introspection gi-docgen vala features_check |
13 | 13 | ||
14 | SRC_URI[archive.sha256sum] = "58bf99b8a9f8b0171964de0ae741d01d5a09db3662134fa67541c99a8ed7dec0" | 14 | SRC_URI[archive.sha256sum] = "28ee2ff589c6debe47af9da7a56e37c97d6849e003918a4b223f690d25f960be" |
15 | SRC_URI += "file://90d68222c184f681472d9d9ce2ae443ebd76386e.patch" | ||
16 | 15 | ||
17 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | 16 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
18 | REQUIRED_DISTRO_FEATURES = "opengl" | 17 | REQUIRED_DISTRO_FEATURES = "opengl" |