[arch-commits] Commit in 0ad/repos (10 files)

Stéphane Gaudreault stephane at nymeria.archlinux.org
Mon Jan 28 16:49:23 UTC 2013


    Date: Monday, January 28, 2013 @ 17:49:23
  Author: stephane
Revision: 83239

db-move: moved 0ad from [community-testing] to [community] (i686, x86_64)

Added:
  0ad/repos/community-i686/PKGBUILD
    (from rev 83238, 0ad/repos/community-testing-i686/PKGBUILD)
  0ad/repos/community-i686/boost-1.50.patch
    (from rev 83238, 0ad/repos/community-testing-i686/boost-1.50.patch)
  0ad/repos/community-x86_64/PKGBUILD
    (from rev 83238, 0ad/repos/community-testing-x86_64/PKGBUILD)
  0ad/repos/community-x86_64/boost-1.50.patch
    (from rev 83238, 0ad/repos/community-testing-x86_64/boost-1.50.patch)
Deleted:
  0ad/repos/community-i686/PKGBUILD
  0ad/repos/community-i686/boost-1.50.patch
  0ad/repos/community-testing-i686/
  0ad/repos/community-testing-x86_64/
  0ad/repos/community-x86_64/PKGBUILD
  0ad/repos/community-x86_64/boost-1.50.patch

-----------------------------------+
 community-i686/PKGBUILD           |   85 ++++++++++++++++++------------------
 community-i686/boost-1.50.patch   |   78 ++++++++++++++++-----------------
 community-x86_64/PKGBUILD         |   85 ++++++++++++++++++------------------
 community-x86_64/boost-1.50.patch |   78 ++++++++++++++++-----------------
 4 files changed, 164 insertions(+), 162 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-01-28 15:29:15 UTC (rev 83238)
+++ community-i686/PKGBUILD	2013-01-28 16:49:23 UTC (rev 83239)
@@ -1,42 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
-# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
-pkgname=0ad
-pkgver=a12
-_pkgver=0.0.12-alpha
-pkgrel=1
-pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
-arch=('i686' 'x86_64')
-url="http://play0ad.com/"
-license=('GPL2' 'CCPL')
-depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu')
-makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2')
-source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz")
-md5sums=('0ff92fb2b22b5384067cdd88b89e5450')
-
-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"
-
-  ./update-workspaces.sh \
-      --with-system-enet \
-      --bindir=/usr/bin \
-      --libdir=/usr/lib \
-      --datadir=/usr/share/${pkgname}/data
-
-  cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
-
-  make CONFIG=Release
-}
-
-package() {
-  install -d ${pkgdir}/usr/{bin,lib}
-  install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/pyrogenesis ${pkgdir}/usr/bin
-  install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} ${pkgdir}/usr/lib
-
-  install -Dm755 "${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-  install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-}

Copied: 0ad/repos/community-i686/PKGBUILD (from rev 83238, 0ad/repos/community-testing-i686/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-01-28 16:49:23 UTC (rev 83239)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
+# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
+pkgname=0ad
+pkgver=a12
+_pkgver=0.0.12-alpha
+pkgrel=2
+pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
+arch=('i686' 'x86_64')
+url="http://play0ad.com/"
+license=('GPL2' 'CCPL')
+depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu')
+makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2')
+source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz")
+md5sums=('0ff92fb2b22b5384067cdd88b89e5450')
+
+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"
+
+  ./update-workspaces.sh \
+      --with-system-enet \
+      --bindir=/usr/bin \
+      --libdir=/usr/lib \
+      --datadir=/usr/share/${pkgname}/data
+
+  cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
+
+  make CONFIG=Release
+}
+
+package() {
+  install -d "${pkgdir}"/usr/{bin,lib}
+  install -Dm755 "${srcdir}"/${pkgname}-${_pkgver}/binaries/system/pyrogenesis "${pkgdir}/usr/bin"
+  install -Dm755 "${srcdir}"/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} "${pkgdir}/usr/lib"
+
+  install -Dm755 "${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+}

Deleted: community-i686/boost-1.50.patch
===================================================================
--- community-i686/boost-1.50.patch	2013-01-28 15:29:15 UTC (rev 83238)
+++ community-i686/boost-1.50.patch	2013-01-28 16:49:23 UTC (rev 83239)
@@ -1,39 +0,0 @@
-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);

