- added format patch (remove unnecessary tr() calls, which trigger format-security...

diff --git a/fox16-format.patch b/fox16-format.patch
new file mode 100644 (file)
index 0000000..bc5d413
--- /dev/null
+++ b/fox16-format.patch
@@ -0,0 +1,31 @@
+--- fox-1.6.47/src/FXGLViewer.cpp.orig 2012-11-14 17:56:11.000000000 +0100
++++ fox-1.6.47/src/FXGLViewer.cpp      2012-11-17 09:39:53.180687901 +0100
+@@ -2420,7 +2420,7 @@
+ 
+       // Try open printer
+       if(!pdc.beginPrint(printer)){
+-        FXMessageBox::error(this,MBOX_OK,tr("Printer Error"),tr("Unable to print."));
++        FXMessageBox::error(this,MBOX_OK,tr("Printer Error"),"Unable to print.");
+         return 1;
+         }
+ 
+@@ -2595,7 +2595,7 @@
+     dlg.getPrinter(printer);
+     FXDCPrint pdc(getApp());
+     if(!pdc.beginPrint(printer)){
+-      FXMessageBox::error(this,MBOX_OK,tr("Printer Error"),tr("Unable to print."));
++      FXMessageBox::error(this,MBOX_OK,tr("Printer Error"),"Unable to print.");
+       return 1;
+       }
+ 
+--- fox-1.6.47/adie/TextWindow.cpp.orig        2012-11-14 17:56:11.000000000 +0100
++++ fox-1.6.47/adie/TextWindow.cpp     2012-11-17 09:44:08.195862341 +0100
+@@ -1421,7 +1421,7 @@
+ // Reopen file
+ long TextWindow::onCmdReopen(FXObject*,FXSelector,void*){
+   if(isModified()){
+-    if(FXMessageBox::question(this,MBOX_YES_NO,tr("Document was changed"),tr("Discard changes to this document?"))==MBOX_CLICKED_NO) return 1;
++    if(FXMessageBox::question(this,MBOX_YES_NO,tr("Document was changed"),"Discard changes to this document?")==MBOX_CLICKED_NO) return 1;
+     }
+   loadFile(filename);
+   return 1;

diff --git a/fox16.spec b/fox16.spec
index 1c1fd3cf2b04dd9f635277ca4bee6c0b95a87bb6..9aa9793d9a40d1fa05f8bfc2712340a9f2a2f86c 100644 (file)
--- a/fox16.spec
+++ b/fox16.spec
@@ -14,6 +14,7 @@ Source0:      http://ftp.fox-toolkit.org/pub/fox-%{version}.tar.gz
 Patch0:                %{name}-opt.patch
 Patch1:                %{name}-link.patch
 Patch2:                %{name}-Makefile.patch
+Patch3:                %{name}-format.patch
 URL:           http://www.fox-toolkit.org/
 BuildRequires: OpenGL-GLU-devel
 BuildRequires: autoconf >= 2.59-9
@@ -131,6 +132,7 @@ FOX 1.6 - przykładowe programy.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}