r6461 - packages/trunk/lordsawar/debian/patches

[Alexander Schmehl]

Author: tolimar
Date: 2008-04-06 21:17:21 +0000 (Sun, 06 Apr 2008)
New Revision: 6461

Removed:
   packages/trunk/lordsawar/debian/patches/ftbfs_gcc-4.3_fix.diff
Log:
Removing not working patch

Deleted: 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 21:05:55 UTC (rev 6460)
+++ packages/trunk/lordsawar/debian/patches/ftbfs_gcc-4.3_fix.diff	2008-04-06 21:17:21 UTC (rev 6461)
@@ -1,109 +0,0 @@
-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 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
- if test "x$1" = "xexport" || test "x$2" = "xexport"; then
--  CPPFLAGS="$CPPFLAGS -isystem ${ac_ggz_prefix_incdir}"
-+  CPPFLAGS="$CPPFLAGS -I ${ac_ggz_prefix_incdir}"
-   LDFLAGS="$LDFLAGS -L${ac_ggz_prefix_libdir}"
- fi
- 
-@@ -262,7 +262,7 @@
-   AC_SUBST(libggz_libraries)
-   AC_SUBST(libggz_includes)
- 
--  LIBGGZ_INCLUDES="-isystem $libggz_includes"
-+  LIBGGZ_INCLUDES="-I $libggz_includes"
-   LIBGGZ_LDFLAGS="-L$libggz_libraries"
- 
-   AC_SUBST(LIBGGZ_INCLUDES)
-@@ -361,7 +361,7 @@
-   AC_SUBST(ggzcore_libraries)
-   AC_SUBST(ggzcore_includes)
- 
--  GGZCORE_INCLUDES="-isystem $ggzcore_includes"
-+  GGZCORE_INCLUDES="-I $ggzcore_includes"
-   GGZCORE_LDFLAGS="-L$ggzcore_libraries"
- 
-   AC_SUBST(GGZCORE_INCLUDES)
-@@ -561,7 +561,7 @@
-   AC_SUBST(ggzmod_libraries)
-   AC_SUBST(ggzmod_includes)
- 
--  GGZMOD_INCLUDES="-isystem $ggzmod_includes"
-+  GGZMOD_INCLUDES="-I $ggzmod_includes"
-   GGZMOD_LDFLAGS="-L$ggzmod_libraries"
- 
-   AC_SUBST(GGZMOD_INCLUDES)
-@@ -659,7 +659,7 @@
-   AC_SUBST(ggzdmod_libraries)
-   AC_SUBST(ggzdmod_includes)
- 
--  GGZDMOD_INCLUDES="-isystem $ggzdmod_includes"
-+  GGZDMOD_INCLUDES="-I $ggzdmod_includes"
-   GGZDMOD_LDFLAGS="-L$ggzdmod_libraries"
- 
-   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 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)
- 		    {
--			if (x < 0 || x >= GameMap::getWidth() &&
--			    y < 0 || y >= GameMap::getHeight())
-+			if ((x < 0 || x >= GameMap::getWidth()) &&
-+			    (y < 0 || y >= GameMap::getHeight()))
- 			    continue;
- 
- 			Vector<int> pos(x, y);
-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;
--  size_t bytesread = 0;
-+  int bytesread = 0;
-   char *tmp;
-   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 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;
- class Location;
--class ::Object;
-+//class ::Object;
- 
- /** 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/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",