diff options
12 files changed, 148 insertions, 127 deletions
diff --git a/devel/anjuta/distinfo b/devel/anjuta/distinfo index fff48349544..ff94b92e868 100644 --- a/devel/anjuta/distinfo +++ b/devel/anjuta/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.25 2013/10/06 20:01:27 joerg Exp $ +$NetBSD: distinfo,v 1.26 2013/12/07 23:47:02 dholland Exp $ SHA1 (anjuta-3.10.0.tar.xz) = bfa975641b3e25818b7eda34905c4d65eeb01152 RMD160 (anjuta-3.10.0.tar.xz) = 871dbb7e6174296729eeefae6b8766591fff2ad0 @@ -9,22 +9,22 @@ SHA1 (patch-libanjuta_anjuta-status.h) = 4fc61d652a3877bf2ebbe39024af3fadd11805c SHA1 (patch-libanjuta_anjuta-utils.c) = 6659d7a9bf6912f4fd96045cb326d4619f635fb6 SHA1 (patch-libanjuta_anjuta-utils.h) = bc42909f3ea4afd2ca426fc614742e4063d9ba6c SHA1 (patch-libanjuta_tests_Makefile.in) = 7ad52876516f3a07a59fc21e12b94caf54b51146 -SHA1 (patch-plugins_am-project_projectparser.c) = e224e3b0886957f2fa4834e92a809618d256e864 -SHA1 (patch-plugins_build-basic-autotools_build.c) = f1046c032465067a2a8641010f7c2772b25019e7 -SHA1 (patch-plugins_build-basic-autotools_executer.c) = 4295a1c06d5390883dad553991b572ed3b75b77a +SHA1 (patch-plugins_am-project_projectparser.c) = 7502510bc4c6d564aecca76c4f7b68779b34aecd +SHA1 (patch-plugins_build-basic-autotools_build.c) = 336c5811a2b3fde30e5c4539eadc1cf9ebd71854 +SHA1 (patch-plugins_build-basic-autotools_executer.c) = 4e89ea52eaaf41aa8804681cfc9bb6f407526748 SHA1 (patch-plugins_build-basic-autotools_program.h) = 72247949ddbfa0b41acd934f566ffd80d7841db7 -SHA1 (patch-plugins_cvs-plugin_cvs-interface.c) = 131a874cfb7e9ec1808491da49234a4bd720e0ec -SHA1 (patch-plugins_debug-manager_breakpoints.c) = 9ff0604bee08f1454d181887d34366b010cc4c1a +SHA1 (patch-plugins_cvs-plugin_cvs-interface.c) = 19541f4ab3bd70245461d317ac6c182a7e0f7633 +SHA1 (patch-plugins_debug-manager_breakpoints.c) = 7ea483aeca934f1b105efac07a5ff1a29e6ed56f SHA1 (patch-plugins_debug-manager_queue.c) = a39e5adcc739f4eaff29138a21ad0e5375573f6d SHA1 (patch-plugins_debug-manager_start.c) = a1d703fc97ad33b36d3b43eb699308d298034a01 SHA1 (patch-plugins_document-manager_plugin.c) = e34a635090fb46f22a936024ec83c4308a8a29f7 SHA1 (patch-plugins_gdb_debugger.c) = 5af43c0332ed8ded2af610ebba693a9920ba38e2 SHA1 (patch-plugins_gdb_preferences.c) = 19680a65945b6b1c4b3c960cdf81a7e30959a9f4 -SHA1 (patch-plugins_project-manager_dialogs.c) = 394f24df8a08d4a0ddc8256ecfef4ac408b14c00 -SHA1 (patch-plugins_project-manager_plugin.c) = 6d0f5222a53795d904fd92adad8401f05c1344b5 -SHA1 (patch-plugins_project-wizard_druid.c) = 1a9e8c8b003e978520c47a667c025b02cae22773 -SHA1 (patch-plugins_project-wizard_parser.c) = 42254d3bb935aa1713b3d1be605b608aea858d90 -SHA1 (patch-plugins_run-program_execute.c) = 19e845027cd2a2a733e1b75dfee445198b20db04 +SHA1 (patch-plugins_project-manager_dialogs.c) = 3b9cd7393559b22eeeaa120079b4f448ea95a62a +SHA1 (patch-plugins_project-manager_plugin.c) = 07fcb683258a141b8c4d3865a6d4c8d5e6043746 +SHA1 (patch-plugins_project-wizard_druid.c) = 697ad749d408526bda9aff4360f8e5223dcf7a4a +SHA1 (patch-plugins_project-wizard_parser.c) = a63a5d05bbce9f21e6fd546b67d7f6c655771c85 +SHA1 (patch-plugins_run-program_execute.c) = 672adc09332674899fa2678a63262859856a6bcd SHA1 (patch-plugins_run-program_plugin.c) = 4eb47b9f8a968bc6b7e0e660489c8f5408c97676 SHA1 (patch-plugins_symbol-db_anjuta-tags_c.c) = 578bae121b3099eaba7fdc2e8fa6c1a080e4b73c SHA1 (patch-plugins_symbol-db_anjuta-tags_eiffel.c) = 3638ed97cae8c49f88af6ded96a0d71e0c652238 @@ -39,4 +39,4 @@ SHA1 (patch-plugins_symbol-db_anjuta-tags_routines.c) = baa1cb690d7b617bd2eba10a SHA1 (patch-plugins_symbol-db_symbol-db-engine-core.c) = 66be6b57691e3dfb37acfdada8a85254fcd6d7d9 SHA1 (patch-plugins_symbol-db_symbol-db-engine-utils.c) = aa3a0d25e52d57733e392e1e576c93c7fad52a3e SHA1 (patch-plugins_tools_execute.c) = 60edf300449182875164ff3ac441f1dfe5a5f7cf -SHA1 (patch-plugins_tools_fileop.c) = e5a9d41c560272a8069d3e3cded44c13139c14d9 +SHA1 (patch-plugins_tools_fileop.c) = 37a8a17335ec37b8dcfd29406b5428e8f6bd7163 diff --git a/devel/anjuta/patches/patch-plugins_am-project_projectparser.c b/devel/anjuta/patches/patch-plugins_am-project_projectparser.c index a2464048100..0e2c226c73b 100644 --- a/devel/anjuta/patches/patch-plugins_am-project_projectparser.c +++ b/devel/anjuta/patches/patch-plugins_am-project_projectparser.c @@ -1,22 +1,22 @@ -$NetBSD: patch-plugins_am-project_projectparser.c,v 1.1 2013/10/06 20:01:27 joerg Exp $ +$NetBSD: patch-plugins_am-project_projectparser.c,v 1.2 2013/12/07 23:47:02 dholland Exp $ --- plugins/am-project/projectparser.c.orig 2013-08-09 00:30:17.000000000 +0000 +++ plugins/am-project/projectparser.c -@@ -58,7 +58,7 @@ close_output (void) +@@ -57,7 +57,7 @@ close_output (void) + output_stream = NULL; } - static void --print (const gchar *message, ...) -+print (const gchar *message, ...) G_GNUC_PRINTF(1,2) +-static void ++static G_GNUC_PRINTF(1,2) void + print (const gchar *message, ...) { va_list args; - -@@ -71,7 +71,7 @@ print (const gchar *message, ...) +@@ -70,7 +70,7 @@ print (const gchar *message, ...) + fputc('\n', output_stream); } - static void --print_error (const gchar *message, ...) -+print_error (const gchar *message, ...) G_GNUC_PRINTF(1,2) +-static void ++static G_GNUC_PRINTF(1,2) void + print_error (const gchar *message, ...) { va_list args; - diff --git a/devel/anjuta/patches/patch-plugins_build-basic-autotools_build.c b/devel/anjuta/patches/patch-plugins_build-basic-autotools_build.c index f819fc24ca2..7b3a27feb46 100644 --- a/devel/anjuta/patches/patch-plugins_build-basic-autotools_build.c +++ b/devel/anjuta/patches/patch-plugins_build-basic-autotools_build.c @@ -1,4 +1,4 @@ -$NetBSD: patch-plugins_build-basic-autotools_build.c,v 1.1 2013/10/06 20:01:27 joerg Exp $ +$NetBSD: patch-plugins_build-basic-autotools_build.c,v 1.2 2013/12/07 23:47:02 dholland Exp $ --- plugins/build-basic-autotools/build.c.orig 2013-08-09 00:30:17.000000000 +0000 +++ plugins/build-basic-autotools/build.c @@ -7,7 +7,7 @@ $NetBSD: patch-plugins_build-basic-autotools_build.c,v 1.1 2013/10/06 20:01:27 j static gchar* -shell_quotef (const gchar *format,...) -+shell_quotef (const gchar *format,...) G_GNUC_PRINTF(1,2) ++G_GNUC_PRINTF(1,2) shell_quotef (const gchar *format,...) { va_list args; gchar *str; diff --git a/devel/anjuta/patches/patch-plugins_build-basic-autotools_executer.c b/devel/anjuta/patches/patch-plugins_build-basic-autotools_executer.c index c52d9ae03c0..d1a8d2586df 100644 --- a/devel/anjuta/patches/patch-plugins_build-basic-autotools_executer.c +++ b/devel/anjuta/patches/patch-plugins_build-basic-autotools_executer.c @@ -1,17 +1,27 @@ -$NetBSD: patch-plugins_build-basic-autotools_executer.c,v 1.1 2013/10/06 20:01:27 joerg Exp $ +$NetBSD: patch-plugins_build-basic-autotools_executer.c,v 1.2 2013/12/07 23:47:02 dholland Exp $ --- plugins/build-basic-autotools/executer.c.orig 2013-08-09 00:30:17.000000000 +0000 +++ plugins/build-basic-autotools/executer.c -@@ -375,9 +375,11 @@ execute_program (BasicAutotoolsPlugin* p +@@ -205,6 +205,9 @@ get_program_parameters (BasicAutotoolsPl + return success; + } + ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" ++ + void + execute_program (BasicAutotoolsPlugin* plugin, const gchar *pre_select_uri) + { +@@ -375,7 +378,6 @@ execute_program (BasicAutotoolsPlugin* p if (plugin->commands[IANJUTA_BUILDABLE_COMMAND_EXECUTE]) { gchar *oldcmd = cmd; - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" cmd = g_strdup_printf (plugin->commands[IANJUTA_BUILDABLE_COMMAND_EXECUTE], oldcmd); -+#pragma GCC diagnostic pop - g_free (oldcmd); - } else { +@@ -416,3 +418,4 @@ execute_program (BasicAutotoolsPlugin* p + g_free (target); + g_free (args); + } ++#pragma GCC diagnostic pop diff --git a/devel/anjuta/patches/patch-plugins_cvs-plugin_cvs-interface.c b/devel/anjuta/patches/patch-plugins_cvs-plugin_cvs-interface.c index 370a7efdc9c..a669bba8922 100644 --- a/devel/anjuta/patches/patch-plugins_cvs-plugin_cvs-interface.c +++ b/devel/anjuta/patches/patch-plugins_cvs-plugin_cvs-interface.c @@ -1,16 +1,21 @@ -$NetBSD: patch-plugins_cvs-plugin_cvs-interface.c,v 1.1 2013/10/06 20:01:27 joerg Exp $ +$NetBSD: patch-plugins_cvs-plugin_cvs-interface.c,v 1.2 2013/12/07 23:47:02 dholland Exp $ --- plugins/cvs-plugin/cvs-interface.c.orig 2013-08-09 00:30:17.000000000 +0000 +++ plugins/cvs-plugin/cvs-interface.c -@@ -58,8 +58,11 @@ static gchar* create_cvs_command_with_cv - { - cvsroot = ""; - } +@@ -24,6 +24,8 @@ + #include "plugin.h" + #include "libgen.h" + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-nonliteral" - command = g_strdup_printf(CVS_FORMAT, cvs, global_options, cvsroot, action, - command_options, command_arguments); -+#pragma GCC diagnostic pop - g_free (cvs); - g_free (global_options); + static gchar* create_cvs_command_with_cvsroot(GSettings* settings, + const gchar* action, + const gchar* command_options, +@@ -65,6 +67,7 @@ static gchar* create_cvs_command_with_cv + return command; + } ++#pragma GCC diagnostic pop + + inline static gchar* create_cvs_command(GSettings* settings, + const gchar* action, diff --git a/devel/anjuta/patches/patch-plugins_debug-manager_breakpoints.c b/devel/anjuta/patches/patch-plugins_debug-manager_breakpoints.c index ecef1c50d95..40076aaa9f1 100644 --- a/devel/anjuta/patches/patch-plugins_debug-manager_breakpoints.c +++ b/devel/anjuta/patches/patch-plugins_debug-manager_breakpoints.c @@ -1,26 +1,21 @@ -$NetBSD: patch-plugins_debug-manager_breakpoints.c,v 1.1 2013/10/06 20:01:27 joerg Exp $ +$NetBSD: patch-plugins_debug-manager_breakpoints.c,v 1.2 2013/12/07 23:47:02 dholland Exp $ --- plugins/debug-manager/breakpoints.c.orig 2013-08-09 00:30:17.000000000 +0000 +++ plugins/debug-manager/breakpoints.c -@@ -445,7 +445,10 @@ breakpoints_dbase_update_in_treeview (Br - filename = bi->bp.function; - format = filename == NULL ? "??" : "%s"; - } -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - location = g_strdup_printf (format, filename, bi->bp.line, bi->bp.function); -+#pragma GCC diagnostic pop - if (bi->bp.id == 0) - { - pass = g_strdup_printf ("%d", bi->bp.ignore); -@@ -474,7 +477,10 @@ breakpoints_dbase_update_in_treeview (Br - { - format = "permanent (%d)"; +@@ -423,6 +423,8 @@ breakpoints_dbase_clear_in_editor (Break } + } + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-nonliteral" - state = g_strdup_printf (format, bi->bp.id); + static void + breakpoints_dbase_update_in_treeview (BreakpointsDBase *bd, BreakpointItem *bi) + { +@@ -490,6 +492,7 @@ breakpoints_dbase_update_in_treeview (Br + g_free (location); + g_free (adr); + } +#pragma GCC diagnostic pop - gtk_list_store_set (bd->model, &bi->iter, - ENABLED_COLUMN, bi->bp.enable, + static void + breakpoints_dbase_breakpoint_removed (BreakpointsDBase *bd, BreakpointItem *bi) diff --git a/devel/anjuta/patches/patch-plugins_project-manager_dialogs.c b/devel/anjuta/patches/patch-plugins_project-manager_dialogs.c index 93e6dc5db77..e09aff0756c 100644 --- a/devel/anjuta/patches/patch-plugins_project-manager_dialogs.c +++ b/devel/anjuta/patches/patch-plugins_project-manager_dialogs.c @@ -1,13 +1,13 @@ -$NetBSD: patch-plugins_project-manager_dialogs.c,v 1.1 2013/10/06 20:01:27 joerg Exp $ +$NetBSD: patch-plugins_project-manager_dialogs.c,v 1.2 2013/12/07 23:47:02 dholland Exp $ --- plugins/project-manager/dialogs.c.orig 2013-08-09 00:30:18.000000000 +0000 +++ plugins/project-manager/dialogs.c -@@ -119,7 +119,7 @@ load_interface (const gchar *top_widget) +@@ -118,7 +118,7 @@ load_interface (const gchar *top_widget) + return xml; } - static void --error_dialog (GtkWindow *parent, const gchar *summary, const gchar *msg, ...) -+error_dialog (GtkWindow *parent, const gchar *summary, const gchar *msg, ...) G_GNUC_PRINTF(3,4) +-static void ++static G_GNUC_PRINTF(3,4) void + error_dialog (GtkWindow *parent, const gchar *summary, const gchar *msg, ...) { va_list ap; - gchar *tmp; diff --git a/devel/anjuta/patches/patch-plugins_project-manager_plugin.c b/devel/anjuta/patches/patch-plugins_project-manager_plugin.c index b3cc8b8c657..43f610fd074 100644 --- a/devel/anjuta/patches/patch-plugins_project-manager_plugin.c +++ b/devel/anjuta/patches/patch-plugins_project-manager_plugin.c @@ -1,20 +1,24 @@ -$NetBSD: patch-plugins_project-manager_plugin.c,v 1.1 2013/10/06 20:01:27 joerg Exp $ +$NetBSD: patch-plugins_project-manager_plugin.c,v 1.2 2013/12/07 23:47:02 dholland Exp $ --- plugins/project-manager/plugin.c.orig 2013-09-13 22:00:36.000000000 +0000 +++ plugins/project-manager/plugin.c -@@ -749,9 +749,12 @@ confirm_removal (ProjectManagerPlugin *p - else - shownMesg = mesg ; +@@ -645,6 +645,8 @@ on_popup_add_source (GtkAction *action, + if (default_source) g_object_unref (default_source); + } +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-nonliteral" - answer = - anjuta_util_dialog_boolean_question (get_plugin_parent_window (plugin), FALSE, - shownMesg, _("Confirm remove")); + static gboolean + confirm_removal (ProjectManagerPlugin *plugin, GList *selected) + { +@@ -757,6 +759,7 @@ confirm_removal (ProjectManagerPlugin *p + + return answer; + } +#pragma GCC diagnostic pop - - g_free (shownMesg); + static void + on_popup_remove (GtkAction *action, ProjectManagerPlugin *plugin) @@ -1323,7 +1326,7 @@ on_project_loaded (AnjutaPmProject *proj anjuta_shell_present_widget (ANJUTA_PLUGIN (plugin)->shell, plugin->scrolledwindow, diff --git a/devel/anjuta/patches/patch-plugins_project-wizard_druid.c b/devel/anjuta/patches/patch-plugins_project-wizard_druid.c index e0eb9149448..1f5e4e9469b 100644 --- a/devel/anjuta/patches/patch-plugins_project-wizard_druid.c +++ b/devel/anjuta/patches/patch-plugins_project-wizard_druid.c @@ -1,13 +1,13 @@ -$NetBSD: patch-plugins_project-wizard_druid.c,v 1.1 2013/10/06 20:01:27 joerg Exp $ +$NetBSD: patch-plugins_project-wizard_druid.c,v 1.2 2013/12/07 23:47:02 dholland Exp $ --- plugins/project-wizard/druid.c.orig 2013-08-09 00:30:18.000000000 +0000 +++ plugins/project-wizard/druid.c -@@ -157,7 +157,7 @@ npw_druid_set_busy (NPWDruid *druid, gbo +@@ -156,7 +156,7 @@ npw_druid_set_busy (NPWDruid *druid, gbo + *---------------------------------------------------------------------------*/ /* Fill dialog page */ - static void --npw_druid_fill_error_page (NPWDruid* druid, GtkWidget *extra_widget, GtkMessageType type, const gchar *detail, const gchar *mesg,...) -+npw_druid_fill_error_page (NPWDruid* druid, GtkWidget *extra_widget, GtkMessageType type, const gchar *detail, const gchar *mesg,...) G_GNUC_PRINTF(5,6) +-static void ++static G_GNUC_PRINTF(5,6) void + npw_druid_fill_error_page (NPWDruid* druid, GtkWidget *extra_widget, GtkMessageType type, const gchar *detail, const gchar *mesg,...) { GtkAssistant *assistant; - GtkWidget *page; diff --git a/devel/anjuta/patches/patch-plugins_project-wizard_parser.c b/devel/anjuta/patches/patch-plugins_project-wizard_parser.c index 8c8709f78a7..ed4e521cfc3 100644 --- a/devel/anjuta/patches/patch-plugins_project-wizard_parser.c +++ b/devel/anjuta/patches/patch-plugins_project-wizard_parser.c @@ -1,42 +1,37 @@ -$NetBSD: patch-plugins_project-wizard_parser.c,v 1.1 2013/10/06 20:01:27 joerg Exp $ +$NetBSD: patch-plugins_project-wizard_parser.c,v 1.2 2013/12/07 23:47:02 dholland Exp $ --- plugins/project-wizard/parser.c.orig 2013-08-09 00:30:18.000000000 +0000 +++ plugins/project-wizard/parser.c -@@ -255,7 +255,7 @@ parser_error_quark (void) +@@ -254,8 +254,10 @@ parser_error_quark (void) + return error_quark; } ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wformat-nonliteral" static void -parser_warning (GMarkupParseContext* ctx, const gchar* format,...) -+parser_warning (GMarkupParseContext* ctx, const gchar* format,...) G_GNUC_PRINTF(2,3) ++G_GNUC_PRINTF(2,3) parser_warning (GMarkupParseContext* ctx, const gchar* format,...) { va_list args; gchar* msg; -@@ -264,13 +264,16 @@ parser_warning (GMarkupParseContext* ctx - g_markup_parse_context_get_position (ctx, &line, NULL); - msg = g_strdup_printf ("line %d: %s", line, format); - va_start (args, format); -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, msg, args); -+#pragma GCC diagnostic pop +@@ -268,8 +270,11 @@ parser_warning (GMarkupParseContext* ctx va_end (args); g_free (msg); } ++#pragma GCC diagnostic pop - static void --parser_critical (GMarkupParseContext* ctx, const gchar* format,...) -+parser_critical (GMarkupParseContext* ctx, const gchar* format,...) G_GNUC_PRINTF(2,3) - { - va_list args; - gchar* msg; -@@ -279,7 +282,10 @@ parser_critical (GMarkupParseContext* ct - g_markup_parse_context_get_position (ctx, &line, NULL); - msg = g_strdup_printf ("line %d: %s", line, format); - va_start (args, format); +-static void +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-nonliteral" - g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_CRITICAL, msg, args); -+#pragma GCC diagnostic pop ++static G_GNUC_PRINTF(2,3) void + parser_critical (GMarkupParseContext* ctx, const gchar* format,...) + { + va_list args; +@@ -283,6 +288,7 @@ parser_critical (GMarkupParseContext* ct va_end (args); g_free (msg); } ++#pragma GCC diagnostic pop + + /* Represent a language as an integer: + * < 0 for a not applicable language diff --git a/devel/anjuta/patches/patch-plugins_run-program_execute.c b/devel/anjuta/patches/patch-plugins_run-program_execute.c index 6a481983c83..4fbc3ee0560 100644 --- a/devel/anjuta/patches/patch-plugins_run-program_execute.c +++ b/devel/anjuta/patches/patch-plugins_run-program_execute.c @@ -1,26 +1,32 @@ -$NetBSD: patch-plugins_run-program_execute.c,v 1.1 2013/10/06 20:01:27 joerg Exp $ +$NetBSD: patch-plugins_run-program_execute.c,v 1.2 2013/12/07 23:47:02 dholland Exp $ ---- plugins/run-program/execute.c.orig 2013-09-29 15:13:14.000000000 +0000 +--- plugins/run-program/execute.c.orig 2013-08-09 00:30:18.000000000 +0000 +++ plugins/run-program/execute.c -@@ -87,7 +87,10 @@ get_local_executable (GtkWindow *parent, +@@ -58,6 +58,8 @@ struct _RunProgramChild + /* Helper functions + *---------------------------------------------------------------------------*/ - if (err_msg) - { +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-nonliteral" - anjuta_util_dialog_error (parent, err_msg, local == NULL ? uri : local); + static gchar * + get_local_executable (GtkWindow *parent, const gchar *uri) + { +@@ -94,7 +96,10 @@ get_local_executable (GtkWindow *parent, + + return local; + } +#pragma GCC diagnostic pop - g_free (local); - local = NULL; - } -@@ -113,7 +116,10 @@ get_local_directory (GtkWindow *parent, - if (err_msg) - { +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-nonliteral" - anjuta_util_dialog_error (parent, err_msg, uri); -+#pragma GCC diagnostic pop - } + static gchar * + get_local_directory (GtkWindow *parent, const gchar *uri) + { +@@ -118,6 +123,7 @@ get_local_directory (GtkWindow *parent, return local; + } ++#pragma GCC diagnostic pop + + /* Private functions + *---------------------------------------------------------------------------*/ diff --git a/devel/anjuta/patches/patch-plugins_tools_fileop.c b/devel/anjuta/patches/patch-plugins_tools_fileop.c index bb573eed8b1..2219bcbeea2 100644 --- a/devel/anjuta/patches/patch-plugins_tools_fileop.c +++ b/devel/anjuta/patches/patch-plugins_tools_fileop.c @@ -1,15 +1,21 @@ -$NetBSD: patch-plugins_tools_fileop.c,v 1.1 2013/10/06 20:01:27 joerg Exp $ +$NetBSD: patch-plugins_tools_fileop.c,v 1.2 2013/12/07 23:47:02 dholland Exp $ ---- plugins/tools/fileop.c.orig 2013-09-29 15:21:52.000000000 +0000 +--- plugins/tools/fileop.c.orig 2013-08-09 00:30:18.000000000 +0000 +++ plugins/tools/fileop.c -@@ -168,7 +168,10 @@ parser_warning (GMarkupParseContext* ctx - g_markup_parse_context_get_position (ctx, &line, NULL); - msg = g_strdup_printf ("line %d: %s", line, format); - va_start (args, format); +@@ -158,6 +158,8 @@ parse_integer_string (const gchar* value + return atoi(value); + } + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wformat-nonliteral" - g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, msg, args); -+#pragma GCC diagnostic pop + static void + parser_warning (GMarkupParseContext* ctx, const gchar* format,...) + { +@@ -172,6 +174,7 @@ parser_warning (GMarkupParseContext* ctx va_end (args); g_free (msg); } ++#pragma GCC diagnostic pop + + /* Load anjuta-tools + *---------------------------------------------------------------------------*/ |