diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-08-26 11:35:21 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-31 10:18:32 +0200 |
commit | e5555619f9315ab06a77fb7d569360a01a1efe96 (patch) | |
tree | 1e7738b5fca858be31bb5e662b145bbd0074285d /meta-gnome | |
parent | bfa145f46badcb63bfbd3594492bd58c930ad54f (diff) | |
download | meta-openembedded-contrib-e5555619f9315ab06a77fb7d569360a01a1efe96.tar.gz |
libbonoboui: Fix with with hardening and clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r-- | meta-gnome/recipes-gnome/bonobo/files/0001-bonobo-ui-node-qualify-functions-with-G_GNUC_PRINTF.patch | 49 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb | 4 |
2 files changed, 52 insertions, 1 deletions
diff --git a/meta-gnome/recipes-gnome/bonobo/files/0001-bonobo-ui-node-qualify-functions-with-G_GNUC_PRINTF.patch b/meta-gnome/recipes-gnome/bonobo/files/0001-bonobo-ui-node-qualify-functions-with-G_GNUC_PRINTF.patch new file mode 100644 index 0000000000..e9aebb853e --- /dev/null +++ b/meta-gnome/recipes-gnome/bonobo/files/0001-bonobo-ui-node-qualify-functions-with-G_GNUC_PRINTF.patch @@ -0,0 +1,49 @@ +From b75879e8c3e24d338c0e5843d616bc9b02da4d04 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 26 Aug 2017 09:52:17 -0700 +Subject: [PATCH] bonobo-ui-node: qualify functions with G_GNUC_PRINTF + +This helps compiler in doing format checking correctly +Fixes +bonobo-ui-node.c:864:38: error: format string is not a string literal [-Werror,-Wformat-nonliteral] +| g_logv ("XML", G_LOG_LEVEL_ERROR, msg, args); + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + bonobo/bonobo-ui-node.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/bonobo/bonobo-ui-node.c b/bonobo/bonobo-ui-node.c +index 9bab5e5..6ec66e2 100644 +--- a/bonobo/bonobo-ui-node.c ++++ b/bonobo/bonobo-ui-node.c +@@ -835,7 +835,7 @@ uiCharacters (ParseState *ps, const xmlChar *chars, int len) + g_string_append_len (ps->content, chars, len); + } + +-static void ++static G_GNUC_PRINTF(2, 3) void + uiWarning (ParseState *ps, const char *msg, ...) + { + va_list args; +@@ -845,7 +845,7 @@ uiWarning (ParseState *ps, const char *msg, ...) + va_end (args); + } + +-static void ++static G_GNUC_PRINTF(2, 3) void + uiError (ParseState *ps, const char *msg, ...) + { + va_list args; +@@ -855,7 +855,7 @@ uiError (ParseState *ps, const char *msg, ...) + va_end (args); + } + +-static void ++static G_GNUC_PRINTF(2, 3) void + uiFatalError (ParseState *ps, const char *msg, ...) + { + va_list args; +-- +2.14.1 + diff --git a/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb b/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb index 627f37ed93..b3ca0a4657 100644 --- a/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb +++ b/meta-gnome/recipes-gnome/bonobo/libbonoboui_2.24.5.bb @@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ inherit gnomebase pkgconfig gtk-doc -SRC_URI += "file://gcc5.patch" +SRC_URI += "file://gcc5.patch \ + file://0001-bonobo-ui-node-qualify-functions-with-G_GNUC_PRINTF.patch \ + " SRC_URI[archive.md5sum] = "853be8e28aaa4ce48ba60be7d9046bf4" SRC_URI[archive.sha256sum] = "fab5f2ac6c842d949861c07cb520afe5bee3dce55805151ce9cd01be0ec46fcd" |