From caa43d0173a5e2c46d85a53d31c96ca65b326231 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 18 Feb 2021 12:24:13 +0800 Subject: json-glib: upgrade 1.6.0 -> 1.6.2 (From OE-Core rev: eae6582575c5b1853b247820c0e354191fb44d4e) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...son-enum-types.c.in-fix-build-reproducibi.patch | 30 ------------------- meta/recipes-gnome/json-glib/json-glib_1.6.0.bb | 34 ---------------------- meta/recipes-gnome/json-glib/json-glib_1.6.2.bb | 33 +++++++++++++++++++++ 3 files changed, 33 insertions(+), 64 deletions(-) delete mode 100644 meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch delete mode 100644 meta/recipes-gnome/json-glib/json-glib_1.6.0.bb create mode 100644 meta/recipes-gnome/json-glib/json-glib_1.6.2.bb (limited to 'meta/recipes-gnome') diff --git a/meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch b/meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch deleted file mode 100644 index 0eb7244186..0000000000 --- a/meta/recipes-gnome/json-glib/json-glib/0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0f06c4cb4a57083c08312144b03c8346cf620be6 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 30 Oct 2020 22:15:29 +0000 -Subject: [PATCH] json-glib/json-enum-types.c.in: fix build reproducibility - -Changes the comment and include to reference the file basename -instead of the full path. This ensures that the generated file is -reproducible when it is included in source packages meant for debugging. - -Upstream-Status: Backport [6f3842abd5dff68b6ee5f2ef48a4ebf1cbebf434] -Signed-off-by: Alexander Kanavin ---- - json-glib/json-enum-types.c.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/json-glib/json-enum-types.c.in b/json-glib/json-enum-types.c.in -index da07c46..7b39290 100644 ---- a/json-glib/json-enum-types.c.in -+++ b/json-glib/json-enum-types.c.in -@@ -9,8 +9,8 @@ - - /*** BEGIN file-production ***/ - --/* enumerations from "@filename@" */ --#include "@filename@" -+/* enumerations from "@basename@" */ -+#include "@basename@" - - /*** END file-production ***/ - diff --git a/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb b/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb deleted file mode 100644 index 59b0609900..0000000000 --- a/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb +++ /dev/null @@ -1,34 +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 = "https://wiki.gnome.org/Projects/JsonGlib" -BUGTRACKER = "https://gitlab.gnome.org/GNOME/json-glib/issues" - -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" - -DEPENDS = "glib-2.0" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase lib_package gobject-introspection gtk-doc gettext ptest-gnome manpages upstream-version-is-even -GIR_MESON_ENABLE_FLAG = 'enabled' -GIR_MESON_DISABLE_FLAG = 'disabled' -GTKDOC_MESON_OPTION = "gtk_doc" -GTKDOC_MESON_ENABLE_FLAG = 'enabled' -GTKDOC_MESON_DISABLE_FLAG = 'disabled' - -SRC_URI += "file://run-ptest \ - file://0001-json-glib-json-enum-types.c.in-fix-build-reproducibi.patch" -SRC_URI[archive.sha256sum] = "0d7c67602c4161ea7070fab6c5823afd9bd7f7bc955f652a50d3753b08494e73" - -PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" -PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native" -PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" - -BBCLASSEXTEND = "native nativesdk" - -# Currently it's not possible to disable gettext in Meson, so we need to force -# this back on. -USE_NLS_class-native = "yes" diff --git a/meta/recipes-gnome/json-glib/json-glib_1.6.2.bb b/meta/recipes-gnome/json-glib/json-glib_1.6.2.bb new file mode 100644 index 0000000000..fdf3b245e8 --- /dev/null +++ b/meta/recipes-gnome/json-glib/json-glib_1.6.2.bb @@ -0,0 +1,33 @@ +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 = "https://wiki.gnome.org/Projects/JsonGlib" +BUGTRACKER = "https://gitlab.gnome.org/GNOME/json-glib/issues" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" + +DEPENDS = "glib-2.0" + +GNOMEBASEBUILDCLASS = "meson" +inherit gnomebase lib_package gobject-introspection gtk-doc gettext ptest-gnome manpages upstream-version-is-even +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_OPTION = "gtk_doc" +GTKDOC_MESON_ENABLE_FLAG = 'enabled' +GTKDOC_MESON_DISABLE_FLAG = 'disabled' + +SRC_URI += " file://run-ptest" +SRC_URI[archive.sha256sum] = "a33d66c6d038bda46b910c6c6d59c4e15db014e363dc997a0414c2e07d134f24" + +PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native" +PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" + +BBCLASSEXTEND = "native nativesdk" + +# Currently it's not possible to disable gettext in Meson, so we need to force +# this back on. +USE_NLS_class-native = "yes" -- cgit v1.2.3-54-g00ecf