From 0c436df26646f742828efdc1402b24e44c5ad18d Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Tue, 9 Jun 2015 18:48:21 +0200
Subject: [PATCH] hugin: rebuild for boost-1.58.

---
 .../hugin/patches/hugin-2013-boost-156.diff   | 81 +++++++++++++++++++
 srcpkgs/hugin/template                        |  2 +-
 2 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/hugin/patches/hugin-2013-boost-156.diff

diff --git a/srcpkgs/hugin/patches/hugin-2013-boost-156.diff b/srcpkgs/hugin/patches/hugin-2013-boost-156.diff
new file mode 100644
index 0000000000..7af073e95f
--- /dev/null
+++ b/srcpkgs/hugin/patches/hugin-2013-boost-156.diff
@@ -0,0 +1,81 @@
+--- src/tools/ParseExp.cpp	2013-10-27 10:19:02.000000000 +0100
++++ src/tools/ParseExp.cpp	2014-09-12 01:41:15.468973470 +0200
+@@ -50,37 +50,45 @@
+ //power function
+ struct lazy_pow_
+ {
+-    template <typename X, typename Y>
+-    struct result { typedef X type; };
++    template<class> struct result;
++
++    template <typename F, typename X, typename Y>
++    struct result<F(X,Y)> { typedef X& type; };
+ 
+     template <typename X, typename Y>
+-    X operator()(X x, Y y) const
++    X& operator()(X& x, Y y) const
+     {
+-        return std::pow(x, y);
++        x= std::pow(x, y);
++        return x;
+     }
+ };
+ 
+ // modulus for double values
+ struct lazy_mod_
+ {
+-    template <typename X, typename Y>
+-    struct result { typedef X type; };
++    template<class> struct result;
++
++    template <typename F, typename X, typename Y>
++    struct result<F(X,Y)> { typedef X& type; };
+ 
+     template <typename X, typename Y>
+-    X operator()(X x, Y y) const
++    X& operator()(X& x, Y y) const
+     {
+-        return std::fmod(x,y);
++        x= std::fmod(x,y);
++        return x;
+     }
+ };
+ 
+ // if statement
+ struct lazy_if_
+ {
+-    template <typename X, typename Y, typename Z>
+-    struct result { typedef Y type; };
++    template<class> struct result;
+ 
+-    template <typename X, typename Y, typename Z>
+-    X operator()(X x, Y y, Z z) const
++    template <typename F, typename X, typename Y>
++    struct result<F(X,Y,Y)> { typedef Y& type; };
++
++    template <typename X, typename Y>
++    Y& operator()(X x, Y& y, Y& z) const
+     {
+         return x ? y : z;
+     }
+@@ -89,13 +97,16 @@
+ // wrapper for unary function
+ struct lazy_ufunc_
+ {
+-    template <typename F, typename A1>
+-    struct result { typedef A1 type; };
++    template<class> struct result;
++
++    template<typename F, typename F1, typename A1>
++    struct result<F(F1,A1)> { typedef A1& type; };
+ 
+     template <typename F, typename A1>
+-    A1 operator()(F f, A1 a1) const
++    A1& operator()(F f, A1& a1) const
+     {
+-        return f(a1);
++        a1= f(a1);
++        return a1;
+     }
+ };
+ 
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index d9d08e6ded..9669e6ddc7 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
 # Template file for 'hugin'
 pkgname=hugin
 version=2014.0.0
-revision=3
+revision=4
 build_style=cmake
 configure_args="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0"
 maintainer="Dominik Honnef <dominik@honnef.co>"