From 6b87ad5b08004554f08d2f68027908956f3795e1 Mon Sep 17 00:00:00 2001 From: Yi Zhao Date: Tue, 16 Jan 2018 08:32:33 +0800 Subject: json-glib: update to 1.4.2 Drop 0001-Do-not-disable-gobject-introspection-when-cross-comp.patch since it has been fixed upstream. Signed-off-by: Yi Zhao Signed-off-by: Richard Purdie --- ...ble-gobject-introspection-when-cross-comp.patch | 32 ----------------- meta/recipes-gnome/json-glib/json-glib_1.2.8.bb | 40 ---------------------- meta/recipes-gnome/json-glib/json-glib_1.4.2.bb | 37 ++++++++++++++++++++ 3 files changed, 37 insertions(+), 72 deletions(-) delete mode 100644 meta/recipes-gnome/json-glib/json-glib/0001-Do-not-disable-gobject-introspection-when-cross-comp.patch delete mode 100644 meta/recipes-gnome/json-glib/json-glib_1.2.8.bb create mode 100644 meta/recipes-gnome/json-glib/json-glib_1.4.2.bb 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 @@ -From 293452c963188666dae99521294f09a0cf9582e2 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -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 ---- - 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 - diff --git a/meta/recipes-gnome/json-glib/json-glib_1.2.8.bb b/meta/recipes-gnome/json-glib/json-glib_1.2.8.bb deleted file mode 100644 index 31912d150d..0000000000 --- a/meta/recipes-gnome/json-glib/json-glib_1.2.8.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "JSON-GLib implements a full JSON parser using GLib and GObject" -DESCRIPTION = "Use JSON-GLib it is possible to parse and generate valid JSON\ - data structures, using a DOM-like API. JSON-GLib also offers GObject \ -integration, providing the ability to serialize and deserialize GObject \ -instances to and from JSON data types." -HOMEPAGE = "http://live.gnome.org/JsonGlib" - -LICENSE = "LGPLv2.1" -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" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase lib_package gobject-introspection gtk-doc manpages gettext - -GTKDOC_ENABLE_FLAG = "-Denable-gtk-doc=true" -GTKDOC_DISABLE_FLAG = "-Denable-gtk-doc=false" - -GI_ENABLE_FLAG = "-Ddisable_introspection=false" -GI_DISABLE_FLAG = "-Ddisable_introspection=true" - -EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ - '${GTKDOC_DISABLE_FLAG}', d)} " -EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ - '${GI_DISABLE_FLAG}', d)} " - -PACKAGECONFIG[manpages] = "-Denable-man=true, -Denable-man=false, libxslt-native xmlto-native" - -do_install_append() { - # FIXME: these need to be provided via ptest - rm -rf ${D}${datadir}/installed-tests ${D}${libexecdir} -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-gnome/json-glib/json-glib_1.4.2.bb b/meta/recipes-gnome/json-glib/json-glib_1.4.2.bb new file mode 100644 index 0000000000..fad0a2df36 --- /dev/null +++ b/meta/recipes-gnome/json-glib/json-glib_1.4.2.bb @@ -0,0 +1,37 @@ +SUMMARY = "JSON-GLib implements a full JSON parser using GLib and GObject" +DESCRIPTION = "Use JSON-GLib it is possible to parse and generate valid JSON\ + data structures, using a DOM-like API. JSON-GLib also offers GObject \ +integration, providing the ability to serialize and deserialize GObject \ +instances to and from JSON data types." +HOMEPAGE = "http://live.gnome.org/JsonGlib" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" + +DEPENDS = "glib-2.0" + +SRC_URI[archive.md5sum] = "35107e23a7bbbc70f31c34f7b9adf1c3" +SRC_URI[archive.sha256sum] = "2d7709a44749c7318599a6829322e081915bdc73f5be5045882ed120bb686dc8" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase lib_package gobject-introspection gtk-doc manpages gettext + +GTKDOC_ENABLE_FLAG = "-Denable-gtk-doc=true" +GTKDOC_DISABLE_FLAG = "-Denable-gtk-doc=false" + +GI_ENABLE_FLAG = "-Ddisable_introspection=false" +GI_DISABLE_FLAG = "-Ddisable_introspection=true" + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ + '${GTKDOC_DISABLE_FLAG}', d)} " +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ + '${GI_DISABLE_FLAG}', d)} " + +PACKAGECONFIG[manpages] = "-Denable-man=true, -Denable-man=false, libxslt-native xmlto-native" + +do_install_append() { + # FIXME: these need to be provided via ptest + rm -rf ${D}${datadir}/installed-tests ${D}${libexecdir} +} + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg