Wed May 11 15:33:29 2016 UTC ()
Pullup ticket #4983 - requested by joerg
devel/anjuta: build fix

Revisions pulled up:
- devel/anjuta/Makefile                                         1.125
- devel/anjuta/distinfo                                         1.28
- devel/anjuta/patches/patch-plugins_build-basic-autotools_build.c 1.3
- devel/anjuta/patches/patch-plugins_cvs-plugin_cvs-callbacks.c 1.1
- devel/anjuta/patches/patch-plugins_cvs-plugin_cvs-execute.c   1.1

---
   Module Name:	pkgsrc
   Committed By:	joerg
   Date:		Sat May  7 09:55:21 UTC 2016

   Modified Files:
   	pkgsrc/devel/anjuta: Makefile distinfo
   	pkgsrc/devel/anjuta/patches:
   	    patch-plugins_build-basic-autotools_build.c
   Added Files:
   	pkgsrc/devel/anjuta/patches: patch-plugins_cvs-plugin_cvs-callbacks.c
   	    patch-plugins_cvs-plugin_cvs-execute.c

   Log Message:
   Drop extra format string arguments. Disable zero length format string
   warning from GCC.


(bsiegert)
diff -r1.123 -r1.123.2.1 pkgsrc/devel/anjuta/Makefile
diff -r1.27 -r1.27.4.1 pkgsrc/devel/anjuta/distinfo
diff -r1.2 -r1.2.20.1 pkgsrc/devel/anjuta/patches/patch-plugins_build-basic-autotools_build.c
diff -r0 -r1.1.2.2 pkgsrc/devel/anjuta/patches/patch-plugins_cvs-plugin_cvs-callbacks.c
diff -r0 -r1.1.2.2 pkgsrc/devel/anjuta/patches/patch-plugins_cvs-plugin_cvs-execute.c
cvs diff -r1.123 -r1.123.2.1 pkgsrc/devel/anjuta/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/anjuta/Makefile 2016/03/05 11:28:20 1.123
+++ pkgsrc/devel/anjuta/Makefile 2016/05/11 15:33:29 1.123.2.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.123 2016/03/05 11:28:20 jperkin Exp $ 1# $NetBSD: Makefile,v 1.123.2.1 2016/05/11 15:33:29 bsiegert Exp $
2 2
3DISTNAME= anjuta-3.10.0 3DISTNAME= anjuta-3.10.0
4PKGREVISION= 14 4PKGREVISION= 14
5CATEGORIES= devel 5CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/anjuta/3.10/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/anjuta/3.10/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.anjuta.org/ 10HOMEPAGE= http://www.anjuta.org/
11COMMENT= Gnome based IDE for C and C++ 11COMMENT= Gnome based IDE for C and C++
12 12
13DEPENDS+= autogen-[0-9]*:../../devel/autogen 13DEPENDS+= autogen-[0-9]*:../../devel/autogen
14DEPENDS+= autoconf>=2.59:../../devel/autoconf 14DEPENDS+= autoconf>=2.59:../../devel/autoconf
@@ -57,26 +57,28 @@ GCONF_SCHEMAS+= anjuta-language-cpp-java @@ -57,26 +57,28 @@ GCONF_SCHEMAS+= anjuta-language-cpp-java
57GCONF_SCHEMAS+= anjuta-message-manager-plugin.schemas 57GCONF_SCHEMAS+= anjuta-message-manager-plugin.schemas
58GCONF_SCHEMAS+= anjuta-symbol-browser-plugin.schemas 58GCONF_SCHEMAS+= anjuta-symbol-browser-plugin.schemas
59GCONF_SCHEMAS+= anjuta-terminal-plugin.schemas 59GCONF_SCHEMAS+= anjuta-terminal-plugin.schemas
60GCONF_SCHEMAS+= anjuta.schemas 60GCONF_SCHEMAS+= anjuta.schemas
61 61
62BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.12.0 62BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.12.0
63 63
64.include "../../mk/bsd.prefs.mk" 64.include "../../mk/bsd.prefs.mk"
65 65
66.if ${OPSYS} == "NetBSD" && !exists(/var/shm) 66.if ${OPSYS} == "NetBSD" && !exists(/var/shm)
67CPPFLAGS+= -Dshm_open=open -Dshm_unlink=unlink 67CPPFLAGS+= -Dshm_open=open -Dshm_unlink=unlink
68.endif 68.endif
69 69
 70CFLAGS+= -Wno-error=format-zero-length
 71
