summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--meta/recipes-gnome/json-glib/json-glib/0001-Do-not-disable-gobject-introspection-when-cross-comp.patch32
-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 @@
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
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
11DEPENDS = "glib-2.0" 11DEPENDS = "glib-2.0"
12 12
13SRC_URI_append = " \ 13SRC_URI[archive.md5sum] = "35107e23a7bbbc70f31c34f7b9adf1c3"
14 file://0001-Do-not-disable-gobject-introspection-when-cross-comp.patch \ 14SRC_URI[archive.sha256sum] = "2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8"
15 "
16SRC_URI[archive.md5sum] = "ff31e7d0594df44318e12facda3d086e"
17SRC_URI[archive.sha256sum] = "fd55a9037d39e7a10f0db64309f5f0265fa32ec962bf85066087b83a2807f40a"
18 15
19GNOMEBASEBUILDCLASS = "meson" 16GNOMEBASEBUILDCLASS = "meson"
20inherit gnomebase lib_package gobject-introspection gtk-doc manpages gettext 17inherit gnomebase lib_package gobject-introspection gtk-doc manpages gettext