CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

glade: Fix format string warnings with clang

Browse Source 
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
(cherry picked from commit 059b3b2474)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Khem Raj 2017-08-27 12:12:03 -07:00 committed by Armin Kuster
parent 0f01e553f8
commit 2946ce1c9a
2 changed files with 67 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
meta-oe/recipes-devtools/glade/glade3/0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch Normal file
View File

@ -0,0 +1,62 @@
From fcf29abe59607b5791f9de18ddb86b9ae3c9b7cc Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 26 Aug 2017 23:50:05 -0700
Subject: [PATCH] Add G_GNUC_PRINTF on functions with format strings
This allows compilation with clang without errors, even when
-Wformat-nonliteral is active (as long as there are no real cases of
non literal formatting).
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
gladeui/glade-command.c | 4 ++--
gladeui/glade-utils.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gladeui/glade-command.c b/gladeui/glade-command.c
index 9819766..4ac40ee 100644
--- a/gladeui/glade-command.c
+++ b/gladeui/glade-command.c
@@ -266,7 +266,7 @@ glade_command_collapse (GladeCommand *command,
*
* Marks the begining of a group.
*/
-void
+G_GNUC_PRINTF(1, 2) void
glade_command_push_group (const gchar *fmt, ...)
{
va_list args;
@@ -655,7 +655,7 @@ glade_command_set_properties_list (GladeProject *project, GList *props)
multiple = g_list_length (me->sdata) > 1;
if (multiple)
- glade_command_push_group (cmd->description);
+ glade_command_push_group ("%s", cmd->description);
glade_command_check_group (GLADE_COMMAND (me));
diff --git a/gladeui/glade-utils.c b/gladeui/glade-utils.c
index ae52501..c51ae59 100644
--- a/gladeui/glade-utils.c
+++ b/gladeui/glade-utils.c
@@ -197,7 +197,7 @@ glade_utils_get_pspec_from_funcname (const gchar *funcname)
* selected "OK", True if the @type was GLADE_UI_YES_OR_NO and
* the user selected "YES"; False otherwise.
*/
-gint
+G_GNUC_PRINTF(4, 5) gint
glade_util_ui_message (GtkWidget *parent,
GladeUIMessageType type,
GtkWidget *widget,
@@ -320,7 +320,7 @@ remove_message_timeout (FlashInfo * fi)
*
* Flash a temporary message on the statusbar.
*/
-void
+G_GNUC_PRINTF(3, 4) void
glade_util_flash_message (GtkWidget *statusbar, guint context_id, gchar *format, ...)
{
va_list args;
--
2.14.1

10
meta-oe/recipes-devtools/glade/glade3_3.8.5.bb
View File

@ -8,11 +8,11 @@ DEPENDS = "gtk+ gnome-doc-utils gnome-common libxml2 intltool-native"
inherit autotools pkgconfig pythonnative gtk-icon-cache
SRC_URI = " \
http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \
file://0001-gnome-doc-utils.make-sysrooted-pkg-config.patch \
file://0002-fix-gcc-6-build.patch \
"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \
file://0001-gnome-doc-utils.make-sysrooted-pkg-config.patch \
file://0002-fix-gcc-6-build.patch \
file://0001-Add-G_GNUC_PRINTF-on-functions-with-format-strings.patch \
"
SRC_URI[md5sum] = "4e4b4f5ee34a03e017e4cef97d796c1f"
SRC_URI[sha256sum] = "58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735"