From dac6ce8514080d4f9b5733058a133b919253b368 Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 21 Feb 2014 20:23:48 +0000 Subject: Fix build with Clang's stricter literal format string logic. --- editors/gedit3/distinfo | 4 +++- .../patches/patch-gedit_gedit-commands-file.c | 22 ++++++++++++++++++++++ editors/gedit3/patches/patch-gedit_gedit-utils.c | 13 +++++++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 editors/gedit3/patches/patch-gedit_gedit-commands-file.c create mode 100644 editors/gedit3/patches/patch-gedit_gedit-utils.c diff --git a/editors/gedit3/distinfo b/editors/gedit3/distinfo index 8eb57afe323..62cf4ecc538 100644 --- a/editors/gedit3/distinfo +++ b/editors/gedit3/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.3 2014/02/12 01:49:10 prlw1 Exp $ +$NetBSD: distinfo,v 1.4 2014/02/21 20:23:48 joerg Exp $ SHA1 (gedit-3.10.4.tar.xz) = 98a62e1cee7990b60301a2cabbf24c11bcd31707 RMD160 (gedit-3.10.4.tar.xz) = 0df244792ed9fa2fbfb10423bdae531fb31aa650 Size (gedit-3.10.4.tar.xz) = 3086320 bytes +SHA1 (patch-gedit_gedit-commands-file.c) = 04bf1fca0898fbf5a144a52d79d80c82c88394ec +SHA1 (patch-gedit_gedit-utils.c) = d9f2f3f2539e4a653840eb22babf49bf3afbca2c diff --git a/editors/gedit3/patches/patch-gedit_gedit-commands-file.c b/editors/gedit3/patches/patch-gedit_gedit-commands-file.c new file mode 100644 index 00000000000..671b6e4b490 --- /dev/null +++ b/editors/gedit3/patches/patch-gedit_gedit-commands-file.c @@ -0,0 +1,22 @@ +$NetBSD: patch-gedit_gedit-commands-file.c,v 1.1 2014/02/21 20:23:48 joerg Exp $ + +--- gedit/gedit-commands-file.c.orig 2014-02-21 00:06:18.000000000 +0000 ++++ gedit/gedit-commands-file.c +@@ -579,6 +579,9 @@ replace_read_only_file (GtkWindow *paren + return (ret == GTK_RESPONSE_YES); + } + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" ++ + static gboolean + change_compression (GtkWindow *parent, + GFile *file, +@@ -651,6 +654,7 @@ change_compression (GtkWindow *parent, + + return (ret == GTK_RESPONSE_YES); + } ++#pragma GCC diagnostic pop + + static GeditDocumentCompressionType + get_compression_type_from_file (GFile *file) diff --git a/editors/gedit3/patches/patch-gedit_gedit-utils.c b/editors/gedit3/patches/patch-gedit_gedit-utils.c new file mode 100644 index 00000000000..2bff236f695 --- /dev/null +++ b/editors/gedit3/patches/patch-gedit_gedit-utils.c @@ -0,0 +1,13 @@ +$NetBSD: patch-gedit_gedit-utils.c,v 1.1 2014/02/21 20:23:48 joerg Exp $ + +--- gedit/gedit-utils.c.orig 2014-02-21 00:07:38.000000000 +0000 ++++ gedit/gedit-utils.c +@@ -911,7 +911,7 @@ gedit_utils_is_valid_location (GFile *lo + return is_valid; + } + +-static GtkWidget * ++static G_GNUC_PRINTF(1, 2) GtkWidget * + handle_builder_error (const gchar *message, ...) + { + GtkWidget *label; -- cgit v1.2.3