mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
libadwaita: upgrade 1.7.0 -> 1.7.2
90d68222c184f681472d9d9ce2ae443ebd76386e.patch removed since it's included in 1.7.2 (From OE-Core rev: 96efd90646223c6de2fac2b01c17ff5b00c1f5bb) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
c7f33868ef
commit
b70c5d55c0
|
@ -1,38 +0,0 @@
|
|||
From 90d68222c184f681472d9d9ce2ae443ebd76386e Mon Sep 17 00:00:00 2001
|
||||
From: Maximiliano Sandoval <msandova@gnome.org>
|
||||
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 <f_l_k@t-online.de>
|
||||
---
|
||||
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
|
||||
|
|
@ -11,8 +11,7 @@ DEPENDS = " \
|
|||
|
||||
inherit gnomebase gobject-introspection gi-docgen vala features_check
|
||||
|
||||
SRC_URI[archive.sha256sum] = "58bf99b8a9f8b0171964de0ae741d01d5a09db3662134fa67541c99a8ed7dec0"
|
||||
SRC_URI += "file://90d68222c184f681472d9d9ce2ae443ebd76386e.patch"
|
||||
SRC_URI[archive.sha256sum] = "28ee2ff589c6debe47af9da7a56e37c97d6849e003918a4b223f690d25f960be"
|
||||
|
||||
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
|
||||
REQUIRED_DISTRO_FEATURES = "opengl"
|
Loading…
Reference in New Issue
Block a user