70.include "../../databases/libgda/buildlink3.mk" 72.include "../../databases/libgda/buildlink3.mk"
71#.include "../../devel/devhelp/buildlink3.mk" 73#.include "../../devel/devhelp/buildlink3.mk"
72.include "../../devel/gdl/buildlink3.mk" 74.include "../../devel/gdl/buildlink3.mk"
73.include "../../devel/glade3/buildlink3.mk" 75.include "../../devel/glade3/buildlink3.mk"
74.include "../../devel/libgnomeui/buildlink3.mk" 76.include "../../devel/libgnomeui/buildlink3.mk"
75.include "../../devel/pcre/buildlink3.mk" 77.include "../../devel/pcre/buildlink3.mk"
76.include "../../devel/GConf/schemas.mk" 78.include "../../devel/GConf/schemas.mk"
77.include "../../graphics/graphviz/buildlink3.mk" 79.include "../../graphics/graphviz/buildlink3.mk"
78.include "../../graphics/gnome-icon-theme/buildlink3.mk" 80.include "../../graphics/gnome-icon-theme/buildlink3.mk"
79.include "../../lang/python/application.mk" 81.include "../../lang/python/application.mk"
80.include "../../print/libgnomeprintui/buildlink3.mk" 82.include "../../print/libgnomeprintui/buildlink3.mk"
81.include "../../mk/omf-scrollkeeper.mk" 83.include "../../mk/omf-scrollkeeper.mk"
82.include "../../textproc/gnome-doc-utils/buildlink3.mk" 84.include "../../textproc/gnome-doc-utils/buildlink3.mk"
cvs diff -r1.27 -r1.27.4.1 pkgsrc/devel/anjuta/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/anjuta/distinfo 2015/11/03 03:27:13 1.27
+++ pkgsrc/devel/anjuta/distinfo 2016/05/11 15:33:29 1.27.4.1
@@ -1,29 +1,31 @@ @@ -1,29 +1,31 @@
1$NetBSD: distinfo,v 1.27 2015/11/03 03:27:13 agc Exp $ 1$NetBSD: distinfo,v 1.27.4.1 2016/05/11 15:33:29 bsiegert Exp $
2 2
3SHA1 (anjuta-3.10.0.tar.xz) = bfa975641b3e25818b7eda34905c4d65eeb01152 3SHA1 (anjuta-3.10.0.tar.xz) = bfa975641b3e25818b7eda34905c4d65eeb01152
4RMD160 (anjuta-3.10.0.tar.xz) = 871dbb7e6174296729eeefae6b8766591fff2ad0 4RMD160 (anjuta-3.10.0.tar.xz) = 871dbb7e6174296729eeefae6b8766591fff2ad0
5SHA512 (anjuta-3.10.0.tar.xz) = 32c3dd4e04f1efedf57b755775fc94293ec3d6eac2f2753bc16418c974cb9b35908179e22b4922b78257087e44b0b0aaacc5d7aa496ec433823c82b209edb174 5SHA512 (anjuta-3.10.0.tar.xz) = 32c3dd4e04f1efedf57b755775fc94293ec3d6eac2f2753bc16418c974cb9b35908179e22b4922b78257087e44b0b0aaacc5d7aa496ec433823c82b209edb174
6Size (anjuta-3.10.0.tar.xz) = 6468032 bytes 6Size (anjuta-3.10.0.tar.xz) = 6468032 bytes
7SHA1 (patch-libanjuta_anjuta-plugin-manager.c) = cf8ec97d221ca9e091b4addd9ada24e3427bb025 7SHA1 (patch-libanjuta_anjuta-plugin-manager.c) = cf8ec97d221ca9e091b4addd9ada24e3427bb025
8SHA1 (patch-libanjuta_anjuta-status.c) = 7541533e061a588ea9b6c404c8a7dd78710905f9 8SHA1 (patch-libanjuta_anjuta-status.c) = 7541533e061a588ea9b6c404c8a7dd78710905f9
9SHA1 (patch-libanjuta_anjuta-status.h) = 4fc61d652a3877bf2ebbe39024af3fadd11805c3 9SHA1 (patch-libanjuta_anjuta-status.h) = 4fc61d652a3877bf2ebbe39024af3fadd11805c3
10SHA1 (patch-libanjuta_anjuta-utils.c) = 6659d7a9bf6912f4fd96045cb326d4619f635fb6 10SHA1 (patch-libanjuta_anjuta-utils.c) = 6659d7a9bf6912f4fd96045cb326d4619f635fb6
11SHA1 (patch-libanjuta_anjuta-utils.h) = bc42909f3ea4afd2ca426fc614742e4063d9ba6c 11SHA1 (patch-libanjuta_anjuta-utils.h) = bc42909f3ea4afd2ca426fc614742e4063d9ba6c
12SHA1 (patch-libanjuta_tests_Makefile.in) = 7ad52876516f3a07a59fc21e12b94caf54b51146 12SHA1 (patch-libanjuta_tests_Makefile.in) = 7ad52876516f3a07a59fc21e12b94caf54b51146
13SHA1 (patch-plugins_am-project_projectparser.c) = 7502510bc4c6d564aecca76c4f7b68779b34aecd 13SHA1 (patch-plugins_am-project_projectparser.c) = 7502510bc4c6d564aecca76c4f7b68779b34aecd
14SHA1 (patch-plugins_build-basic-autotools_build.c) = 336c5811a2b3fde30e5c4539eadc1cf9ebd71854 14SHA1 (patch-plugins_build-basic-autotools_build.c) = 39387934df248c281e5ea2e25213b1db9b3e8cb6
15SHA1 (patch-plugins_build-basic-autotools_executer.c) = 4e89ea52eaaf41aa8804681cfc9bb6f407526748 15SHA1 (patch-plugins_build-basic-autotools_executer.c) = 4e89ea52eaaf41aa8804681cfc9bb6f407526748
16SHA1 (patch-plugins_build-basic-autotools_program.h) = 72247949ddbfa0b41acd934f566ffd80d7841db7 16SHA1 (patch-plugins_build-basic-autotools_program.h) = 72247949ddbfa0b41acd934f566ffd80d7841db7
 17SHA1 (patch-plugins_cvs-plugin_cvs-callbacks.c) = daef25e5f07c47affba5621e631b1f7ebaa19f21
 18SHA1 (patch-plugins_cvs-plugin_cvs-execute.c) = a6b7258b83b6efd6a4436e12fae6d0f381c7fb1a
