[packages/graphviz] - added format patch (fixes smyrna build with -Werror=format-security)

qboosh qboosh at pld-linux.org
Thu Jan 24 13:24:56 CET 2013


commit 3244e00d333b0e0a159767532712c818051598f2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Jan 24 13:25:37 2013 +0100

    - added format patch (fixes smyrna build with -Werror=format-security)

 graphviz-format.patch | 43 +++++++++++++++++++++++++++++++++++++++++++
 graphviz.spec         |  4 +++-
 2 files changed, 46 insertions(+), 1 deletion(-)
---
diff --git a/graphviz.spec b/graphviz.spec
index b6b8a36..f71f873 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -3,7 +3,7 @@
 # - go language binding [6g, 8g???]
 # - io language binding: io-graphviz
 # - some plugin subpackages? (libgvplugin_*: gs=ghostscript, gtk, lasi, ming, visio, webp)
-# - smyrna subpackage?
+# - smyrna subpackage? (R: OpenGL, glut, gtk+2, gtkglext, libglade2)
 #
 # Conditional build:
 %bcond_without	dotnet		# don't build C# bindings
@@ -56,6 +56,7 @@ Patch9:		%{name}-libgraph.patch
 Patch10:	%{name}-ming.patch
 Patch11:	%{name}-visio.patch
 Patch12:	%{name}-webp.patch
+Patch13:	%{name}-graphviz.patch
 URL:		http://www.graphviz.org/
 %{?with_devil:BuildRequires:	DevIL-devel}
 BuildRequires:	QtCore-devel >= 4
@@ -355,6 +356,7 @@ graphviz bindings for R language.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %{__sed} '1s@/usr/bin/lua$@/usr/bin/lua51@' -i tclpkg/gv/demo/modgraph.lua
 
diff --git a/graphviz-format.patch b/graphviz-format.patch
new file mode 100644
index 0000000..ae099d1
--- /dev/null
+++ b/graphviz-format.patch
@@ -0,0 +1,43 @@
+--- graphviz-2.30.0/cmd/smyrna/main.c.orig	2013-01-14 04:11:21.000000000 +0100
++++ graphviz-2.30.0/cmd/smyrna/main.c	2013-01-24 10:53:20.204392295 +0100
+@@ -94,7 +94,7 @@
+ 
+ static void usage(int v)
+ {
+-    printf(useString);
++    fputs(useString, stdout);
+     exit(v);
+ }
+ 
+--- graphviz-2.30.0/cmd/smyrna/gui/gui.c.orig	2013-01-14 04:11:21.000000000 +0100
++++ graphviz-2.30.0/cmd/smyrna/gui/gui.c	2013-01-24 12:31:24.181987670 +0100
+@@ -379,7 +379,7 @@ void show_gui_warning(char *str)
+     Dlg = (GtkMessageDialog *) gtk_message_dialog_new(NULL,
+ 						      GTK_DIALOG_MODAL,
+ 						      GTK_MESSAGE_WARNING,
+-						      GTK_BUTTONS_OK, str);
++						      GTK_BUTTONS_OK, "%s", str);
+ 
+     respond = gtk_dialog_run((GtkDialog *) Dlg);
+     gtk_object_destroy((GtkObject *) Dlg);
+--- graphviz-2.30.0/cmd/smyrna/gui/menucallbacks.c.orig	2013-01-14 04:11:21.000000000 +0100
++++ graphviz-2.30.0/cmd/smyrna/gui/menucallbacks.c	2013-01-24 12:31:59.286937073 +0100
+@@ -99,15 +99,13 @@ void mQuitSlot(GtkWidget * widget, gpoin
+ int show_close_nosavedlg(void)
+ {
+     GtkWidget *dialog;
+-    char buf[512];
+     int rv;			/*return value */
+-    sprintf(buf,
+-	    "%s has been modified. Do you want to save it before closing?",
+-	    view->Topview->Graphdata.GraphFileName);
+     dialog =
+ 	gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
+ 			       GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE,
+-			       buf);
++	    "%s has been modified. Do you want to save it before closing?",
++	    view->Topview->Graphdata.GraphFileName);
++			       
+ 
+     gtk_window_set_title(GTK_WINDOW(dialog), "Smyrna Warning");
+     gtk_dialog_add_button((GtkDialog *) dialog, "Yes", 0);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/graphviz.git/commitdiff/3244e00d333b0e0a159767532712c818051598f2



More information about the pld-cvs-commit mailing list