r6447 - packages/trunk/lordsawar/debian/patches

Peter De Wachter pdewacht-guest at alioth.debian.org
Sun Apr 6 12:57:48 UTC 2008 

Author: pdewacht-guest
Date: 2008-04-06 12:57:48 +0000 (Sun, 06 Apr 2008)
New Revision: 6447

Modified:
   packages/trunk/lordsawar/debian/patches/ftbfs_gcc-4.3_fix.diff
Log:
patch against current version


Modified: packages/trunk/lordsawar/debian/patches/ftbfs_gcc-4.3_fix.diff
===================================================================
--- packages/trunk/lordsawar/debian/patches/ftbfs_gcc-4.3_fix.diff	2008-04-06 12:15:11 UTC (rev 6446)
+++ packages/trunk/lordsawar/debian/patches/ftbfs_gcc-4.3_fix.diff	2008-04-06 12:57:48 UTC (rev 6447)
@@ -1,6 +1,6 @@
 diff -rN -u old-lordsawar-0.0.8/m4/ggz.m4 new-lordsawar-0.0.8/m4/ggz.m4
---- old-lordsawar-0.0.8/m4/ggz.m4	2008-04-06 12:44:14.000000000 +0200
-+++ new-lordsawar-0.0.8/m4/ggz.m4	2008-04-06 12:44:15.000000000 +0200
+--- old-lordsawar-0.0.8/m4/ggz.m4	2008-04-06 14:46:22.000000000 +0200
++++ new-lordsawar-0.0.8/m4/ggz.m4	2008-04-06 14:46:22.000000000 +0200
 @@ -136,7 +136,7 @@
    ac_ggz_stdetc="$ac_ggz_stdetc/ggzd /usr/local/etc/ggzd /etc/ggzd"
  fi
@@ -47,9 +47,9 @@
  
    AC_SUBST(GGZDMOD_INCLUDES)
 diff -rN -u old-lordsawar-0.0.8/src/editor/editorbigmap.cpp new-lordsawar-0.0.8/src/editor/editorbigmap.cpp
