[lordsawar] 27/133: Let's try to compile it with gcc 4.3
Markus Koschany
apo-guest at moszumanska.debian.org
Thu Jul 2 17:37:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository lordsawar.
commit e9b098a1587c806b4f9e474147f3491b7aa87d71
Author: Alexander Reichle-Schmehl <tolimar at debian.org>
Date: Sun Apr 6 11:17:48 2008 +0000
Let's try to compile it with gcc 4.3
---
debian/changelog | 11 +--
debian/control | 2 +-
debian/patches/ftbfs_gcc-4.3_fix.diff | 153 ++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 2 +
5 files changed, 163 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b94de1e..6e9f881 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-lordsawar (0.0.8-2) UNRELEASED; urgency=low
-
- [ Alexander Schmehl ]
- * NOT RELEASED YET
+lordsawar (0.0.8-2) unstable; urgency=high
[ Eddy Petrișor ]
* fix Vcs-Svn URL to point to svn, not the incomplete ssh location
- -- Eddy Petrișor <eddy.petrisor at gmail.com> Wed, 05 Mar 2008 02:01:39 +0200
+ [ Alexander Schmehl ]
+ * Added patches/ftbfs_gcc-4.3_fix.diff to fix FTBFS with gcc 4.3 (not
+ reported in the BTS but release critical, therefore urgency high)
+
+ -- Alexander Schmehl <tolimar at debian.org> Sun, 06 Apr 2008 13:16:14 +0200
lordsawar (0.0.8-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b0ed03c..f73a58d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
Priority: extra
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Barry deFreese <bddebian at comcast.net>, Alexander Schmehl <tolimar at debian.org>
-Build-Depends: debhelper (>= 5), autotools-dev, libgtkmm-2.4-dev, libgtkmm-2.4-1c2a, libglademm-2.4-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libggz-dev, libggzdmod-dev, libggzmod-dev
+Build-Depends: debhelper (>= 5), autotools-dev, libgtkmm-2.4-dev, libgtkmm-2.4-1c2a, libglademm-2.4-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev, libggz-dev, libggzdmod-dev, libggzmod-dev, quilt
Standards-Version: 3.7.3
Homepage: http://www.lordsawar.com
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/lordsawar/
diff --git a/debian/patches/ftbfs_gcc-4.3_fix.diff b/debian/patches/ftbfs_gcc-4.3_fix.diff
new file mode 100644
index 0000000..c3eeb9c
--- /dev/null
+++ b/debian/patches/ftbfs_gcc-4.3_fix.diff
@@ -0,0 +1,153 @@
+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
+@@ -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 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 @@
+ 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/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 @@
+ 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 12:44:15.000000000 +0200
++++ new-lordsawar-0.0.8/src/Location.h 2008-04-06 12:44:15.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/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 --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2b8f7b0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ftbfs_gcc-4.3_fix.diff
diff --git a/debian/rules b/debian/rules
index 7a2dac6..7b51be1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ endif
config.status: configure
dh_testdir
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
@@ -41,6 +42,7 @@ build-stamp: config.status
clean:
dh_testdir
dh_testroot
+ QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
rm -f build-stamp
[ ! -f Makefile ] || $(MAKE) distclean
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lordsawar.git
More information about the Pkg-games-commits
mailing list