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>
This commit is contained in:
Yi Zhao
2018-01-16 08:32:33 +08:00
committed by Richard Purdie
parent d39e961192
commit 8791364716
2 changed files with 2 additions and 37 deletions

View File

@@ -1,32 +0,0 @@
From 293452c963188666dae99521294f09a0cf9582e2 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 4 Aug 2017 16:01:11 +0300
Subject: [PATCH] Do not disable gobject introspection when cross-compiling.
Introspection does work fine for instance in Open Embedded,
one of the most prominent cross-compilation frameworks
(through qemu emulating target hardware), so let the user
decide if he wants the feature or not.
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 43cbfd9..8a32f26 100644
--- a/meson.build
+++ b/meson.build
@@ -147,7 +147,7 @@ root_dir = include_directories('.')
gnome = import('gnome')
gir = find_program('g-ir-scanner', required: false)
-build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable_introspection')
+build_gir = gir.found() and not get_option('disable_introspection')
subdir('json-glib')
--
2.13.2

View File

@@ -10,11 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
DEPENDS = "glib-2.0"
SRC_URI_append = " \
file://0001-Do-not-disable-gobject-introspection-when-cross-comp.patch \
"
SRC_URI[archive.md5sum] = "ff31e7d0594df44318e12facda3d086e"
SRC_URI[archive.sha256sum] = "fd55a9037d39e7a10f0db64309f5f0265fa32ec962bf85066087b83a2807f40a"
SRC_URI[archive.md5sum] = "35107e23a7bbbc70f31c34f7b9adf1c3"
SRC_URI[archive.sha256sum] = "2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase lib_package gobject-introspection gtk-doc manpages gettext