17SHA1 (patch-plugins_cvs-plugin_cvs-interface.c) = 19541f4ab3bd70245461d317ac6c182a7e0f7633 19SHA1 (patch-plugins_cvs-plugin_cvs-interface.c) = 19541f4ab3bd70245461d317ac6c182a7e0f7633
18SHA1 (patch-plugins_debug-manager_breakpoints.c) = 7ea483aeca934f1b105efac07a5ff1a29e6ed56f 20SHA1 (patch-plugins_debug-manager_breakpoints.c) = 7ea483aeca934f1b105efac07a5ff1a29e6ed56f
19SHA1 (patch-plugins_debug-manager_queue.c) = a39e5adcc739f4eaff29138a21ad0e5375573f6d 21SHA1 (patch-plugins_debug-manager_queue.c) = a39e5adcc739f4eaff29138a21ad0e5375573f6d
20SHA1 (patch-plugins_debug-manager_start.c) = a1d703fc97ad33b36d3b43eb699308d298034a01 22SHA1 (patch-plugins_debug-manager_start.c) = a1d703fc97ad33b36d3b43eb699308d298034a01
21SHA1 (patch-plugins_document-manager_plugin.c) = e34a635090fb46f22a936024ec83c4308a8a29f7 23SHA1 (patch-plugins_document-manager_plugin.c) = e34a635090fb46f22a936024ec83c4308a8a29f7
22SHA1 (patch-plugins_gdb_debugger.c) = 5af43c0332ed8ded2af610ebba693a9920ba38e2 24SHA1 (patch-plugins_gdb_debugger.c) = 5af43c0332ed8ded2af610ebba693a9920ba38e2
23SHA1 (patch-plugins_gdb_preferences.c) = 19680a65945b6b1c4b3c960cdf81a7e30959a9f4 25SHA1 (patch-plugins_gdb_preferences.c) = 19680a65945b6b1c4b3c960cdf81a7e30959a9f4
24SHA1 (patch-plugins_project-manager_dialogs.c) = 3b9cd7393559b22eeeaa120079b4f448ea95a62a 26SHA1 (patch-plugins_project-manager_dialogs.c) = 3b9cd7393559b22eeeaa120079b4f448ea95a62a
25SHA1 (patch-plugins_project-manager_plugin.c) = 07fcb683258a141b8c4d3865a6d4c8d5e6043746 27SHA1 (patch-plugins_project-manager_plugin.c) = 07fcb683258a141b8c4d3865a6d4c8d5e6043746
26SHA1 (patch-plugins_project-wizard_druid.c) = 697ad749d408526bda9aff4360f8e5223dcf7a4a 28SHA1 (patch-plugins_project-wizard_druid.c) = 697ad749d408526bda9aff4360f8e5223dcf7a4a
27SHA1 (patch-plugins_project-wizard_parser.c) = a63a5d05bbce9f21e6fd546b67d7f6c655771c85 29SHA1 (patch-plugins_project-wizard_parser.c) = a63a5d05bbce9f21e6fd546b67d7f6c655771c85
28SHA1 (patch-plugins_run-program_execute.c) = 672adc09332674899fa2678a63262859856a6bcd 30SHA1 (patch-plugins_run-program_execute.c) = 672adc09332674899fa2678a63262859856a6bcd
29SHA1 (patch-plugins_run-program_plugin.c) = 4eb47b9f8a968bc6b7e0e660489c8f5408c97676 31SHA1 (patch-plugins_run-program_plugin.c) = 4eb47b9f8a968bc6b7e0e660489c8f5408c97676
cvs diff -r1.2 -r1.2.20.1 pkgsrc/devel/anjuta/patches/patch-plugins_build-basic-autotools_build.c (expand / switch to unified diff)

