mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 21:32:12 +02:00
gobject-introspection: update 1.76.1 -> 1.78.0
Remove patch as issue fixed upstream. (From OE-Core rev: 02aaabf79e472813139db8cbdff6dcf85e3065e9) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
b27d1171f3
commit
1488e069cc
@@ -1,4 +1,4 @@
|
||||
From 2c31944eabbb42a86a4ddaa2998a3b100a13138d Mon Sep 17 00:00:00 2001
|
||||
From aeb5532f8be42d42f4e8725ca42e239b36983a4d 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
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From b01b448613b76f9acefdfd89ee01686dc7a67df4 Mon Sep 17 00:00:00 2001
|
||||
From: Chen Qi <Qi.Chen@windriver.com>
|
||||
Date: Tue, 13 Jul 2021 02:05:11 -0700
|
||||
Subject: [PATCH] g-ir-tool-template.in: fix girdir path
|
||||
|
||||
In case gir_dir_prefix is set, it's possible that g-ir-scanner
|
||||
cannot find the .gir files. This is because that the girdir
|
||||
is set to gir_dir_prefix, which is wrong. It's not a prefix,
|
||||
it the actual gir dir.
|
||||
|
||||
Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/329]
|
||||
|
||||
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
|
||||
---
|
||||
tools/g-ir-tool-template.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in
|
||||
index 6e98f52e..62c07c31 100755
|
||||
--- a/tools/g-ir-tool-template.in
|
||||
+++ b/tools/g-ir-tool-template.in
|
||||
@@ -55,7 +55,7 @@ builtins.__dict__['DATADIR'] = datadir
|
||||
|
||||
# Respect gir_dir_prefix
|
||||
girdir = ''
|
||||
-girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@'))
|
||||
+girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@', 'gir-1.0'))
|
||||
builtins.__dict__['GIRDIR'] = [girdir]
|
||||
|
||||
# Again, relative paths first so that the installation prefix is relocatable
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -14,10 +14,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-g-ir-tool-template.in-fix-girdir-path.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "196178bf64345501dcdc4d8469b36aa6fe80489354efe71cb7cb8ab82a3738bf"
|
||||
SRC_URI[sha256sum] = "84f5bd2038bd52abbce74a639832c5b46a2d17e9c5a8ae14f9788e8516c04166"
|
||||
|
||||
SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"
|
||||
|
||||
Reference in New Issue
Block a user