[arch-commits] Commit in miro/trunk (PKGBUILD boost_1.36.0_fix.patch)

[Ronald van Haren]

    Date: Sunday, September 21, 2008 @ 08:14:02
  Author: ronald
Revision: 12819

upgpkg: miro 1.2.7-2

Added:
  miro/trunk/boost_1.36.0_fix.patch
Modified:
  miro/trunk/PKGBUILD

------------------------+
 PKGBUILD               |    3 ++-
 boost_1.36.0_fix.patch |   32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-09-21 12:12:34 UTC (rev 12818)
+++ PKGBUILD	2008-09-21 12:14:02 UTC (rev 12819)
@@ -24,7 +24,8 @@
 	boost_1.36.0_fix.patch)
 md5sums=('e55150642de55fc52eb2599e3dc6fe21'
          'b5482eac565a26817af0105b061a8ad5'
-         '3c06b40cd13c2fb202f58dcf64d4b524')
+         '3c06b40cd13c2fb202f58dcf64d4b524'
+         '3b4e1eac01155b9de381b0744ba9d725')
 
 build() {
   cd ${srcdir}/Miro-${pkgver}

Added: boost_1.36.0_fix.patch
===================================================================
--- boost_1.36.0_fix.patch	                        (rev 0)
+++ boost_1.36.0_fix.patch	2008-09-21 12:14:02 UTC (rev 12819)
@@ -0,0 +1,32 @@
+--- Miro-1.2.7/portable/libtorrent/src/torrent_info.cpp.old	2008-09-21 13:47:00.122974031 +0200
++++ Miro-1.2.7/portable/libtorrent/src/torrent_info.cpp	2008-09-21 13:48:54.812965713 +0200
+@@ -352,7 +352,7 @@
+ 		fs::path tmp = m_name;
+ 		if (tmp.is_complete()) throw std::runtime_error("torrent contains "
+ 			"a file with an absolute path: '" + m_name + "'");
+-		if (tmp.has_branch_path()) throw std::runtime_error(
++		if (!tmp.branch_path().empty()) throw std::runtime_error(
+ 			"torrent contains name with directories: '" + m_name + "'");
+ 	
+ 		// extract file list
+@@ -556,7 +556,7 @@
+ 	{
+ //		TORRENT_ASSERT(file.begin() != file.end());
+ 
+-		if (!file.has_branch_path())
++		if (file.branch_path().empty())
+ 		{
+ 			// you have already added at least one file with a
+ 			// path to the file (branch_path), which means that
+
+--- Miro-1.2.7/portable/libtorrent/include/libtorrent/disk_io_thread.hpp.old	2008-09-21 13:57:05.433330334 +0200
++++ Miro-1.2.7/portable/libtorrent/include/libtorrent/disk_io_thread.hpp	2008-09-21 13:57:29.060304305 +0200
+@@ -41,6 +41,7 @@
+ #include <boost/bind.hpp>
+ #include <boost/pool/pool.hpp>
+ #include <boost/noncopyable.hpp>
++#include <boost/thread/condition.hpp>
+ #include "libtorrent/config.hpp"
+ 
+ namespace libtorrent
+