diff options
author | joerg <joerg@pkgsrc.org> | 2013-04-25 12:10:48 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2013-04-25 12:10:48 +0000 |
commit | 7056562a1226a2e6249d454d9dece7a83d98c5e2 (patch) | |
tree | 70f49952e0a369fc778ca670ceebcbd156c2e0d8 /devel | |
parent | 1e55d05d4cd2fd0a837913f2317baa26b06e1c94 (diff) | |
download | pkgsrc-7056562a1226a2e6249d454d9dece7a83d98c5e2.tar.gz |
Don't complain about non-literal format strings in a number of fix the
build with clang.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/glib2/distinfo | 8 | ||||
-rw-r--r-- | devel/glib2/patches/patch-ah | 25 | ||||
-rw-r--r-- | devel/glib2/patches/patch-gio_gcontenttype.c | 21 | ||||
-rw-r--r-- | devel/glib2/patches/patch-gio_gthreadedresolver.c | 21 | ||||
-rw-r--r-- | devel/glib2/patches/patch-glib_gmarkup.c | 30 | ||||
-rw-r--r-- | devel/glib2/patches/patch-glib_gstrfuncs.c | 21 |
6 files changed, 120 insertions, 6 deletions
diff --git a/devel/glib2/distinfo b/devel/glib2/distinfo index 6b480719399..d672727f20b 100644 --- a/devel/glib2/distinfo +++ b/devel/glib2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.184 2013/04/20 08:59:28 obache Exp $ +$NetBSD: distinfo,v 1.185 2013/04/25 12:10:48 joerg Exp $ SHA1 (glib-2.36.1.tar.xz) = 6016ee6b46822d0ed471073e27420cfab26f7c68 RMD160 (glib-2.36.1.tar.xz) = d89a1719d2e931833d68d91feb7233f0151b7326 @@ -8,7 +8,7 @@ SHA1 (patch-ab) = 04bde955a2a588011a8c77ada4923d5464a0d544 SHA1 (patch-ac) = 96e153339675457356f71e35d20375bed669d337 SHA1 (patch-ae) = 09f16e8e14bdea3ee0e478d335f65cb66939e5f5 SHA1 (patch-af) = 45c46d5d01517563fde21ba1a2fdd7d0485932ca -SHA1 (patch-ah) = 66761b7994c54651933d50024eb607952565b214 +SHA1 (patch-ah) = 64765bc71ed7d75ff3e47f77359ecfce63c0e851 SHA1 (patch-aha) = 3249929122a567eec3c421a1efa0ac510f1474b7 SHA1 (patch-ai) = 037e2bb85fbc473c431bbf736dae89825236ff31 SHA1 (patch-ak) = 950b7ca1e414560123b6ba56bb273baaa42364f7 @@ -27,5 +27,9 @@ SHA1 (patch-ck) = 324116cc6fb8dbce8ce8d20f5b237fc469a55cd2 SHA1 (patch-cl) = eb00468c5c5c70dd41803a2a263204686959a415 SHA1 (patch-cm) = 7f14ab327d021537714f876fbfbd4b0350d98a6e SHA1 (patch-cn) = ca3140375cb82ad9ef93d6157e04e40a593c36cd +SHA1 (patch-gio_gcontenttype.c) = 72f0e1b2911df5997e15ef428706c3ba6b62dd83 SHA1 (patch-gio_glocalfile.c) = 2087b54b187ae8812897f3ca9e893e542a5dd414 SHA1 (patch-gio_gresource-tool.c) = 4eb7c9df25e9ac3e977edf3be8fb977a6fb39182 +SHA1 (patch-gio_gthreadedresolver.c) = 18534f886363ba0b64b744277599f8e961c5d2b5 +SHA1 (patch-glib_gmarkup.c) = 238cce5f20d2fd9a12832d47d498edfd7290075b +SHA1 (patch-glib_gstrfuncs.c) = 6719b83e35e1f4e4e8b1c113faa8596676fd9ae5 diff --git a/devel/glib2/patches/patch-ah b/devel/glib2/patches/patch-ah index 2b5442009e3..9d0fe907999 100644 --- a/devel/glib2/patches/patch-ah +++ b/devel/glib2/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.10 2012/04/30 13:53:48 drochner Exp $ +$NetBSD: patch-ah,v 1.11 2013/04/25 12:10:48 joerg Exp $ ---- glib/gutils.c.orig 2012-03-12 00:42:42.000000000 +0000 +--- glib/gutils.c.orig 2013-04-15 21:27:24.000000000 +0000 +++ glib/gutils.c -@@ -1991,7 +1991,7 @@ g_get_system_data_dirs (void) +@@ -2008,7 +2008,7 @@ g_get_system_data_dirs (void) gchar *data_dirs = (gchar *) g_getenv ("XDG_DATA_DIRS"); if (!data_dirs || !data_dirs[0]) @@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.10 2012/04/30 13:53:48 drochner Exp $ data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0); #endif -@@ -2053,7 +2053,7 @@ g_get_system_config_dirs (void) +@@ -2070,7 +2070,7 @@ g_get_system_config_dirs (void) conf_dirs = (gchar *) g_getenv ("XDG_CONFIG_DIRS"); if (!conf_dirs || !conf_dirs[0]) @@ -20,3 +20,20 @@ $NetBSD: patch-ah,v 1.10 2012/04/30 13:53:48 drochner Exp $ conf_dir_vector = g_strsplit (conf_dirs, G_SEARCHPATH_SEPARATOR_S, 0); #endif +@@ -2167,6 +2167,8 @@ g_format_size (guint64 size) + * + * Since: 2.30 + */ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + gchar * + g_format_size_full (guint64 size, + GFormatSizeFlags flags) +@@ -2284,6 +2286,7 @@ g_format_size_full (guint64 siz + + return g_string_free (string, FALSE); + } ++#pragma GCC diagnostic pop + + /** + * g_format_size_for_display: diff --git a/devel/glib2/patches/patch-gio_gcontenttype.c b/devel/glib2/patches/patch-gio_gcontenttype.c new file mode 100644 index 00000000000..abcd936e97d --- /dev/null +++ b/devel/glib2/patches/patch-gio_gcontenttype.c @@ -0,0 +1,21 @@ +$NetBSD: patch-gio_gcontenttype.c,v 1.1 2013/04/25 12:10:48 joerg Exp $ + +--- gio/gcontenttype.c.orig 2013-04-23 20:39:41.000000000 +0000 ++++ gio/gcontenttype.c +@@ -393,6 +393,8 @@ g_content_type_get_mime_type (const char + return g_strdup (type); + } + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + + static GIcon * + g_content_type_get_icon_internal (const gchar *type, +@@ -457,6 +459,7 @@ g_content_type_get_icon_internal (const + + return themed_icon; + } ++#pragma GCC diagnostic pop + + /** + * g_content_type_get_icon: diff --git a/devel/glib2/patches/patch-gio_gthreadedresolver.c b/devel/glib2/patches/patch-gio_gthreadedresolver.c new file mode 100644 index 00000000000..ba6d1c8d7a0 --- /dev/null +++ b/devel/glib2/patches/patch-gio_gthreadedresolver.c @@ -0,0 +1,21 @@ +$NetBSD: patch-gio_gthreadedresolver.c,v 1.1 2013/04/25 12:10:48 joerg Exp $ + +--- gio/gthreadedresolver.c.orig 2013-04-23 20:38:28.000000000 +0000 ++++ gio/gthreadedresolver.c +@@ -369,6 +369,8 @@ g_resolver_record_type_to_rrtype (GResol + g_return_val_if_reached (-1); + } + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + static GList * + g_resolver_records_from_res_query (const gchar *rrname, + gint rrtype, +@@ -474,6 +476,7 @@ g_resolver_records_from_res_query (const + + return records; + } ++#pragma GCC diagnostic pop + + #elif defined(G_OS_WIN32) + diff --git a/devel/glib2/patches/patch-glib_gmarkup.c b/devel/glib2/patches/patch-glib_gmarkup.c new file mode 100644 index 00000000000..a05522da584 --- /dev/null +++ b/devel/glib2/patches/patch-glib_gmarkup.c @@ -0,0 +1,30 @@ +$NetBSD: patch-glib_gmarkup.c,v 1.1 2013/04/25 12:10:48 joerg Exp $ + +--- glib/gmarkup.c.orig 2013-04-23 20:29:01.000000000 +0000 ++++ glib/gmarkup.c +@@ -2366,6 +2366,9 @@ find_conversion (const char *format, + * + * Since: 2.4 + */ ++ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + gchar * + g_markup_vprintf_escaped (const gchar *format, + va_list args) +@@ -2437,6 +2440,7 @@ g_markup_vprintf_escaped (const gchar *f + } + + output2 = g_strdup_vprintf (format2->str, args2); ++ + va_end (args2); + if (!output2) + goto cleanup; +@@ -2491,6 +2495,7 @@ g_markup_vprintf_escaped (const gchar *f + else + return NULL; + } ++#pragma GCC diagnostic pop + + /** + * g_markup_printf_escaped: diff --git a/devel/glib2/patches/patch-glib_gstrfuncs.c b/devel/glib2/patches/patch-glib_gstrfuncs.c new file mode 100644 index 00000000000..376b8142cf1 --- /dev/null +++ b/devel/glib2/patches/patch-glib_gstrfuncs.c @@ -0,0 +1,21 @@ +$NetBSD: patch-glib_gstrfuncs.c,v 1.1 2013/04/25 12:10:48 joerg Exp $ + +--- glib/gstrfuncs.c.orig 2013-04-23 20:34:39.000000000 +0000 ++++ glib/gstrfuncs.c +@@ -892,6 +892,8 @@ g_ascii_dtostr (gchar *buffer, + * + * Return value: The pointer to the buffer with the converted string. + */ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + gchar * + g_ascii_formatd (gchar *buffer, + gint buf_len, +@@ -974,6 +976,7 @@ g_ascii_formatd (gchar *buffer, + return buffer; + #endif + } ++#pragma GCC diagnostic pop + + #define ISSPACE(c) ((c) == ' ' || (c) == '\f' || (c) == '\n' || \ + (c) == '\r' || (c) == '\t' || (c) == '\v') |