[Lunar-commits] <moonbase-other> wesnoth: fix build with boost 1.50 and fix typo

[v4hn]

commit ddc51ace6654536b1b547f276ecbde5a7f36aca7
Author: v4hn <me at v4hn.de>
Date: Tue, 24 Jul 2012 05:06:34 -0700
URL: https://github.com/lunar-linux/moonbase-other/commit/ddc51ace6654536b1b547f276ecbde5a7f36aca7

wesnoth: fix build with boost 1.50 and fix typo
---
  games/wesnoth/BUILD                                          +10/-1    
  games/wesnoth/CONFIGURE                                      +1/-1     
  2 files changed, 11 insertions (+), 2 deletions (-)

--- a/games/wesnoth/BUILD
+++ b/games/wesnoth/BUILD
@@ -1,4 +1,13 @@
 (
+
+  # this seems to be a bad bug in boost
+  # see https://svn.boost.org/trac/boost/ticket/6131
+  # the following is based on an 12000 lines ArchLinux patch
+  for file in $(grep -l foreach -r . | grep "cpp\$\|hpp$"); do
+    sedit "/#include/ ! s:foreach:BOOST_FOREACH:g" $file &&
+    sedit "s:#include \".*foreach.hpp\":#include <boost/foreach.hpp>:" $file
+  done &&
+
   OPTS+=" -DBINDIR=games \
           -DDATAROOTDIR=${MODULE_PREFIX}/share/games/ \
           -DDESKTOPDIR=${MODULE_PREFIX}/share/applications \
@@ -6,7 +15,7 @@
           -DMANDIR=${MODULE_PREFIX}/share/man \
           -DDOCDIR=${MODULE_PREFIX}/doc"
 
-  #fribidi is obsolete and would require 0.10.*
+  # fribidi is obsolete and would require 0.10.*
   OPTS+=" -DENABLE_FRIBIDI=OFF"
 
   if ! in_depends pango cairo; then
--- a/games/wesnoth/CONFIGURE
+++ b/games/wesnoth/CONFIGURE
@@ -1,5 +1,5 @@
 mquery WESNOTH_LOWMEM "Enable lowmem wesnoth?" n "-DENABLE_LOW_MEM=ON" "-DENABLE_LOW_MEM=OFF"
 mquery WESNOTH_GAME "Build the game?" y "-DENABLE_GAME=ON" "-DENABLE_GAME=OFF"
 mquery WESNOTH_SERVER "Build the server?" n "-DENABLE_SERVER=ON" "-DENABLE_SERVER=OFF"
-mquery WESNOTH_CAMPAIN_SERVER "Build the campain server?" n "-DENABLE_CAMPAIN_SERVER=ON" "-DENABLE_CAMPAIN_SERVER=OFF"
+mquery WESNOTH_CAMPAIGN_SERVER "Build the campaign server?" n "-DENABLE_CAMPAIGN_SERVER=ON" "-DENABLE_CAMPAIGN_SERVER=OFF"
 mquery WESNOTH_TOOLS "Build the developer tools?" n "-DENABLE_TOOLS=ON" "-DENABLE_TOOLS=OFF"