diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-Relocate-the-repository-directory-for-native-builds.patch | 2 | ||||
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-exclude-girepo_dep-if-introspection-data.patch | 25 | ||||
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb (renamed from meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb) | 3 |
3 files changed, 2 insertions, 28 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 185ebc154a..9071245a84 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 @@ | |||
1 | From 41c3ee549787333a073a3ce6303efef625c74dce Mon Sep 17 00:00:00 2001 | 1 | From 5c606356523431769dffb02fffd2fbca8fb20232 Mon Sep 17 00:00:00 2001 |
2 | From: Sascha Silbe <x-yo17@se-silbe.de> | 2 | From: Sascha Silbe <x-yo17@se-silbe.de> |
3 | Date: Fri, 8 Jun 2018 13:55:10 +0200 | 3 | Date: Fri, 8 Jun 2018 13:55:10 +0200 |
4 | Subject: [PATCH] Relocate the repository directory for native builds | 4 | Subject: [PATCH] Relocate the repository directory for native builds |
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-exclude-girepo_dep-if-introspection-data.patch b/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-exclude-girepo_dep-if-introspection-data.patch deleted file mode 100644 index 8fba0124cf..0000000000 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection/0001-meson.build-exclude-girepo_dep-if-introspection-data.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From ef5446af0ddad6a341b47957097ac40c6cb5e6d3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 20 Oct 2020 22:40:14 +0200 | ||
4 | Subject: [PATCH] meson.build: exclude girepo_dep if introspection data is | ||
5 | disabled | ||
6 | |||
7 | Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/248] | ||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | --- | ||
10 | meson.build | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/meson.build b/meson.build | ||
14 | index 14af2b1..a3c27c3 100644 | ||
15 | --- a/meson.build | ||
16 | +++ b/meson.build | ||
17 | @@ -283,7 +283,7 @@ pkg.generate( | ||
18 | # FIXME: meson.override_dependency() and declare_dependency()'s variable arguments | ||
19 | # are new in Meson 0.54.0, older versions of Meson won't be able to use g-i as | ||
20 | # subproject anyway | ||
21 | -if meson.version().version_compare('>=0.54.0') | ||
22 | +if meson.version().version_compare('>=0.54.0') and get_option('build_introspection_data') == true | ||
23 | girepo_dep = declare_dependency( | ||
24 | sources: typelibs, | ||
25 | dependencies: girepo_dep, | ||
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb index ebac8d3a43..4c986a574f 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.66.1.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.68.0.bb | |||
@@ -15,10 +15,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c434e8128a68bedd59b80b2ac1eb1c4a \ | |||
15 | 15 | ||
16 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ | 16 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-${PV}.tar.xz \ |
17 | file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ | 17 | file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ |
18 | file://0001-meson.build-exclude-girepo_dep-if-introspection-data.patch \ | ||
19 | " | 18 | " |
20 | 19 | ||
21 | SRC_URI[sha256sum] = "dd44a55ee5f426ea22b6b89624708f9e8d53f5cc94e5485c15c87cb30e06161d" | 20 | SRC_URI[sha256sum] = "d229242481a201b84a0c66716de1752bca41db4133672cfcfb37c93eb6e54a27" |
22 | 21 | ||
23 | SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" | 22 | SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" |
24 | 23 | ||