mirror of
https://git.freebsd.org/ports.git
synced 2025-06-20 20:20:30 -04:00
be35077f23
Patch conflict on update should make it apparent when to prune but due to how fuzz works this doesn't always happen with + lines.
53 lines
1.9 KiB
Text
53 lines
1.9 KiB
Text
https://github.com/arvidn/libtorrent/commit/a5da48edd4be
|
|
|
|
--- include/libtorrent/disk_io_job.hpp.orig 2018-10-05 09:19:18 UTC
|
|
+++ include/libtorrent/disk_io_job.hpp
|
|
@@ -43,7 +43,7 @@ POSSIBILITY OF SUCH DAMAGE.
|
|
#include <string>
|
|
#include <boost/function/function1.hpp>
|
|
#include <boost/shared_ptr.hpp>
|
|
-#include <boost/shared_ptr.hpp>
|
|
+#include <boost/noncopyable.hpp>
|
|
|
|
#include "libtorrent/aux_/disable_warnings_pop.hpp"
|
|
|
|
--- include/libtorrent/kademlia/observer.hpp.orig 2018-10-05 09:19:18 UTC
|
|
+++ include/libtorrent/kademlia/observer.hpp
|
|
@@ -42,6 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
|
|
#include <boost/detail/atomic_count.hpp>
|
|
#include <boost/intrusive_ptr.hpp>
|
|
#include <boost/cstdint.hpp>
|
|
+#include <boost/noncopyable.hpp>
|
|
|
|
#include "libtorrent/aux_/disable_warnings_pop.hpp"
|
|
|
|
--- include/libtorrent/proxy_base.hpp.orig 2018-10-05 09:19:18 UTC
|
|
+++ include/libtorrent/proxy_base.hpp
|
|
@@ -42,6 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
|
|
#include "libtorrent/aux_/disable_warnings_push.hpp"
|
|
#include <boost/function/function1.hpp>
|
|
#include <boost/shared_ptr.hpp>
|
|
+#include <boost/noncopyable.hpp>
|
|
#include "libtorrent/aux_/disable_warnings_pop.hpp"
|
|
|
|
namespace libtorrent {
|
|
--- include/libtorrent/tracker_manager.hpp.orig 2018-10-05 09:19:21 UTC
|
|
+++ include/libtorrent/tracker_manager.hpp
|
|
@@ -50,6 +50,7 @@ POSSIBILITY OF SUCH DAMAGE.
|
|
#include <boost/tuple/tuple.hpp>
|
|
#include <boost/unordered_map.hpp>
|
|
#include <boost/optional.hpp>
|
|
+#include <boost/noncopyable.hpp>
|
|
|
|
#ifdef TORRENT_USE_OPENSSL
|
|
// there is no forward declaration header for asio
|
|
--- src/kademlia/dht_storage.cpp.orig 2018-10-05 09:19:18 UTC
|
|
+++ src/kademlia/dht_storage.cpp
|
|
@@ -38,6 +38,7 @@ POSSIBILITY OF SUCH DAMAGE.
|
|
#include <boost/bind.hpp>
|
|
#include <boost/function/function1.hpp>
|
|
#include <boost/tuple/tuple.hpp>
|
|
+#include <boost/noncopyable.hpp>
|
|
|
|
#include "libtorrent/aux_/disable_warnings_pop.hpp"
|
|
|