| Patrick Williams | ddad1a1 | 2017-02-23 20:36:32 -0600 | [diff] [blame] | 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, |