From 06d75ab8cc5ac5ca55793ad69842e657e2e6fc79 Mon Sep 17 00:00:00 2001
From: tron <tron@pkgsrc.org>
Date: Sun, 12 May 2013 11:30:13 +0000
Subject: Fix build problems under Mac OS X Lion (and possibly other platforms
 that use GCC 4.1.x) caused by unapproved C++11/TR1 patches.

---
 net/libtorrent/distinfo                            |  3 ++-
 .../patches/patch-src_data_chunk__list.cpp         | 29 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 net/libtorrent/patches/patch-src_data_chunk__list.cpp

(limited to 'net')

diff --git a/net/libtorrent/distinfo b/net/libtorrent/distinfo
index 5e67eaefad5..dde01e26b69 100644
--- a/net/libtorrent/distinfo
+++ b/net/libtorrent/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2013/05/09 14:26:41 joerg Exp $
+$NetBSD: distinfo,v 1.31 2013/05/12 11:30:13 tron Exp $
 
 SHA1 (libtorrent-0.13.2.tar.gz) = 4f34a744fbe10c54aaf53d34681fabc1a49d7257
 RMD160 (libtorrent-0.13.2.tar.gz) = 090e6af9b4318a6176064159f6a8f70ab708c7fe
@@ -6,6 +6,7 @@ Size (libtorrent-0.13.2.tar.gz) = 725088 bytes
 SHA1 (patch-rak_priority__queue__default.h) = 2eee25447516efd1ac13d1a35232c29a7457c0df
 SHA1 (patch-src_Makefile.am) = e69dd1da8a9736fa45af71cfc167c8b89a7fe648
 SHA1 (patch-src_Makefile.in) = 522fbdb8da913d351fd86aface86aa2d1d86b5cc
+SHA1 (patch-src_data_chunk__list.cpp) = 4b09b093ca5f2abdb7e4d3c1c0bdb9fdfcd4f981
 SHA1 (patch-src_data_chunk__list.h) = 124832de1fd5ccaa1f89ba8b6d26fd74373e619e
 SHA1 (patch-src_data_hash__check__queue.h) = a0f2118ca92309472e402e441fa6f37706a4e1b8
 SHA1 (patch-src_data_hash__queue.cc) = c0a7395f76df2db73315e4cae5b8729c4af29d67
diff --git a/net/libtorrent/patches/patch-src_data_chunk__list.cpp b/net/libtorrent/patches/patch-src_data_chunk__list.cpp
new file mode 100644
index 00000000000..dbb9c56377f
--- /dev/null
+++ b/net/libtorrent/patches/patch-src_data_chunk__list.cpp
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_data_chunk__list.cpp,v 1.1 2013/05/12 11:30:13 tron Exp $
+
+--- src/data/chunk_list.cc.orig	2012-02-22 07:50:27.000000000 +0000
++++ src/data/chunk_list.cc	2013-05-12 12:25:45.000000000 +0100
+@@ -368,19 +368,19 @@
+   if (flags & sync_force) {
+ 
+     if (flags & sync_safe)
+-      return std::make_pair(MemoryChunk::sync_sync, true);
++      return std::make_pair((int)MemoryChunk::sync_sync, true);
+     else
+-      return std::make_pair(MemoryChunk::sync_async, true);
++      return std::make_pair((int)MemoryChunk::sync_async, true);
+ 
+   } else if (flags & sync_safe) {
+       
+     if (node->sync_triggered())
+-      return std::make_pair(MemoryChunk::sync_sync, true);
++      return std::make_pair((int)MemoryChunk::sync_sync, true);
+     else
+-      return std::make_pair(MemoryChunk::sync_async, false);
++      return std::make_pair((int)MemoryChunk::sync_async, false);
+ 
+   } else {
+-    return std::make_pair(MemoryChunk::sync_async, true);
++    return std::make_pair((int)MemoryChunk::sync_async, true);
+   }
+ }
+ 
-- 
cgit v1.2.3