Author: kibi-guest
Date: 2008-03-16 01:47:40 +0000 (Sun, 16 Mar 2008)
New Revision: 6099
Added:
packages/trunk/boswars/debian/patches/
packages/trunk/boswars/debian/patches/10_fix_ftbfs_with_gcc-4.3.diff
packages/trunk/boswars/debian/patches/series
Removed:
packages/trunk/boswars/debian/patches/
Modified:
packages/trunk/boswars/debian/changelog
packages/trunk/boswars/debian/rules
Log:
Fix FTBFS with gcc-4.3. Ensure patches are applied. Drop
10_lua_const_char.diff, no longer relevant.
Modified: packages/trunk/boswars/debian/changelog
===================================================================
--- packages/trunk/boswars/debian/changelog 2008-03-16 01:25:36 UTC (rev
6098)
+++ packages/trunk/boswars/debian/changelog 2008-03-16 01:47:40 UTC (rev
6099)
@@ -17,6 +17,12 @@
the GPL-2 explicitely, since some parts are GPL-2 and some others
are GPL-2+, as clarified by upstream in COPYRIGHT.txt, which gets
fully quoted in debian/copyright.
+ * Patches:
+ - Drop 10_lua_const_char.diff, no longer relevant.
+ - Add 10_fix_ftbfs_with_gcc-4.3.diff, which fixes missing includes
+ and prevents FTBFS with gcc-4.3.
+ - Make build-arch and build-indep depend on “patch” so that the
+ series is actually applied.
-- Cyril Brulebois <[EMAIL PROTECTED]> Sat, 15 Mar 2008 23:16:12 +0100
Added: packages/trunk/boswars/debian/patches/10_fix_ftbfs_with_gcc-4.3.diff
===================================================================
--- packages/trunk/boswars/debian/patches/10_fix_ftbfs_with_gcc-4.3.diff
(rev 0)
+++ packages/trunk/boswars/debian/patches/10_fix_ftbfs_with_gcc-4.3.diff
2008-03-16 01:47:40 UTC (rev 6099)
@@ -0,0 +1,22 @@
+--- a/engine/pathfinder/astar.cpp
++++ b/engine/pathfinder/astar.cpp
+@@ -36,6 +36,8 @@
+ #include "stratagus.h"
+ #include "pathfinder.h"
+
++#include <cstdlib>
++
+ /*----------------------------------------------------------------------------
+ -- Declarations
+ ----------------------------------------------------------------------------*/
+--- a/engine/stratagus/stratagus.cpp
++++ b/engine/stratagus/stratagus.cpp
+@@ -210,6 +210,8 @@
+ #include "title.h"
+ #include "map.h"
+
++#include <algorithm>
++
+
+ #if defined(_MSC_VER) && SDL_VERSION_ATLEAST(1, 2, 13)
+ #define REDIRECT_OUTPUT
Added: packages/trunk/boswars/debian/patches/series
===================================================================
--- packages/trunk/boswars/debian/patches/series
(rev 0)
+++ packages/trunk/boswars/debian/patches/series 2008-03-16 01:47:40 UTC
(rev 6099)
@@ -0,0 +1 @@
+10_fix_ftbfs_with_gcc-4.3.diff
Modified: packages/trunk/boswars/debian/rules
===================================================================
--- packages/trunk/boswars/debian/rules 2008-03-16 01:25:36 UTC (rev 6098)
+++ packages/trunk/boswars/debian/rules 2008-03-16 01:47:40 UTC (rev 6099)
@@ -27,12 +27,12 @@
#Architecture
build: build-arch build-indep
-build-arch: build-arch-stamp
+build-arch: patch build-arch-stamp
build-arch-stamp:
scons CCFLAGS=$(CCFLAGS)
touch $@
-build-indep: build-indep-stamp
+build-indep: patch build-indep-stamp
build-indep-stamp:
# Adjust the permissions
chmod +x languages/makesame.py
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
