summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/json-glib
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-10-28 22:05:32 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-10-30 13:22:48 +0000
commit1817c97687525a5c9c25a064fbabdaa0db087581 (patch)
treefe2cc75d7ed93be36e1b3a557d0757ff0787b9ed /meta/recipes-gnome/json-glib
parentf918575ab370b998054fb0555104a42da25a2377 (diff)
downloadpoky-1817c97687525a5c9c25a064fbabdaa0db087581.tar.gz
json-glib: upgrade 1.4.4 -> 1.6.0
(From OE-Core rev: e241f48c2eaaa7c19b1665b2d3896722553ba8a1) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/json-glib')
-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.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 @@
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.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"
13 13
14GNOMEBASEBUILDCLASS = "meson" 14GNOMEBASEBUILDCLASS = "meson"
15inherit gnomebase lib_package gobject-introspection gtk-doc gettext ptest-gnome manpages upstream-version-is-even 15inherit gnomebase lib_package gobject-introspection gtk-doc gettext ptest-gnome manpages upstream-version-is-even
16 16GIR_MESON_ENABLE_FLAG = 'enabled'
17SRC_URI += "file://run-ptest \ 17GIR_MESON_DISABLE_FLAG = 'disabled'
18 file://0001-scanner-use-macro-instead-of-cast-to-convert-pointer.patch \ 18GTKDOC_MESON_OPTION = "gtk_doc"
19" 19GTKDOC_MESON_ENABLE_FLAG = 'enabled'
20SRC_URI[archive.md5sum] = "4d4bb9837f6d31e32d0ce658ae135f68" 20GTKDOC_MESON_DISABLE_FLAG = 'disabled'
21SRC_URI[archive.sha256sum] = "720c5f4379513dc11fd97dc75336eb0c0d3338c53128044d9fabec4374f4bc47" 21
22SRC_URI += " file://run-ptest"
23SRC_URI[archive.sha256sum] = "0d7c67602c4161ea7070fab6c5823afd9bd7f7bc955f652a50d3753b08494e73"
22 24
23PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native" 25PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,libxslt-native xmlto-native"
24 26