diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-23 18:13:37 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-07-23 18:13:37 +0200 |
commit | cc565b7309a5708f2375b5f6926d173fd122119d (patch) | |
tree | c1d4adcda7f0b767537620aea02633158e17218a /community-testing/0ad/boost-1.50.patch | |
parent | c25ed1401d3fa3dd6827c33bc11b660dcd425f23 (diff) | |
parent | a65eb6fe2ea0ffa22c65de34506c88aeeb3c88ee (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/electricsheep/PKGBUILD
community/bitcoin/PKGBUILD
community/gnash/PKGBUILD
community/mongodb/PKGBUILD
community/xmlrpc-c/PKGBUILD
community/xmoto/PKGBUILD
core/kbd/PKGBUILD
extra/elfutils/PKGBUILD
extra/gtk2/PKGBUILD
extra/hddtemp/PKGBUILD
extra/libpst/PKGBUILD
extra/mkvtoolnix/PKGBUILD
extra/php-apc/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/pyqt/PKGBUILD
extra/quota-tools/PKGBUILD
extra/rhythmbox/PKGBUILD
extra/virtuoso/PKGBUILD
extra/vlc/PKGBUILD
extra/xf86-video-siliconmotion/PKGBUILD
kde-unstable/soprano/PKGBUILD
libre/epdfview-libre/PKGBUILD
libre/pacman/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/wine/PKGBUILD
multilib/zsnes/PKGBUILD
testing/bash/PKGBUILD
testing/bison/PKGBUILD
testing/dbus-core/PKGBUILD
testing/dbus/PKGBUILD
testing/readline/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'community-testing/0ad/boost-1.50.patch')
-rw-r--r-- | community-testing/0ad/boost-1.50.patch | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/community-testing/0ad/boost-1.50.patch b/community-testing/0ad/boost-1.50.patch deleted file mode 100644 index 26ebd3e96..000000000 --- a/community-testing/0ad/boost-1.50.patch +++ /dev/null @@ -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); |