--- pkgsrc/devel/anjuta/patches/patch-plugins_build-basic-autotools_build.c 2013/12/07 23:47:02 1.2
+++ pkgsrc/devel/anjuta/patches/patch-plugins_build-basic-autotools_build.c 2016/05/11 15:33:29 1.2.20.1
@@ -1,13 +1,22 @@ @@ -1,13 +1,22 @@
1$NetBSD: patch-plugins_build-basic-autotools_build.c,v 1.2 2013/12/07 23:47:02 dholland Exp $ 1$NetBSD: patch-plugins_build-basic-autotools_build.c,v 1.2.20.1 2016/05/11 15:33:29 bsiegert Exp $
2 2
3--- plugins/build-basic-autotools/build.c.orig 2013-08-09 00:30:17.000000000 +0000 3--- plugins/build-basic-autotools/build.c.orig 2013-08-09 00:30:17.000000000 +0000
4+++ plugins/build-basic-autotools/build.c 4+++ plugins/build-basic-autotools/build.c
5@@ -216,7 +216,7 @@ directory_has_file (GFile *dir, const gc 5@@ -216,7 +216,7 @@ directory_has_file (GFile *dir, const gc
6 } 6 }
7  7
8 static gchar* 8 static gchar*
9-shell_quotef (const gchar *format,...) 9-shell_quotef (const gchar *format,...)
10+G_GNUC_PRINTF(1,2) shell_quotef (const gchar *format,...) 10+G_GNUC_PRINTF(1,2) shell_quotef (const gchar *format,...)
11 { 11 {
12 va_list args; 12 va_list args;
13 gchar *str; 13 gchar *str;
 14@@ -524,7 +524,7 @@ build_save_distclean_and_execute_command
 15
 16 // Need to run make clean before
 17 if (!anjuta_util_dialog_boolean_question (GTK_WINDOW (ANJUTA_PLUGIN (bplugin)->shell), FALSE,
 18- _("Before using this new configuration, the default one needs to be removed. Do you want to do that ?"), NULL))
 19+ _("Before using this new configuration, the default one needs to be removed. Do you want to do that ?")))
 20 {
 21 if (err)
 22 *err = g_error_new (ianjuta_builder_error_quark (),
File Added: pkgsrc/devel/anjuta/patches/patch-plugins_cvs-plugin_cvs-callbacks.c
$NetBSD: patch-plugins_cvs-plugin_cvs-callbacks.c,v 1.1.2.2 2016/05/11 15:33:29 bsiegert Exp $

--- plugins/cvs-plugin/cvs-callbacks.c.orig	2016-05-06 12:59:32.000000000 +0000
+++ plugins/cvs-plugin/cvs-callbacks.c
@@ -149,7 +149,7 @@ on_cvs_remove_response(GtkDialog* dialog
 		if (!g_file_delete(file, NULL, NULL))
 		{
 			anjuta_util_dialog_error
-				(GTK_WINDOW(dialog),_("Unable to delete file"), NULL);
+				(GTK_WINDOW(dialog),_("Unable to delete file"));
 			gtk_widget_destroy(GTK_WIDGET(dialog));
 			cvs_data_free(data);
 			break;
File Added: pkgsrc/devel/anjuta/patches/patch-plugins_cvs-plugin_cvs-execute.c
$NetBSD: patch-plugins_cvs-plugin_cvs-execute.c,v 1.1.2.2 2016/05/11 15:33:29 bsiegert Exp $

--- plugins/cvs-plugin/cvs-execute.c.orig	2016-05-06 12:59:57.000000000 +0000
+++ plugins/cvs-plugin/cvs-execute.c
@@ -218,8 +218,7 @@ cvs_execute_common (CVSPlugin* plugin, c
 	if (plugin->executing_command)
 	{
 		anjuta_util_dialog_error
-			(NULL,_("CVS command is running — please wait until it finishes!"),
-			 NULL);
+			(NULL,_("CVS command is running — please wait until it finishes!"));
 		return;
 	}