summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/gobject-introspection
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2023-09-17 11:38:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-09-18 08:53:10 +0100
commit1488e069cc205a1694589ee6979e8d9cb6e9bb94 (patch)
treec611e68289c47d51d35e71dab632b2bca7d26eb1 /meta/recipes-gnome/gobject-introspection
parentb27d1171f37fee38b85bcae62abb01ccf27c1c68 (diff)
downloadpoky-1488e069cc205a1694589ee6979e8d9cb6e9bb94.tar.gz
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>
Diffstat (limited to 'meta/recipes-gnome/gobject-introspection')
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch2
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch33
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection_1.78.0.bb (renamed from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.76.1.bb)3
3 files changed, 2 insertions, 36 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
index 9ba8bcfd71..c9e1afffd0 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch
@@ -1,4 +1,4 @@
1From 2c31944eabbb42a86a4ddaa2998a3b100a13138d Mon Sep 17 00:00:00 2001 1From aeb5532f8be42d42f4e8725ca42e239b36983a4d Mon Sep 17 00:00:00 2001
2From: Sascha Silbe <x-yo17@se-silbe.de> 2From: Sascha Silbe <x-yo17@se-silbe.de>
3Date: Fri, 8 Jun 2018 13:55:10 +0200 3Date: Fri, 8 Jun 2018 13:55:10 +0200
4Subject: [PATCH] Relocate the repository directory for native builds 4Subject: [PATCH] Relocate the repository directory for native builds
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch
deleted file mode 100644
index 5c78649de4..0000000000
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-g-ir-tool-template.in-fix-girdir-path.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From b01b448613b76f9acefdfd89ee01686dc7a67df4 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Tue, 13 Jul 2021 02:05:11 -0700
4Subject: [PATCH] g-ir-tool-template.in: fix girdir path
5
6In case gir_dir_prefix is set, it's possible that g-ir-scanner
7cannot find the .gir files. This is because that the girdir
8is set to gir_dir_prefix, which is wrong. It's not a prefix,
9it the actual gir dir.
10
11Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/329]
12
13Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
14---
15 tools/g-ir-tool-template.in | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in
19index 6e98f52e..62c07c31 100755
20--- a/tools/g-ir-tool-template.in
21+++ b/tools/g-ir-tool-template.in
22@@ -55,7 +55,7 @@ builtins.__dict__['DATADIR'] = datadir
23
24 # Respect gir_dir_prefix
25 girdir = ''
26-girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@'))
27+girdir = os.path.abspath(os.path.join(filedir, '..', '@gir_dir_prefix@', 'gir-1.0'))
28 builtins.__dict__['GIRDIR'] = [girdir]
29
30 # Again, relative paths first so that the installation prefix is relocatable
31--
322.30.2
33
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.76.1.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.78.0.bb
index 6d00633825..42b0979aaf 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.76.1.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.78.0.bb
@@ -14,10 +14,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \
14 " 14 "
15 15
16SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ 16SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \
17 file://0001-g-ir-tool-template.in-fix-girdir-path.patch \
18 " 17 "
19 18
20SRC_URI[sha256sum] = "196178bf64345501dcdc4d8469b36aa6fe80489354efe71cb7cb8ab82a3738bf" 19SRC_URI[sha256sum] = "84f5bd2038bd52abbce74a639832c5b46a2d17e9c5a8ae14f9788e8516c04166"
21 20
22SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" 21SRC_URI:append:class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch"
23 22