diff options
author | joerg <joerg> | 2015-08-10 19:30:06 +0000 |
---|---|---|
committer | joerg <joerg> | 2015-08-10 19:30:06 +0000 |
commit | cff8247ae5ed645446c731a28fd5089573ecee09 (patch) | |
tree | 040b878f2521f540aaa930f76d123b95ccfa9ca7 /misc/goffice0.10/patches | |
parent | 75ae908fffdfe5cb3f925b2d16a516117f93dfd3 (diff) | |
download | pkgsrc-cff8247ae5ed645446c731a28fd5089573ecee09.tar.gz |
Annotate more printf-like functions. Disable non-literal format string
warnings for a couple of broken APIs where a format string is given
without the actual argument. Bump revision.
Diffstat (limited to 'misc/goffice0.10/patches')
5 files changed, 98 insertions, 0 deletions
diff --git a/misc/goffice0.10/patches/patch-gofffice_app_io-context.h b/misc/goffice0.10/patches/patch-gofffice_app_io-context.h new file mode 100644 index 00000000000..866a6165506 --- /dev/null +++ b/misc/goffice0.10/patches/patch-gofffice_app_io-context.h @@ -0,0 +1,13 @@ +$NetBSD: patch-gofffice_app_io-context.h,v 1.1 2015/08/10 19:30:06 joerg Exp $ + +--- goffice/app/io-context.h.orig 2015-08-10 16:19:57.000000000 +0000 ++++ goffice/app/io-context.h +@@ -43,7 +43,7 @@ void go_io_progress_unset (GO + void go_io_context_set_num_files (GOIOContext *ioc, guint count); + void go_io_context_processing_file (GOIOContext *ioc, char const *uri); + void go_io_warning (GOIOContext *ioc, char const *fmt, ...) G_GNUC_PRINTF (2, 3); +-void go_io_warning_varargs (GOIOContext *ioc, char const *fmt, va_list args); ++void go_io_warning_varargs (GOIOContext *ioc, char const *fmt, va_list args) G_GNUC_PRINTF (2, 0); + void go_io_warning_unknown_font (GOIOContext *ioc, char const *font_name); + void go_io_warning_unknown_function (GOIOContext *ioc, char const *funct_name); + void go_io_warning_unsupported_feature (GOIOContext *ioc, char const *feature); diff --git a/misc/goffice0.10/patches/patch-goffice_app_error-info.h b/misc/goffice0.10/patches/patch-goffice_app_error-info.h new file mode 100644 index 00000000000..a082e69f2b9 --- /dev/null +++ b/misc/goffice0.10/patches/patch-goffice_app_error-info.h @@ -0,0 +1,13 @@ +$NetBSD: patch-goffice_app_error-info.h,v 1.1 2015/08/10 19:30:06 joerg Exp $ + +--- goffice/app/error-info.h.orig 2015-08-10 16:17:07.000000000 +0000 ++++ goffice/app/error-info.h +@@ -16,7 +16,7 @@ GOErrorInfo *go_error_info_new_str (ch + GOErrorInfo *go_error_info_new_printf (char const *msg_format, ...) G_GNUC_PRINTF (1, 2); + GOErrorInfo *go_error_info_new_vprintf (GOSeverity severity, + char const *msg_format, +- va_list args); ++ va_list args) G_GNUC_PRINTF (2, 0); + GOErrorInfo *go_error_info_new_str_with_details (char const *msg, GOErrorInfo *details); + GOErrorInfo *go_error_info_new_str_with_details_list (char const *msg, GSList *details); + GOErrorInfo *go_error_info_new_from_error_list (GSList *errors); diff --git a/misc/goffice0.10/patches/patch-goffice_math_go-complex.c b/misc/goffice0.10/patches/patch-goffice_math_go-complex.c new file mode 100644 index 00000000000..bef1c10e41e --- /dev/null +++ b/misc/goffice0.10/patches/patch-goffice_math_go-complex.c @@ -0,0 +1,23 @@ +$NetBSD: patch-goffice_math_go-complex.c,v 1.1 2015/08/10 19:30:06 joerg Exp $ + +Format string is passed in as argument. + +--- goffice/math/go-complex.c.orig 2015-08-10 16:25:07.000000000 +0000 ++++ goffice/math/go-complex.c +@@ -58,6 +58,8 @@ + #define COMPLEX SUFFIX(GOComplex) + + /* ------------------------------------------------------------------------- */ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + + char * + SUFFIX(go_complex_to_string) (COMPLEX const *src, char const *reformat, +@@ -103,6 +105,7 @@ SUFFIX(go_complex_to_string) (COMPLEX co + + return res; + } ++#pragma GCC diagnostic pop + + /* ------------------------------------------------------------------------- */ + diff --git a/misc/goffice0.10/patches/patch-goffice_math_go-matrix.c b/misc/goffice0.10/patches/patch-goffice_math_go-matrix.c new file mode 100644 index 00000000000..05dbf7acb0c --- /dev/null +++ b/misc/goffice0.10/patches/patch-goffice_math_go-matrix.c @@ -0,0 +1,24 @@ +$NetBSD: patch-goffice_math_go-matrix.c,v 1.1 2015/08/10 19:30:06 joerg Exp $ + +Format string is passed in as argument. + +--- goffice/math/go-matrix.c.orig 2015-08-10 16:26:04.000000000 +0000 ++++ goffice/math/go-matrix.c +@@ -581,6 +581,8 @@ SUFFIX(go_quad_matrix_eigen_range) (cons + } + } + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + + void + SUFFIX(go_quad_matrix_dump) (const QMATRIX *A, const char *fmt) +@@ -594,6 +596,8 @@ SUFFIX(go_quad_matrix_dump) (const QMATR + } + } + ++#pragma GCC diagnostic pop ++ + /* -------------------------------------------------------------------------- */ + + /** diff --git a/misc/goffice0.10/patches/patch-goffice_utils_go-glib-extras.c b/misc/goffice0.10/patches/patch-goffice_utils_go-glib-extras.c new file mode 100644 index 00000000000..fc8b8391dc0 --- /dev/null +++ b/misc/goffice0.10/patches/patch-goffice_utils_go-glib-extras.c @@ -0,0 +1,25 @@ +$NetBSD: patch-goffice_utils_go-glib-extras.c,v 1.1 2015/08/10 19:30:06 joerg Exp $ + +Format string is passed in as argument. + +--- goffice/utils/go-glib-extras.c.orig 2015-08-10 16:27:43.000000000 +0000 ++++ goffice/utils/go-glib-extras.c +@@ -893,6 +893,8 @@ go_object_toggle (gpointer object, const + g_object_set (object, property_name, !value, NULL); + } + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" + + gboolean + go_object_set_property (GObject *obj, const char *property_name, +@@ -963,8 +965,7 @@ go_object_set_property (GObject *obj, co + return TRUE; + } + +- +- ++#pragma GCC diagnostic pop + + /** + * go_object_properties_collect: |