diff options
| author | root <root@rshg054.dnsready.net> | 2012-07-19 00:01:52 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-07-19 00:01:52 +0000 |
| commit | 6b87f8519dc037f4fd4c19d8f36b7d7565559bd3 (patch) | |
| tree | 4c1b86f91ce9c742867b6eecd4857b20919cd713 /community/0ad | |
| parent | 63d179775e063452db6358e15b9847e7fc6c84b6 (diff) | |
Thu Jul 19 00:01:52 UTC 2012
Diffstat (limited to 'community/0ad')
| -rw-r--r-- | community/0ad/PKGBUILD | 9 | ||||
| -rw-r--r-- | community/0ad/boost-1.50.patch | 39 |
2 files changed, 45 insertions, 3 deletions
diff --git a/community/0ad/PKGBUILD b/community/0ad/PKGBUILD index 00f34cdc7..6b2a83894 100644 --- a/community/0ad/PKGBUILD +++ b/community/0ad/PKGBUILD @@ -4,21 +4,24 @@ pkgname=0ad pkgver=a10 _pkgver=r11863-alpha -pkgrel=2 +pkgrel=3 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game" arch=('i686' 'x86_64') url="http://wildfiregames.com/0ad" license=('GPL2' 'CCPL') depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'gamin' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'openexr' 'python2' 'sdl' 'wxgtk' 'zip' 'zlib' 'libgl' '0ad-data') makedepends=('boost' 'cmake' 'mesa') -source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz") -md5sums=('f42a2e18515cbcd48b99f0ea3796b3a4') +source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz" + "boost-1.50.patch") +md5sums=('f42a2e18515cbcd48b99f0ea3796b3a4' + '570724341102e23730de2f70d3a1b97c') build() { cd "$srcdir/$pkgname-$_pkgver/build/workspaces" sed -i 's/unix_names = { "boost_filesystem-mt", "boost_system-mt" },/unix_names = { "boost_filesystem", "boost_system" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua" sed -i 's/unix_names = { "boost_signals-mt" },/unix_names = { "boost_signals" },/g' "${srcdir}/${pkgname}-${_pkgver}/build/premake/extern_libs4.lua" + patch -d ../.. -Np1 < $srcdir/boost-1.50.patch ./update-workspaces.sh \ --with-system-enet \ diff --git a/community/0ad/boost-1.50.patch b/community/0ad/boost-1.50.patch new file mode 100644 index 000000000..26ebd3e96 --- /dev/null +++ b/community/0ad/boost-1.50.patch @@ -0,0 +1,39 @@ +diff -ru 0ad-r11863-alpha/source/graphics/TextureManager.cpp 0ad-r11863-alpha-patched/source/graphics/TextureManager.cpp +--- 0ad-r11863-alpha/source/graphics/TextureManager.cpp 2012-02-19 04:30:59.000000000 +0100 ++++ 0ad-r11863-alpha-patched/source/graphics/TextureManager.cpp 2012-07-10 21:00:52.753251312 +0200 +@@ -425,9 +425,9 @@ + CTextureConverter::SettingsFile* f = GetSettingsFile(settingsPath); + if (f) + files.push_back(f); +- p = p / *it; ++ p = p / it->wstring(); + } +- return m_TextureConverter.ComputeSettings(srcPath.leaf(), files); ++ return m_TextureConverter.ComputeSettings(srcPath.leaf().wstring(), files); + } + + /** +diff -ru 0ad-r11863-alpha/source/lib/pch/pch_boost.h 0ad-r11863-alpha-patched/source/lib/pch/pch_boost.h +--- 0ad-r11863-alpha/source/lib/pch/pch_boost.h 2012-02-16 19:01:10.000000000 +0100 ++++ 0ad-r11863-alpha-patched/source/lib/pch/pch_boost.h 2012-07-10 19:51:38.413009623 +0200 +@@ -25,7 +25,7 @@ + + // the following boost libraries have been included in TR1 and are + // thus deemed usable: +-#define BOOST_FILESYSTEM_VERSION 2 ++#define BOOST_FILESYSTEM_VERSION 3 + #include <boost/filesystem.hpp> + namespace fs = boost::filesystem; + #include <boost/shared_ptr.hpp> +diff -ru 0ad-r11863-alpha/source/simulation2/components/ICmpAIManager.cpp 0ad-r11863-alpha-patched/source/simulation2/components/ICmpAIManager.cpp +--- 0ad-r11863-alpha/source/simulation2/components/ICmpAIManager.cpp 2011-05-25 12:39:13.000000000 +0200 ++++ 0ad-r11863-alpha-patched/source/simulation2/components/ICmpAIManager.cpp 2012-07-10 20:55:52.523233843 +0200 +@@ -53,7 +53,7 @@ + fs::wpath components = pathname.string(); + fs::wpath::iterator it = components.begin(); + std::advance(it, 2); +- std::wstring dirname = *it; ++ std::wstring dirname = it->wstring(); + + CScriptValRooted ai; + self->m_ScriptInterface.Eval("({})", ai); |