diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2020-10-28 22:05:32 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-10-30 12:37:54 +0000 |
| commit | e241f48c2eaaa7c19b1665b2d3896722553ba8a1 (patch) | |
| tree | 7a795eed2aa66fbc85beaadc14af02290874f8f3 /meta/recipes-gnome | |
| parent | e2c4cd1cebbd9e83e90759671147442d7f77d7c5 (diff) | |
| download | openembedded-core-contrib-e241f48c2eaaa7c19b1665b2d3896722553ba8a1.tar.gz | |
json-glib: upgrade 1.4.4 -> 1.6.0
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
| -rw-r--r-- | meta/recipes-gnome/json-glib/json-glib/0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-gnome/json-glib/json-glib_1.6.0.bb (renamed from meta/recipes-gnome/json-glib/json-glib_1.4.4.bb) | 14 |
2 files changed, 8 insertions, 39 deletions
diff --git a/meta/recipes-gnome/json-glib/json-glib/0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch b/meta/recipes-gnome/json-glib/json-glib/0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch deleted file mode 100644 index 2a834b674d..0000000000 --- a/meta/recipes-gnome/json-glib/json-glib/0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d60fcd5bd5c2675e4342775b910a2ea48ec0eccb Mon Sep 17 00:00:00 2001 -From: Dimitry Andric <dim@FreeBSD.org> -Date: Wed, 19 Aug 2020 03:35:16 +0000 -Subject: [PATCH] scanner: use macro instead of cast to convert pointer to integer - -Clang 11 build failed due to a new warning (part of -Werror=pointer-to-int-cast): -../json-glib/json-scanner.c:928:13: error: cast to smaller integer type 'GTokenType' from 'gpointer' (aka 'void *') [-Werror,-Wvoid-pointer-to-enum-cast] - *token_p = (GTokenType) value_p->v_symbol; - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/json-glib/-/commit/8c5fabe962b7337066dac7a697d23fce257a5d64] -Signed-off-by: Jan Beich <jbeich@FreeBSD.org> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - json-glib/json-scanner.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/json-glib/json-scanner.c b/json-glib/json-scanner.c -index 0c9919f..59dd29c 100644 ---- a/json-glib/json-scanner.c -+++ b/json-glib/json-scanner.c -@@ -925,7 +925,7 @@ json_scanner_get_token_i (JsonScanner *scanner, - - case G_TOKEN_SYMBOL: - if (scanner->config->symbol_2_token) -- *token_p = (GTokenType) value_p->v_symbol; -+ *token_p = GPOINTER_TO_INT (value_p->v_symbol); - break; - - case G_TOKEN_BINARY: --- -2.28.0 - diff --git a/meta/recipes-gnome/json-glib/json-glib_1.4.4.bb b/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb index add9ff41a1..3cb637f220 100644 --- a/meta/recipes-gnome/json-glib/json-glib_1.4.4.bb +++ b/meta/recipes-gnome/json-glib/json-glib_1.6.0.bb @@ -13,12 +13,14 @@ DEPENDS = "glib-2.0" GNOMEBASEBUILDCLASS = "meson" inherit gnomebase lib_package gobject-introspection gtk-doc gettext ptest-gnome manpages upstream-version-is-even - -SRC_URI += "file://run-ptest \ - file://0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch \ -" -SRC_URI[archive.md5sum] = "4d4bb9837f6d31e32d0ce658ae135f68" -SRC_URI[archive.sha256sum] = "720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47" +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] = "0d7c67602c4161ea7070fab6c5823afd9bd7f7bc955f652a50d3753b08494e73" PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native" |