- Fix build with boost 1.60

PR:		199601

7 files changed, 105 insertions, 0 deletions

diff --git a/graphics/aqsis/files/patch-include_aqsis_tex_buffers_channellist.h b/graphics/aqsis/files/patch-include_aqsis_tex_buffers_channellist.h
new file mode 100644
index 000000000000..f92fe6849bdd
--- /dev/null
+++ b/graphics/aqsis/files/patch-include_aqsis_tex_buffers_channellist.h
@@ -0,0 +1,12 @@
+--- include/aqsis/tex/buffers/channellist.h.orig	2012-08-24 12:26:50 UTC
++++ include/aqsis/tex/buffers/channellist.h
+@@ -43,7 +43,9 @@
+ #include <iosfwd>
+ #include <vector>
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/format.hpp>
++#endif
+ 
+ #include <aqsis/tex/buffers/channelinfo.h>
+ #include <aqsis/tex/texexception.h>
diff --git a/graphics/aqsis/files/patch-include_aqsis_tex_buffers_mixedimagebuffer.h b/graphics/aqsis/files/patch-include_aqsis_tex_buffers_mixedimagebuffer.h
new file mode 100644
index 000000000000..a6f4a717a9d6
--- /dev/null
+++ b/graphics/aqsis/files/patch-include_aqsis_tex_buffers_mixedimagebuffer.h
@@ -0,0 +1,14 @@
+--- include/aqsis/tex/buffers/mixedimagebuffer.h.orig	2012-08-24 12:26:50 UTC
++++ include/aqsis/tex/buffers/mixedimagebuffer.h
+@@ -45,9 +45,11 @@
+ #include <string>
+ #include <vector>
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/shared_array.hpp>
+ #include <boost/shared_ptr.hpp>
+ #include <boost/utility.hpp>
++#endif
+ 
+ #include <aqsis/math/math.h>
+ #include <aqsis/tex/buffers/channellist.h>
diff --git a/graphics/aqsis/files/patch-include_aqsis_util_socket.h b/graphics/aqsis/files/patch-include_aqsis_util_socket.h
new file mode 100644
index 000000000000..ab52c4bc5ec9
--- /dev/null
+++ b/graphics/aqsis/files/patch-include_aqsis_util_socket.h
@@ -0,0 +1,12 @@
+--- include/aqsis/util/socket.h.orig	2012-08-24 12:26:50 UTC
++++ include/aqsis/util/socket.h
+@@ -32,7 +32,9 @@
+ 
+ #include <sstream>
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/utility.hpp>
++#endif
+ 
+ #ifdef AQSIS_SYSTEM_WIN32
+ #	include <winsock2.h>
diff --git a/graphics/aqsis/files/patch-tools_displays_piqsl_piqsldisplay.cpp b/graphics/aqsis/files/patch-tools_displays_piqsl_piqsldisplay.cpp
new file mode 100644
index 000000000000..c676df9afb31
--- /dev/null
+++ b/graphics/aqsis/files/patch-tools_displays_piqsl_piqsldisplay.cpp
@@ -0,0 +1,13 @@
+--- tools/displays/piqsl/piqsldisplay.cpp.orig	2012-08-24 12:26:50 UTC
++++ tools/displays/piqsl/piqsldisplay.cpp
+@@ -450,8 +450,8 @@ extern "C" PtDspyError DspyImageData(PtD
+ 
+ 	TiXmlElement* bucketDataXML = new TiXmlElement("BucketData");
+ 	std::stringstream base64Data;
+-	std::copy(	base64_text(BOOST_MAKE_PFTO_WRAPPER(data)), 
+-				base64_text(BOOST_MAKE_PFTO_WRAPPER(data + bufferlength)), 
++	std::copy(	base64_text(data), 
++				base64_text(data + bufferlength), 
+ 				std::ostream_iterator<char>(base64Data));
+ 	TiXmlText* dataTextXML = new TiXmlText(base64Data.str());
+ 	dataTextXML->SetCDATA(true);
diff --git a/graphics/aqsis/files/patch-tools_piqsl_displayserverimage.cpp b/graphics/aqsis/files/patch-tools_piqsl_displayserverimage.cpp
new file mode 100644
index 000000000000..1111fea67773
--- /dev/null
+++ b/graphics/aqsis/files/patch-tools_piqsl_displayserverimage.cpp
@@ -0,0 +1,16 @@
+--- tools/piqsl/displayserverimage.cpp.orig	2012-08-24 12:26:50 UTC
++++ tools/piqsl/displayserverimage.cpp
+@@ -39,11 +39,13 @@
+ #include	<map>
+ #include	<algorithm>
+ 
++#ifndef Q_MOC_RUN
+ #include	<boost/archive/iterators/base64_from_binary.hpp>
+ #include	<boost/archive/iterators/transform_width.hpp>
+ #include	<boost/archive/iterators/insert_linebreaks.hpp>
+ #include	<boost/format.hpp>
+ #include	<boost/filesystem.hpp>
++#endif
+ 
+ #include	"displayserverimage.h"
+ 
diff --git a/graphics/aqsis/files/patch-tools_piqsl_image.h b/graphics/aqsis/files/patch-tools_piqsl_image.h
new file mode 100644
index 000000000000..d6b365033524
--- /dev/null
+++ b/graphics/aqsis/files/patch-tools_piqsl_image.h
@@ -0,0 +1,15 @@
+--- tools/piqsl/image.h.orig	2012-08-24 12:26:50 UTC
++++ tools/piqsl/image.h
+@@ -46,10 +46,12 @@
+ #include <QtCore/QObject>
+ #include <QtGui/QImage>
+ 
++#ifndef Q_MOC_RUN
+ #include <boost/shared_ptr.hpp>
+ #include <boost/shared_array.hpp>
+ #include <boost/filesystem/path.hpp>
+ #include <boost/thread/mutex.hpp>
++#endif
+ 
+ #include "tinyxml.h"
+ 
diff --git a/graphics/aqsis/files/patch-tools_piqsl_imagelistmodel.cpp b/graphics/aqsis/files/patch-tools_piqsl_imagelistmodel.cpp
new file mode 100644
index 000000000000..fa1975428cb8
--- /dev/null
+++ b/graphics/aqsis/files/patch-tools_piqsl_imagelistmodel.cpp
@@ -0,0 +1,23 @@
+--- tools/piqsl/imagelistmodel.cpp.orig	2012-08-24 12:26:50 UTC
++++ tools/piqsl/imagelistmodel.cpp
+@@ -42,11 +42,6 @@
+ #include <boost/archive/iterators/transform_width.hpp>
+ #include <boost/archive/iterators/remove_whitespace.hpp>
+ #include <boost/version.hpp>
+-#if BOOST_VERSION < 103700
+-#   include <boost/pfto.hpp>
+-#else
+-#   include <boost/serialization/pfto.hpp>
+-#endif
+ 
+ 
+ #include "displayserverimage.h"
+@@ -286,7 +281,7 @@ class SocketDataHandler
+                                 std::string data = dataText->Value();
+                                 std::vector<unsigned char> binaryData;
+                                 binaryData.reserve(count);
+-                                base64_binary ti_begin = base64_binary(BOOST_MAKE_PFTO_WRAPPER(data.begin()));
++                                base64_binary ti_begin = base64_binary(data.begin());
+                                 std::size_t padding = 2 - count % 3;
+                                 while(--count > 0)
+                                 {