diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2016-07-05 10:04:44 +0800 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-07-29 11:00:54 +0200 |
commit | ca363445b80b47f3e0c18cb9d96b9463ce86b913 (patch) | |
tree | e9d0250cd202c957be05ecb8fe2a2d080c3216e9 /meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch | |
parent | a1647eaab8ed9a7b3b6c19314e0dc034ee48581e (diff) | |
download | meta-openembedded-ca363445b80b47f3e0c18cb9d96b9463ce86b913.tar.gz |
gtksourceview2: fix build with gcc6
Fix build error:
../../gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c:
In function 'strdup_strftime':
../../gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c:1951:3:
error: format not a string literal, format string not checked [-Werror=format-nonliteral]
tmplen = strftime (tmpbuf, tmpbufsize, locale_format, tm);
^~~~~~
A wrapper for strftime() would compile failed with -Werror=format-nonliteral
in newer GCC. See GCC bug:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=39438
Since most of the strdup_strftime function code is taken from GLib's
g_date_strftime() in gdate.c which already had a fix:
https://bugzilla.gnome.org/show_bug.cgi?id=761550
So this patch refers the glib fixes:
https://git.gnome.org/browse/glib/commit/?id=0817af40e8c74c721c30f6ef482b1f53d12044c7
https://git.gnome.org/browse/glib/commit/?id=8cdbc7fb2c8c876902e457abe46ee18a0b134486
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch')
-rw-r--r-- | meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch new file mode 100644 index 000000000..f9ae07763 --- /dev/null +++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | Fix build error with gcc6: | ||
2 | ../../gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c: In function 'strdup_strftime': | ||
3 | ../../gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c:1951:3: error: format not a string literal, format string not checked [-Werror=format-nonliteral] | ||
4 | tmplen = strftime (tmpbuf, tmpbufsize, locale_format, tm); | ||
5 | ^~~~~~ | ||
6 | |||
7 | Patch Reference: | ||
8 | https://git.gnome.org/browse/glib/commit/?id=0817af40e8c74c721c30f6ef482b1f53d12044c7 | ||
9 | https://git.gnome.org/browse/glib/commit/?id=8cdbc7fb2c8c876902e457abe46ee18a0b134486 | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | Signed-off-by: Yi Zhao <yi.zhao@windriver.com> | ||
13 | |||
14 | diff -Nurp gtksourceview-2.10.5.orig/gtksourceview/gtksourceprintcompositor.c gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c | ||
15 | --- gtksourceview-2.10.5.orig/gtksourceview/gtksourceprintcompositor.c 2016-07-01 13:11:43.631173762 +0800 | ||
16 | +++ gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c 2016-07-04 13:54:18.223726343 +0800 | ||
17 | @@ -1913,6 +1913,8 @@ setup_pango_layouts (GtkSourcePrintCompo | ||
18 | * GLIB - Library of useful routines for C programming | ||
19 | * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald */ | ||
20 | |||
21 | +#pragma GCC diagnostic push | ||
22 | +#pragma GCC diagnostic ignored "-Wformat-nonliteral" | ||
23 | static gchar * | ||
24 | strdup_strftime (const gchar *format, const struct tm *tm) | ||
25 | { | ||
26 | @@ -1982,6 +1984,7 @@ strdup_strftime (const gchar *format, co | ||
27 | |||
28 | return convbuf; | ||
29 | } | ||
30 | +#pragma GCC diagnostic pop | ||
31 | |||
32 | static gchar * | ||
33 | evaluate_format_string (GtkSourcePrintCompositor *compositor, | ||