---- old-lordsawar-0.0.8/src/editor/editorbigmap.cpp	2008-04-06 12:44:15.000000000 +0200
-+++ new-lordsawar-0.0.8/src/editor/editorbigmap.cpp	2008-04-06 12:44:15.000000000 +0200
-@@ -673,8 +673,8 @@
+--- old-lordsawar-0.0.8/src/editor/editorbigmap.cpp	2008-04-06 14:46:22.000000000 +0200
++++ new-lordsawar-0.0.8/src/editor/editorbigmap.cpp	2008-04-06 14:46:22.000000000 +0200
+@@ -635,8 +635,8 @@
  		for (int x = tile.x - 1; x <= tile.x + 1; ++x)
  		    for (int y = tile.y - 1; y <= tile.y + 1; ++y)
  		    {
@@ -60,10 +60,21 @@
  			    continue;
  
  			Vector<int> pos(x, y);
-diff -rN -u old-lordsawar-0.0.8/src/game.cpp new-lordsawar-0.0.8/src/game.cpp
---- old-lordsawar-0.0.8/src/game.cpp	2008-04-06 12:44:15.000000000 +0200
-+++ new-lordsawar-0.0.8/src/game.cpp	2008-04-06 12:44:15.000000000 +0200
-@@ -934,7 +934,7 @@
+diff -rN -u old-lordsawar-0.0.8/src/editor/Makefile.in new-lordsawar-0.0.8/src/editor/Makefile.in
+--- old-lordsawar-0.0.8/src/game.cpp	2008-04-06 14:46:22.000000000 +0200
++++ new-lordsawar-0.0.8/src/game.cpp	2008-04-06 14:46:22.000000000 +0200
+@@ -833,8 +833,8 @@
+   if (stack)
+     {
+       can_move_selected_stack_along_path.emit
+-	(stack->getPath()->size() > 0 && stack->enoughMoves() ||
+-	 (stack->getPath()->size() && stack->getMovesExhaustedAtPoint() > 0));
++	((stack->getPath()->size() > 0 && stack->enoughMoves()) ||
++	 ((stack->getPath()->size() && stack->getMovesExhaustedAtPoint() > 0)));
+ 
+       /*
+        * a note about searching.
+@@ -1118,7 +1118,7 @@
    int retval;
    int gender;
    int side;
@@ -73,8 +84,8 @@
    const Armysetlist* al = Armysetlist::getInstance();
    const Army* herotype;
 diff -rN -u old-lordsawar-0.0.8/src/Location.h new-lordsawar-0.0.8/src/Location.h
---- old-lordsawar-0.0.8/src/Location.h	2008-04-06 12:44:15.000000000 +0200
-+++ new-lordsawar-0.0.8/src/Location.h	2008-04-06 12:44:15.000000000 +0200
+--- old-lordsawar-0.0.8/src/Location.h	2008-04-06 14:46:22.000000000 +0200
++++ new-lordsawar-0.0.8/src/Location.h	2008-04-06 14:46:22.000000000 +0200
 @@ -23,7 +23,7 @@
  
  class Player;
@@ -84,70 +95,15 @@
  
  /** A Location is a map object with a name. This is the metaclass for
    * cities, ruins and temples.
-diff -rN -u old-lordsawar-0.0.8/src/rewardlist.cpp new-lordsawar-0.0.8/src/rewardlist.cpp
---- old-lordsawar-0.0.8/src/rewardlist.cpp	2008-04-06 12:44:15.000000000 +0200
-+++ new-lordsawar-0.0.8/src/rewardlist.cpp	2008-04-06 12:44:15.000000000 +0200
-@@ -12,6 +12,7 @@
- //  along with this program; if not, write to the Free Software
- //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
-+#include <algorithm>
- #include <sigc++/functors/mem_fun.h>
- 
- #include "rewardlist.h"
-diff -rN -u old-lordsawar-0.0.8/src/stack.h new-lordsawar-0.0.8/src/stack.h
---- old-lordsawar-0.0.8/src/stack.h	2008-04-06 12:44:15.000000000 +0200
-+++ new-lordsawar-0.0.8/src/stack.h	2008-04-06 12:44:15.000000000 +0200
-@@ -15,6 +15,7 @@
- #ifndef STACK_H
- #define STACK_H
- 
-+#include <string>
- #include <list>
- #include <vector>
- #include "vector.h"
-diff -rN -u old-lordsawar-0.0.8/src/stacklist.cpp new-lordsawar-0.0.8/src/stacklist.cpp
---- old-lordsawar-0.0.8/src/stacklist.cpp	2008-04-06 12:44:15.000000000 +0200
-+++ new-lordsawar-0.0.8/src/stacklist.cpp	2008-04-06 12:44:15.000000000 +0200
-@@ -13,6 +13,7 @@
- //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
- #include <sigc++/functors/mem_fun.h>
-+#include <algorithm>
- 
- #include "stacklist.h"
- #include "stack.h"
-diff -rN -u old-lordsawar-0.0.8/src/stacklist.h new-lordsawar-0.0.8/src/stacklist.h
---- old-lordsawar-0.0.8/src/stacklist.h	2008-04-06 12:44:15.000000000 +0200
-+++ new-lordsawar-0.0.8/src/stacklist.h	2008-04-06 12:44:15.000000000 +0200
-@@ -15,6 +15,7 @@
- #ifndef STACKLIST_H
- #define STACKLIST_H
- 
-+#include <string>
- #include <list>
- #include <vector>
- #include <sigc++/trackable.h>
-diff -rN -u old-lordsawar-0.0.8/src/Threatlist.cpp new-lordsawar-0.0.8/src/Threatlist.cpp
---- old-lordsawar-0.0.8/src/Threatlist.cpp	2008-04-06 12:44:15.000000000 +0200
-+++ new-lordsawar-0.0.8/src/Threatlist.cpp	2008-04-06 12:44:15.000000000 +0200
-@@ -13,6 +13,7 @@
- //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- 
- #include <iostream>
-+#include <algorithm>
- 
- #include "Threatlist.h"
- #include "stack.h"
-diff -rN -u old-lordsawar-0.0.8/src/utils/extractv.cpp new-lordsawar-0.0.8/src/utils/extractv.cpp
---- old-lordsawar-0.0.8/src/utils/extractv.cpp	2008-04-06 12:44:15.000000000 +0200
-+++ new-lordsawar-0.0.8/src/utils/extractv.cpp	2008-04-06 12:44:15.000000000 +0200
-@@ -16,6 +16,7 @@
- 
- #include <stdio.h>
- #include <string>
-+#include <cstring>
- #include <vector>
- #include <iostream>
- #include "expat.h"
-
+diff -rN -u old-lordsawar-0.0.8/src/playerlist.cpp new-lordsawar-0.0.8/src/playerlist.cpp
+--- old-lordsawar-0.0.8/src/playerlist.cpp	2008-04-06 14:46:22.000000000 +0200
++++ new-lordsawar-0.0.8/src/playerlist.cpp	2008-04-06 14:46:22.000000000 +0200
+@@ -290,7 +290,7 @@
+ void Playerlist::calculateDiplomaticRankings()
+ {
+   unsigned int i = 0;
+-  char* titles[MAX_PLAYERS] = 
++  const char* titles[MAX_PLAYERS] = 
+     {
+       "Statesman",
+       "Diplomat",

More information about the Pkg-games-commits mailing list