diff options
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r-- | meta/recipes-gnome/json-glib/json-glib/0001-Do-not-disable-gobject-introspection-when-cross-comp.patch | 32 | ||||
-rw-r--r-- | meta/recipes-gnome/json-glib/json-glib_1.4.2.bb (renamed from meta/recipes-gnome/json-glib/json-glib_1.2.8.bb) | 7 |
2 files changed, 2 insertions, 37 deletions
diff --git a/meta/recipes-gnome/json-glib/json-glib/0001-Do-not-disable-gobject-introspection-when-cross-comp.patch b/meta/recipes-gnome/json-glib/json-glib/0001-Do-not-disable-gobject-introspection-when-cross-comp.patch deleted file mode 100644 index 849bb9d316..0000000000 --- a/meta/recipes-gnome/json-glib/json-glib/0001-Do-not-disable-gobject-introspection-when-cross-comp.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 293452c963188666dae99521294f09a0cf9582e2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 4 Aug 2017 16:01:11 +0300 | ||
4 | Subject: [PATCH] Do not disable gobject introspection when cross-compiling. | ||
5 | |||
6 | Introspection does work fine for instance in Open Embedded, | ||
7 | one of the most prominent cross-compilation frameworks | ||
8 | (through qemu emulating target hardware), so let the user | ||
9 | decide if he wants the feature or not. | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
13 | --- | ||
14 | meson.build | 2 +- | ||
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/meson.build b/meson.build | ||
18 | index 43cbfd9..8a32f26 100644 | ||
19 | --- a/meson.build | ||
20 | +++ b/meson.build | ||
21 | @@ -147,7 +147,7 @@ root_dir = include_directories('.') | ||
22 | |||
23 | gnome = import('gnome') | ||
24 | gir = find_program('g-ir-scanner', required: false) | ||
25 | -build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable_introspection') | ||
26 | +build_gir = gir.found() and not get_option('disable_introspection') | ||
27 | |||
28 | subdir('json-glib') | ||
29 | |||
30 | -- | ||
31 | 2.13.2 | ||
32 | |||
diff --git a/meta/recipes-gnome/json-glib/json-glib_1.2.8.bb b/meta/recipes-gnome/json-glib/json-glib_1.4.2.bb index 31912d150d..fad0a2df36 100644 --- a/meta/recipes-gnome/json-glib/json-glib_1.2.8.bb +++ b/meta/recipes-gnome/json-glib/json-glib_1.4.2.bb | |||
@@ -10,11 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" | |||
10 | 10 | ||
11 | DEPENDS = "glib-2.0" | 11 | DEPENDS = "glib-2.0" |
12 | 12 | ||
13 | SRC_URI_append = " \ | 13 | SRC_URI[archive.md5sum] = "35107e23a7bbbc70f31c34f7b9adf1c3" |
14 | file://0001-Do-not-disable-gobject-introspection-when-cross-comp.patch \ | 14 | SRC_URI[archive.sha256sum] = "2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8" |
15 | " | ||
16 | SRC_URI[archive.md5sum] = "ff31e7d0594df44318e12facda3d086e" | ||
17 | SRC_URI[archive.sha256sum] = "fd55a9037d39e7a10f0db64309f5f0265fa32ec962bf85066087b83a2807f40a" | ||
18 | 15 | ||
19 | GNOMEBASEBUILDCLASS = "meson" | 16 | GNOMEBASEBUILDCLASS = "meson" |
20 | inherit gnomebase lib_package gobject-introspection gtk-doc manpages gettext | 17 | inherit gnomebase lib_package gobject-introspection gtk-doc manpages gettext |