wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-08 08:03:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

hugin: rebuild for boost-1.58.

Browse source
This commit is contained in:
Christian Neukirchen 2015-06-09 18:48:21 +02:00
parent 9d8f257aa4
commit 0c436df266
2 changed files with 82 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
srcpkgs/hugin/patches/hugin-2013-boost-156.diff Normal file
View file

@ -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;
}
};

2
srcpkgs/hugin/template
View file

@ -1,7 +1,7 @@
# Template file for 'hugin' # Template file for 'hugin'
pkgname=hugin pkgname=hugin
version=2014.0.0 version=2014.0.0
revision=3 revision=4
build_style=cmake build_style=cmake
configure_args="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0" configure_args="-DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-3.0"
maintainer="Dominik Honnef <dominik@honnef.co>" maintainer="Dominik Honnef <dominik@honnef.co>"