mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-18 21:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

json-glib: Backport a build fix with clang

Browse Source 
(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>
This commit is contained in:
Khem Raj
2020-09-01 23:43:02 -07:00
committed by Richard Purdie
parent 09ca4f0292
commit 5e210cc9c3
2 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
meta/recipes-gnome/json-glib/json-glib/0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch Normal file
View File

@@ -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

4
meta/recipes-gnome/json-glib/json-glib_1.4.4.bb
View File

@@ -14,7 +14,9 @@ DEPENDS = "glib-2.0"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase lib_package gobject-introspection gtk-doc gettext ptest-gnome manpages
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"