- Fix build with new boost

Submitted by:	Alexander Churanov <alexanderchuranov@gmail.com>
This commit is contained in:
Pav Lucistnik 2010-12-27 20:55:08 +00:00
parent 7466c9b14f
commit 60dfc9c453
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=267027
9 changed files with 119 additions and 2 deletions

View File

@ -26,8 +26,6 @@ LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \
BUILD_DEPENDS= ${RUN_DEPENDS} \
ant:${PORTSDIR}/devel/apache-ant
BROKEN= does not build
OPTIONS= TCMALLOC "Use Tcmalloc" on \
HOARD "Use Hoard" off \
PYTHONLIBS "Add Python binding" off \

View File

@ -0,0 +1,29 @@
--- src/cc/Hypertable/Lib/HqlInterpreter.cc.orig 2010-12-13 17:56:18.000000000 +0300
+++ src/cc/Hypertable/Lib/HqlInterpreter.cc 2010-12-13 17:55:27.000000000 +0300
@@ -272,7 +272,7 @@
}
else {
out_fd = dup(fileno(outf));
- fout.push(boost::iostreams::file_descriptor_sink(out_fd));
+ fout.push(boost::iostreams::file_descriptor_sink(out_fd, boost::iostreams::never_close_handle));
}
HT_ON_SCOPE_EXIT(&close_file, out_fd);
@@ -397,7 +397,7 @@
}
else {
out_fd = dup(fileno(outf));
- fout.push(boost::iostreams::file_descriptor_sink(out_fd));
+ fout.push(boost::iostreams::file_descriptor_sink(out_fd, boost::iostreams::never_close_handle));
}
HT_ON_SCOPE_EXIT(&close_file, out_fd);
@@ -488,7 +488,7 @@
else {
if (outf) {
out_fd = dup(fileno(outf));
- fout.push(boost::iostreams::file_descriptor_sink(out_fd));
+ fout.push(boost::iostreams::file_descriptor_sink(out_fd, boost::iostreams::never_close_handle));
}
else
fout.push(boost::iostreams::null_sink());

View File

@ -0,0 +1,10 @@
--- Source_Files/Network/Metaserver/network_metaserver.h.orig 2010-12-10 15:54:11.000000000 +0300
+++ Source_Files/Network/Metaserver/network_metaserver.h 2010-12-10 15:54:23.000000000 +0300
@@ -32,6 +32,7 @@
#include <map>
#include <memory> // auto_ptr
#include <set>
+#include <stdexcept>
#include "Logging.h"

View File

@ -0,0 +1,10 @@
--- rts/lib/lobby/Connection.h.orig 2010-12-10 17:17:43.000000000 +0300
+++ rts/lib/lobby/Connection.h 2010-12-10 17:19:28.000000000 +0300
@@ -6,6 +6,7 @@
#include <boost/asio/streambuf.hpp>
#include <boost/asio/deadline_timer.hpp>
#include <boost/asio/ip/tcp.hpp>
+#include <list>
#include <string>
struct ClientStatus

View File

@ -0,0 +1,30 @@
--- ProjectFilesDialog.cpp.orig 2010-04-03 23:47:33.000000000 +0400
+++ ProjectFilesDialog.cpp 2010-12-10 20:05:23.000000000 +0300
@@ -677,6 +677,17 @@
endRemoveRows();
}
+namespace {
+ struct less_for_first_members_of_pairs
+ {
+ template <typename Pair>
+ bool operator()(Pair const& left, Pair const& right) const
+ {
+ return left.first < right.first;
+ }
+ };
+}
+
void
ProjectFilesDialog::FileList::remove(QItemSelection const& selection)
{
@@ -699,7 +710,8 @@
);
std::sort(
sorted_ranges.begin(), sorted_ranges.end(),
- bind(&Range::first, _1) < bind(&Range::first, _2)
+ // bind(&Range::first, _1) < bind(&Range::first, _2)
+ less_for_first_members_of_pairs()
);
QVectorIterator<Range> it(sorted_ranges);

View File

@ -0,0 +1,10 @@
--- hrktorrent.h.orig 2010-12-14 18:09:28.000000000 +0300
+++ hrktorrent.h 2010-12-14 18:09:40.000000000 +0300
@@ -6,6 +6,7 @@
#include <iterator>
#include <exception>
+#include <signal.h>
#include <sys/mman.h>
#include <sys/types.h>
#include <sys/stat.h>

View File

@ -0,0 +1,10 @@
--- include/libtorrent/udp_socket.hpp.orig 2010-12-10 20:38:45.000000000 +0300
+++ include/libtorrent/udp_socket.hpp 2010-12-10 20:39:05.000000000 +0300
@@ -37,6 +37,7 @@
#include "libtorrent/session_settings.hpp"
#include "libtorrent/buffer.hpp"
+#include <list>
#include <vector>
#include <boost/function.hpp>
#include <boost/thread/mutex.hpp>

View File

@ -0,0 +1,10 @@
--- include/libtorrent/udp_socket.hpp.orig 2010-12-10 20:38:45.000000000 +0300
+++ include/libtorrent/udp_socket.hpp 2010-12-10 20:39:05.000000000 +0300
@@ -37,6 +37,7 @@
#include "libtorrent/session_settings.hpp"
#include "libtorrent/buffer.hpp"
+#include <list>
#include <vector>
#include <boost/function.hpp>
#include <boost/thread/mutex.hpp>

View File

@ -0,0 +1,10 @@
--- src/main.cpp.orig 2010-12-26 16:04:06.000000000 +0300
+++ src/main.cpp 2010-12-26 16:05:49.000000000 +0300
@@ -60,6 +60,7 @@
#include "stacktrace.h"
#endif
+#include <csignal>
#include <stdlib.h>
#include "misc.h"
#include "preferences.h"