diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-09-01 23:43:02 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-02 16:00:40 +0100 |
commit | a654c916853f6ead4268282e15dc8c9ef962446e (patch) | |
tree | 69fbd88abae64435a0d97eac114d6f2c2a41336b /meta/recipes-gnome | |
parent | bdd3abcc210e8f58b7b411da6bbd9c5314819908 (diff) | |
download | openembedded-core-contrib-a654c916853f6ead4268282e15dc8c9ef962446e.tar.gz |
json-glib: Backport a build fix with clang
Signed-off-by: Khem Raj <raj.khem@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.4.4.bb | 4 |
2 files changed, 36 insertions, 1 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 new file mode 100644 index 0000000000..2a834b674d --- /dev/null +++ b/meta/recipes-gnome/json-glib/json-glib/0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch @@ -0,0 +1,33 @@ +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.4.4.bb index c999d761bd..add9ff41a1 100644 --- a/meta/recipes-gnome/json-glib/json-glib_1.4.4.bb +++ b/meta/recipes-gnome/json-glib/json-glib_1.4.4.bb @@ -14,7 +14,9 @@ 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" +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" |