fix build with boost 1.59 (patch provided by J5lx)

3 files changed, 51 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 29ce7a79cb89..93b461a0de46 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Wed Dec 23 10:54:32 UTC 2015
 pkgbase = aqsis
 	pkgdesc = A high quality, photorealistic, 3D rendering solution
 	pkgver = 1.8.2
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.aqsis.org
 	install = aqsis.install
 	arch = i686
@@ -22,8 +24,10 @@ pkgbase = aqsis
 	optdepends = libgl: ptview
 	options = !libtool
 	source = http://downloads.sourceforge.net/project/aqsis/aqsis-source/1.8.2/aqsis-1.8.2.tar.gz
+	source = pfto.patch
 	source = imfinputfile-forward-declaration.diff
 	md5sums = 399967e99f12cfbd1a7385c4e1d39c3b
+	md5sums = 908487f2e7b495b100dfa6b3aa8945ae
 	md5sums = e52f27d3041e88a63531b691ad05a6aa
 
 pkgname = aqsis
diff --git a/PKGBUILD b/PKGBUILD
index 7bf21e2a23a5..c5d18140e932 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Gino Pezzin <pezzin@gmail.com>
 pkgname=aqsis
 pkgver=1.8.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A high quality, photorealistic, 3D rendering solution"
 arch=('i686' 'x86_64')
 url="http://www.aqsis.org"
@@ -12,15 +12,19 @@ depends=('boost-libs' 'openexr' 'hicolor-icon-theme' 'shared-mime-info' 'desktop
 makedepends=('cmake' 'boost' 'openexr' 'libpng' 'qt4' 'mesa')
 options=('!libtool')
 install=aqsis.install
-source=(http://downloads.sourceforge.net/project/aqsis/aqsis-source/$pkgver/$pkgname-$pkgver.tar.gz \
-		imfinputfile-forward-declaration.diff)
+source=("http://downloads.sourceforge.net/project/aqsis/aqsis-source/$pkgver/$pkgname-$pkgver.tar.gz"
+        "pfto.patch"
+		"imfinputfile-forward-declaration.diff")
 md5sums=('399967e99f12cfbd1a7385c4e1d39c3b'
+         '908487f2e7b495b100dfa6b3aa8945ae'
          'e52f27d3041e88a63531b691ad05a6aa')
 
 prepare() {
   cd "$srcdir"/$pkgname-$pkgver
   # fix build with OpenEXR 2.0 (?)
-  patch -Np1 < "$srcdir"/imfinputfile-forward-declaration.diff || true
+  patch -Np1 < "$srcdir/imfinputfile-forward-declaration.diff" || true
+  # fix build with boost 1.59
+  patch -Np1 < "$srcdir/pfto.patch"
 }
 
 build() {
diff --git a/pfto.patch b/pfto.patch
new file mode 100644
index 000000000000..d9c0711048b5
--- /dev/null
+++ b/pfto.patch
@@ -0,0 +1,38 @@
+diff -aur package.pristine/tools/displays/piqsl/piqsldisplay.cpp package.new/tools/displays/piqsl/piqsldisplay.cpp
+--- package.pristine/tools/displays/piqsl/piqsldisplay.cpp	2015-12-12 12:52:50.455773602 +0100
++++ package.new/tools/displays/piqsl/piqsldisplay.cpp	2015-12-12 12:54:31.291661954 +0100
+@@ -450,8 +450,8 @@
+ 
+ 	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 -aur package.pristine/tools/piqsl/imagelistmodel.cpp package.new/tools/piqsl/imagelistmodel.cpp
+--- package.pristine/tools/piqsl/imagelistmodel.cpp	2015-12-12 12:52:50.465773524 +0100
++++ package.new/tools/piqsl/imagelistmodel.cpp	2015-12-12 12:53:26.088831765 +0100
+@@ -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 @@
+                                 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)
+                                 {