summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/json-glib/json-glib
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2018-01-16 08:32:33 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-18 12:50:37 +0000
commit87913647168bc36d51dbf1082a5fc827d796dd45 (patch)
tree059e6de482cced72159c77ab17d46bfc9d350a82 /meta/recipes-gnome/json-glib/json-glib
parentd39e961192a750d50ef5dc43930dc1f8b3df0148 (diff)
downloadpoky-87913647168bc36d51dbf1082a5fc827d796dd45.tar.gz
json-glib: update to 1.4.2
Drop 0001-Do-not-disable-gobject-introspection-when-cross-comp.patch since it has been fixed upstream. (From OE-Core rev: 6b87ad5b08004554f08d2f68027908956f3795e1) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/json-glib/json-glib')
-rw-r--r--meta/recipes-gnome/json-glib/json-glib/0001-Do-not-disable-gobject-introspection-when-cross-comp.patch32
1 files changed, 0 insertions, 32 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 @@
1From 293452c963188666dae99521294f09a0cf9582e2 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 4 Aug 2017 16:01:11 +0300
4Subject: [PATCH] Do not disable gobject introspection when cross-compiling.
5
6Introspection does work fine for instance in Open Embedded,
7one of the most prominent cross-compilation frameworks
8(through qemu emulating target hardware), so let the user
9decide if he wants the feature or not.
10
11Upstream-Status: Pending
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13---
14 meson.build | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/meson.build b/meson.build
18index 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--
312.13.2
32