From 64cbed988423449dd9f687b3658695a404d4085c Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Mon, 20 Mar 2017 06:01:57 -0500 Subject: glib: Fix bundled build with GCC 6 Backport two patches from upstream glib to handle -Wformat-nonliteral included by default with GCC 6. Ideally the snapshot should be updated, but this fix the issue until that happens. https://bugs.freedesktop.org/show_bug.cgi?id=95326 --- glib/glib/gdate.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'glib') diff --git a/glib/glib/gdate.c b/glib/glib/gdate.c index 1978cf7..20e6c4a 100644 --- a/glib/glib/gdate.c +++ b/glib/glib/gdate.c @@ -2439,6 +2439,9 @@ win32_strftime_helper (const GDate *d, * * Returns: number of characters written to the buffer, or 0 the buffer was too small */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-nonliteral" + gsize g_date_strftime (gchar *s, gsize slen, @@ -2549,3 +2552,5 @@ g_date_strftime (gchar *s, return retval; #endif } + +#pragma GCC diagnostic pop -- cgit v1.2.1