gobject-introspection: upgrade 1.66.1 -> 1.68.0

(From OE-Core rev: 803bbae963d59a91fbd3c517003f9972fc9bf7e8)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2021-05-05 17:18:23 +02:00
committed by Richard Purdie
parent 05904ebc14
commit 6c1dd9dede
3 changed files with 2 additions and 28 deletions

View File

@@ -1,4 +1,4 @@
From 41c3ee549787333a073a3ce6303efef625c74dce Mon Sep 17 00:00:00 2001
From 5c606356523431769dffb02fffd2fbca8fb20232 Mon Sep 17 00:00:00 2001
From: Sascha Silbe <x-yo17@se-silbe.de>
Date: Fri, 8 Jun 2018 13:55:10 +0200
Subject: [PATCH] Relocate the repository directory for native builds

View File

@@ -1,25 +0,0 @@
From ef5446af0ddad6a341b47957097ac40c6cb5e6d3 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 20 Oct 2020 22:40:14 +0200
Subject: [PATCH] meson.build: exclude girepo_dep if introspection data is
disabled
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/248]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 14af2b1..a3c27c3 100644
--- a/meson.build
+++ b/meson.build
@@ -283,7 +283,7 @@ pkg.generate(
# FIXME: meson.override_dependency() and declare_dependency()'s variable arguments
# are new in Meson 0.54.0, older versions of Meson won't be able to use g-i as
# subproject anyway
-if meson.version().version_compare('>=0.54.0')
+if meson.version().version_compare('>=0.54.0') and get_option('build_introspection_data') == true
girepo_dep = declare_dependency(
sources: typelibs,
dependencies: girepo_dep,

View File

@@ -15,10 +15,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \
SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \
file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \
file://0001-meson.build-exclude-girepo_dep-if-introspection-data.patch \
"
SRC_URI[sha256sum] = "dd44a55ee5f426ea22b6b89624708f9e8d53f5cc94e5485c15c87cb30e06161d"
SRC_URI[sha256sum] = "d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27"
SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"