Author: pabs
Date: 2012-06-20 12:11:02 +0000 (Wed, 20 Jun 2012)
New Revision: 13725
Removed:
packages/trunk/warzone2100/debian/patches/fix-FTBFS-with-hardening-flags.patch
packages/trunk/warzone2100/debian/patches/spelling-fix.patch
Modified:
packages/trunk/warzone2100/debian/changelog
packages/trunk/warzone2100/debian/patches/series
Log:
patches accepted upstream
Modified: packages/trunk/warzone2100/debian/changelog
===================================================================
--- packages/trunk/warzone2100/debian/changelog 2012-06-20 10:42:54 UTC (rev
13724)
+++ packages/trunk/warzone2100/debian/changelog 2012-06-20 12:11:02 UTC (rev
13725)
@@ -15,8 +15,6 @@
* delete all of the current and future embedded code copies
* Remove the quesoglc embedded code copy too
* Update patch to use system quesoglc too
- * Fix FTBFS with hardening flags
- * Fix spelling error
* wrap-and-sort -sa
* Drop autotools_dev, not needed with autoreconf
* Enable all the hardening flags
Deleted:
packages/trunk/warzone2100/debian/patches/fix-FTBFS-with-hardening-flags.patch
===================================================================
---
packages/trunk/warzone2100/debian/patches/fix-FTBFS-with-hardening-flags.patch
2012-06-20 10:42:54 UTC (rev 13724)
+++
packages/trunk/warzone2100/debian/patches/fix-FTBFS-with-hardening-flags.patch
2012-06-20 12:11:02 UTC (rev 13725)
@@ -1,57 +0,0 @@
-Author: Paul Wise <[email protected]>
-Description: fix an FTBFS with -Werror=format-security
-Bug: http://developer.wz2100.net/ticket/3493
-Applied-Upstream:
http://developer.wz2100.net/changeset/e5d2242be00bdb665e0e8ea55adcbd90be462160,
http://developer.wz2100.net/changeset/e5d2242be00bdb665e0e8ea55adcbd90be462160,
http://developer.wz2100.net/changeset/e5d2242be00bdb665e0e8ea55adcbd90be462160
---- a/lib/netplay/netplay.cpp
-+++ b/lib/netplay/netplay.cpp
-@@ -2505,7 +2505,7 @@
-
- char buf[250] = {'\0'};
- snprintf(buf, sizeof(buf), "Player %s
has joined, IP is: %s", name, NetPlay.players[index].IPtextAddress);
-- debug(LOG_INFO, buf);
-+ debug(LOG_INFO, "%s", buf);
- NETlogEntry(buf, SYNC_FLAG, index);
-
- debug(LOG_NET, "Player, %s, with index
of %u has joined using socket %p", name, (unsigned int)index,
connected_bsocket[index]);
-@@ -3177,7 +3177,7 @@
- {
- switch (numInts)
- {
-- case 0: index += snprintf(buf + index, bufSize
- index, string); break;
-+ case 0: index += snprintf(buf + index, bufSize
- index, "%s", string); break;
- 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/src/qtscriptfuncs.cpp
-+++ b/src/qtscriptfuncs.cpp
-@@ -1133,7 +1133,7 @@
- }
- result.append(s);
- }
-- qWarning(result.toAscii().constData());
-+ qWarning("%s", result.toAscii().constData());
- return QScriptValue();
- }
-
---- 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);
Modified: packages/trunk/warzone2100/debian/patches/series
===================================================================
--- packages/trunk/warzone2100/debian/patches/series 2012-06-20 10:42:54 UTC
(rev 13724)
+++ packages/trunk/warzone2100/debian/patches/series 2012-06-20 12:11:02 UTC
(rev 13725)
@@ -1,3 +1 @@
use-system-libraries.patch
-fix-FTBFS-with-hardening-flags.patch
-spelling-fix.patch
Deleted: packages/trunk/warzone2100/debian/patches/spelling-fix.patch
===================================================================
--- packages/trunk/warzone2100/debian/patches/spelling-fix.patch
2012-06-20 10:42:54 UTC (rev 13724)
+++ packages/trunk/warzone2100/debian/patches/spelling-fix.patch
2012-06-20 12:11:02 UTC (rev 13725)
@@ -1,15 +0,0 @@
-Author: Paul Wise <[email protected]>
-Description: spelling fix
-Bug: http://developer.wz2100.net/ticket/3495
-Applied-Upstream:
http://developer.wz2100.net/changeset/52511cec6003e389307859535853eb96a9cf60a4,
http://developer.wz2100.net/changeset/52511cec6003e389307859535853eb96a9cf60a4,
http://developer.wz2100.net/changeset/52511cec6003e389307859535853eb96a9cf60a4
---- a/src/map.cpp
-+++ b/src/map.cpp
-@@ -282,7 +282,7 @@
- debug(LOG_TERRAIN, "name: %s, with %d entries", name, numlines);
- if (numlines == 0 || numlines > MAX_TERRAIN_TILES)
- {
-- debug(LOG_FATAL, "Rockie_enum paramater is out of range (%d).
Aborting.", numlines);
-+ debug(LOG_FATAL, "Rockie_enum parameter is out of range (%d).
Aborting.", numlines);
- abort();
- }
-
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