Copied: 0ad/repos/community-i686/boost-1.50.patch (from rev 83238, 0ad/repos/community-testing-i686/boost-1.50.patch)
===================================================================
--- community-i686/boost-1.50.patch	                        (rev 0)
+++ community-i686/boost-1.50.patch	2013-01-28 16:49:23 UTC (rev 83239)
@@ -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);

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-01-28 15:29:15 UTC (rev 83238)
+++ community-x86_64/PKGBUILD	2013-01-28 16:49:23 UTC (rev 83239)
@@ -1,42 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
-# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
-pkgname=0ad
-pkgver=a12
-_pkgver=0.0.12-alpha
-pkgrel=1
-pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
-arch=('i686' 'x86_64')
-url="http://play0ad.com/"
-license=('GPL2' 'CCPL')
-depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu')
-makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2')
-source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz")
-md5sums=('0ff92fb2b22b5384067cdd88b89e5450')
-
-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"
-
-  ./update-workspaces.sh \
-      --with-system-enet \
-      --bindir=/usr/bin \
-      --libdir=/usr/lib \
-      --datadir=/usr/share/${pkgname}/data
-
-  cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
-
-  make CONFIG=Release
-}
-
-package() {
-  install -d ${pkgdir}/usr/{bin,lib}
-  install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/pyrogenesis ${pkgdir}/usr/bin
-  install -Dm755 ${srcdir}/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} ${pkgdir}/usr/lib
-
-  install -Dm755 "${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-  install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-  install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-}

Copied: 0ad/repos/community-x86_64/PKGBUILD (from rev 83238, 0ad/repos/community-testing-x86_64/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-01-28 16:49:23 UTC (rev 83239)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: t3ddy  <t3ddy1988 "at" gmail {dot} com>
+# Contributor: Adrián Chaves Fernández (Gallaecio) <adriyetichaves at gmail.com>
+pkgname=0ad
+pkgver=a12
+_pkgver=0.0.12-alpha
+pkgrel=2
+pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
+arch=('i686' 'x86_64')
+url="http://play0ad.com/"
+license=('GPL2' 'CCPL')
+depends=('binutils' 'boost-libs' 'curl' 'enet>=1.3' 'libogg' 'libpng' 'libvorbis' 'libxml2' 'openal' 'sdl' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu')
+makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2')
+source=("http://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz")
+md5sums=('0ff92fb2b22b5384067cdd88b89e5450')
+
+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"
+
+  ./update-workspaces.sh \
+      --with-system-enet \
+      --bindir=/usr/bin \
+      --libdir=/usr/lib \
+      --datadir=/usr/share/${pkgname}/data
+
+  cd "$srcdir/$pkgname-$_pkgver/build/workspaces/gcc"
+
+  make CONFIG=Release
+}
+
+package() {
+  install -d "${pkgdir}"/usr/{bin,lib}
+  install -Dm755 "${srcdir}"/${pkgname}-${_pkgver}/binaries/system/pyrogenesis "${pkgdir}/usr/bin"
+  install -Dm755 "${srcdir}"/${pkgname}-${_pkgver}/binaries/system/*.so{,.1.0} "${pkgdir}/usr/lib"
+
+  install -Dm755 "${srcdir}/${pkgname}-${_pkgver}/build/resources/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 "${srcdir}/$pkgname-$_pkgver/build/resources/${pkgname}.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+}

Deleted: community-x86_64/boost-1.50.patch
===================================================================
--- community-x86_64/boost-1.50.patch	2013-01-28 15:29:15 UTC (rev 83238)
+++ community-x86_64/boost-1.50.patch	2013-01-28 16:49:23 UTC (rev 83239)
@@ -1,39 +0,0 @@
-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);

Copied: 0ad/repos/community-x86_64/boost-1.50.patch (from rev 83238, 0ad/repos/community-testing-x86_64/boost-1.50.patch)
===================================================================
--- community-x86_64/boost-1.50.patch	                        (rev 0)
+++ community-x86_64/boost-1.50.patch	2013-01-28 16:49:23 UTC (rev 83239)
@@ -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);




More information about the arch-commits mailing list