summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2020-09-01 23:43:02 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-10 19:07:40 +0100
commit5e210cc9c3670c754da89b3729c92a5fca0ae079 (patch)
treedc5c2a5b9dbc9d35e8aff3380c6bc4812d36b969
parent09ca4f029251141fd65ce49dc1fc59f1d2adf0f8 (diff)
downloadpoky-5e210cc9c3670c754da89b3729c92a5fca0ae079.tar.gz
json-glib: Backport a build fix with clang
(From OE-Core rev: 09bc151f577cbdcb194bb999ada0b7aec7e7aba7) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit a654c916853f6ead4268282e15dc8c9ef962446e) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/json-glib/json-glib/0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch33
-rw-r--r--meta/recipes-gnome/json-glib/json-glib_1.4.4.bb4
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 @@
1From d60fcd5bd5c2675e4342775b910a2ea48ec0eccb Mon Sep 17 00:00:00 2001
2From: Dimitry Andric <dim@FreeBSD.org>
3Date: Wed, 19 Aug 2020 03:35:16 +0000
4Subject: [PATCH] scanner: use macro instead of cast to convert pointer to integer
5
6Clang 11 build failed due to a new warning (part of -Werror=pointer-to-int-cast):
7../json-glib/json-scanner.c:928:13: error: cast to smaller integer type 'GTokenType' from 'gpointer' (aka 'void *') [-Werror,-Wvoid-pointer-to-enum-cast]
8 *token_p = (GTokenType) value_p->v_symbol;
9 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
10
11Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/json-glib/-/commit/8c5fabe962b7337066dac7a697d23fce257a5d64]
12Signed-off-by: Jan Beich <jbeich@FreeBSD.org>
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 json-glib/json-scanner.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/json-glib/json-scanner.c b/json-glib/json-scanner.c
19index 0c9919f..59dd29c 100644
20--- a/json-glib/json-scanner.c
21+++ b/json-glib/json-scanner.c
22@@ -925,7 +925,7 @@ json_scanner_get_token_i (JsonScanner *scanner,
23
24 case G_TOKEN_SYMBOL:
25 if (scanner->config->symbol_2_token)
26- *token_p = (GTokenType) value_p->v_symbol;
27+ *token_p = GPOINTER_TO_INT (value_p->v_symbol);
28 break;
29
30 case G_TOKEN_BINARY:
31--
322.28.0
33
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 5143d73ed7..bbe284c01e 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"
14GNOMEBASEBUILDCLASS = "meson" 14GNOMEBASEBUILDCLASS = "meson"
15inherit gnomebase lib_package gobject-introspection gtk-doc gettext ptest-gnome manpages 15inherit gnomebase lib_package gobject-introspection gtk-doc gettext ptest-gnome manpages
16 16
17SRC_URI += "file://run-ptest" 17SRC_URI += "file://run-ptest \
18 file://0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch \
19"
18SRC_URI[archive.md5sum] = "4d4bb9837f6d31e32d0ce658ae135f68" 20SRC_URI[archive.md5sum] = "4d4bb9837f6d31e32d0ce658ae135f68"
19SRC_URI[archive.sha256sum] = "720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47" 21SRC_URI[archive.sha256sum] = "720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47"
20 22