Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting8.git;a=commitdiff;h=cf3e9a01dcbeee030a87d7d9ca788c4b81d18ca6
commit cf3e9a01dcbeee030a87d7d9ca788c4b81d18ca6 Author: James Buren <[email protected]> Date: Thu Nov 29 02:42:19 2012 -0600 wesnoth-1.11.0-2-x86_64 * rebuild with libboost diff --git a/source/games-extra/wesnoth/FrugalBuild b/source/games-extra/wesnoth/FrugalBuild index eab0936..346e566 100644 --- a/source/games-extra/wesnoth/FrugalBuild +++ b/source/games-extra/wesnoth/FrugalBuild @@ -4,20 +4,22 @@ pkgname=wesnoth pkgver=1.11.0 -pkgrel=1 +pkgrel=2 pkgdesc="Wesnoth is a turn based strategy game played in the fantasy world" depends=('sdl>=1.2.13-2' 'sdlimage>=1.2.6-2' 'sdl_net>=1.2.7' 'sdl_mixer>=1.2.8' 'libpng' 'libjpeg' 'libogg' \ - 'vorbis-tools' 'freetype2' 'python-tools>=2.6' 'fribidi' 'libboost>=1.49.0' 'sdl_ttf>=2.0.9' 'pango>=1.24.2-2' 'cairo>=1.8.6-3') + 'vorbis-tools' 'freetype2' 'python-tools>=2.6' 'fribidi' 'libboost>=1.51.0' 'sdl_ttf>=2.0.9' 'pango>=1.24.2-2' 'cairo>=1.8.6-3') makedepends=('boost') Finclude cmake groups=('games-extra') archs=('i686' 'x86_64') _F_sourceforge_ext=".tar.bz2" Finclude sourceforge +source=(${source[@]} boost.patch) url="http://www.wesnoth.org/"; Fconfopts+=" --enable-server --enable-editor --enable-tools \ --enable-campaign-server --with-fifodir=/var/run/wesnoth \ --disable-strict-compilation" -sha1sums=('e85344e45c98480f1fb5eb393abff754110dcd2b') +sha1sums=('e85344e45c98480f1fb5eb393abff754110dcd2b' \ + 'e577c4ead5b43cdd5d59f126e4d012cf4815dabc') # optimization OK diff --git a/source/games-extra/wesnoth/boost.patch b/source/games-extra/wesnoth/boost.patch new file mode 100644 index 0000000..fe66b99 --- /dev/null +++ b/source/games-extra/wesnoth/boost.patch @@ -0,0 +1,15 @@ +--- a/src/image.cpp 2012/11/03 15:08:51 55641 ++++ b/src/image.cpp 2012/11/03 15:22:21 55642 +@@ -349,7 +349,11 @@ + using boost::hash_value; + using boost::hash_combine; + +- size_t hash = hash_value(val.type_); ++ /* ++ * Boost 1.51.0 seems not longer accept an enumerate value in its hash ++ * function so cast it to a type it does like. ++ */ ++ size_t hash = hash_value(static_cast<unsigned>(val.type_)); + if (val.type_ == locator::FILE || val.type_ == locator::SUB_FILE) { + hash_combine(hash, val.filename_); + } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
