diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2023-05-03 19:23:50 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2023-05-03 21:24:55 -0700 |
commit | 36b1cd08bbcf13f5c1b721b9ac63dfb377d47bcf (patch) | |
tree | 29b2382cd31c3f4d06a7c8a457cfaadc452f1f86 /meta-oe/recipes-navigation | |
parent | 3d2c02af61d18768239114ee9f1999df8cd47db7 (diff) | |
download | meta-openembedded-36b1cd08bbcf13f5c1b721b9ac63dfb377d47bcf.tar.gz |
geoclue: fix build without gobject-introspection-data
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation')
-rw-r--r-- | meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch | 30 | ||||
-rw-r--r-- | meta-oe/recipes-navigation/geoclue/geoclue_2.7.0.bb | 4 |
2 files changed, 33 insertions, 1 deletions
diff --git a/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch b/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch new file mode 100644 index 000000000..18e718564 --- /dev/null +++ b/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From 6c434bdd31d674f85a82cb83248571813c7a37ff Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Wed, 3 May 2023 18:06:46 +0200 | ||
4 | Subject: [PATCH] libgeoclue: don't try to use g-ir-scanner when introspection | ||
5 | isn't enabled | ||
6 | |||
7 | * it finds target g-ir-scanner, so gir is found(), but when it tries to call it, it fails: | ||
8 | http://errors.yoctoproject.org/Errors/Details/702778/ | ||
9 | geoclue/2.7.0-r0/recipe-sysroot/usr/bin/g-ir-scanner-wrapper: line 5: g-ir-scanner: command not found | ||
10 | |||
11 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
12 | --- | ||
13 | Upstream-Status: Pending | ||
14 | |||
15 | libgeoclue/meson.build | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/libgeoclue/meson.build b/libgeoclue/meson.build | ||
19 | index 5f05dad..7ed06a1 100644 | ||
20 | --- a/libgeoclue/meson.build | ||
21 | +++ b/libgeoclue/meson.build | ||
22 | @@ -77,7 +77,7 @@ gir_sources = [ libgeoclue_sources, | ||
23 | libgeoclue_headers, | ||
24 | libgeoclue_public_api_gen_sources[1] ] | ||
25 | |||
26 | -if gir.found() | ||
27 | +if gir.found() and get_option('introspection') | ||
28 | geo_gir = gnome.generate_gir(libgeoclue, | ||
29 | sources: gir_sources, | ||
30 | namespace: 'Geoclue', | ||
diff --git a/meta-oe/recipes-navigation/geoclue/geoclue_2.7.0.bb b/meta-oe/recipes-navigation/geoclue/geoclue_2.7.0.bb index f7039b591..d05a30945 100644 --- a/meta-oe/recipes-navigation/geoclue/geoclue_2.7.0.bb +++ b/meta-oe/recipes-navigation/geoclue/geoclue_2.7.0.bb | |||
@@ -13,7 +13,9 @@ DEPENDS = "glib-2.0 dbus json-glib libsoup-3.0 intltool-native" | |||
13 | inherit meson pkgconfig gtk-doc gobject-introspection vala useradd | 13 | inherit meson pkgconfig gtk-doc gobject-introspection vala useradd |
14 | 14 | ||
15 | SRCREV = "bbfb6289dedb88cb8155d9f6868787d5432e1f90" | 15 | SRCREV = "bbfb6289dedb88cb8155d9f6868787d5432e1f90" |
16 | SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;nobranch=1" | 16 | SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;nobranch=1 \ |
17 | file://0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch \ | ||
18 | " | ||
17 | 19 | ||
18 | S = "${WORKDIR}/git" | 20 | S = "${WORKDIR}/git" |
19 | 21 | ||