r13597 - packages/trunk/warzone2100/debian/patches

[Paul Wise]

Author: pabs
Date: 2012-05-20 12:07:34 +0000 (Sun, 20 May 2012)
New Revision: 13597

Modified:
   packages/trunk/warzone2100/debian/patches/fix-FTBFS-with-hardening-flags.patch
Log:
Do not patch generated files

Modified: packages/trunk/warzone2100/debian/patches/fix-FTBFS-with-hardening-flags.patch
===================================================================
--- packages/trunk/warzone2100/debian/patches/fix-FTBFS-with-hardening-flags.patch	2012-05-20 11:58:00 UTC (rev 13596)
+++ packages/trunk/warzone2100/debian/patches/fix-FTBFS-with-hardening-flags.patch	2012-05-20 12:07:34 UTC (rev 13597)
@@ -21,17 +21,6 @@
  				case  1: index += snprintf(buf + index, bufSize - index, string, ints[0]); break;
  				case  2: index += snprintf(buf + index, bufSize - index, string, ints[0], ints[1]); break;
  				case  3: index += snprintf(buf + index, bufSize - index, string, ints[0], ints[1], ints[2]); break;
---- a/lib/script/script_parser.cpp
-+++ b/lib/script/script_parser.cpp
-@@ -8625,7 +8625,7 @@
- 	if (0 < yysize && yysize <= yymsg_alloc)
- 	  {
- 	    (void) yysyntax_error (yymsg, yystate, yychar);
--	    yyerror (yymsg);
-+	    yyerror ("%s", yymsg);
- 	  }
- 	else
- 	  {
 --- a/src/qtscriptfuncs.cpp
 +++ b/src/qtscriptfuncs.cpp
 @@ -1133,7 +1133,7 @@
@@ -43,14 +32,25 @@
  	return QScriptValue();
  }
  
---- a/src/scriptvals_parser.cpp
-+++ b/src/scriptvals_parser.cpp
-@@ -2206,7 +2206,7 @@
- 	if (0 < yysize && yysize <= yymsg_alloc)
- 	  {
- 	    (void) yysyntax_error (yymsg, yystate, yychar);
--	    yyerror (yymsg);
-+	    yyerror ("%s", yymsg);
- 	  }
- 	else
- 	  {
+--- a/lib/script/parse.h
++++ b/lib/script/parse.h
+@@ -305,7 +305,7 @@ extern bool scriptInitParser(void);
+ extern int scr_parse(void);
+ 
+ /* Give an error message */
+-void scr_error(const char *pMessage, ...) WZ_DECL_FORMAT(printf, 1, 2);
++void scr_error(const char *pMessage, ...);
+
+ extern void scriptGetErrorData(int *pLine, char **ppText);
+
+--- a/src/scriptvals.h
++++ b/src/scriptvals.h
+@@ -56,7 +56,7 @@ struct ARRAY_INDEXES
+
+ /* A simple error reporting routine */
+
+-extern void scrv_error(const char* fmt, ...) WZ_DECL_FORMAT(printf, 1, 2);
++extern void scrv_error(const char* fmt, ...);
+
+ // Lookup a type
+ extern bool scrvLookUpType(const char *pIdent, INTERP_TYPE *pType);