aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/animation.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2017-08-26 15:34:29 +0200
committerMarius Bakke <mbakke@fastmail.com>2017-08-26 15:34:29 +0200
commit4028fd395e6d7f80f7bbeb4ff616b6b89b0bf654 (patch)
tree17bac0c3211a872d3a0292cae20347718ecdd5f7 /gnu/packages/animation.scm
parent9d1cc6bc69d53bf8ad45ac94bc3c268125f86359 (diff)
parent72e2815d18ad688b0a16ce3b3efba1172423cec4 (diff)
downloadpatches-4028fd395e6d7f80f7bbeb4ff616b6b89b0bf654.tar
patches-4028fd395e6d7f80f7bbeb4ff616b6b89b0bf654.tar.gz
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/animation.scm')
-rw-r--r--gnu/packages/animation.scm10
1 files changed, 10 insertions, 0 deletions
diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm
index 3c590950fd..faa0d17230 100644
--- a/gnu/packages/animation.scm
+++ b/gnu/packages/animation.scm
@@ -78,6 +78,16 @@ C++ @dfn{Standard Template Library} (STL).")
"/lib"))
#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'fix-boost-build-error
+ ;; A chain of Boost headers leads to this error: "make_array" is
+ ;; not a member of "boost::serialization". This can be avoided by
+ ;; loading the "array_wrapper" header first.
+ (lambda _
+ (substitute* "src/synfig/valuenodes/valuenode_dynamic.cpp"
+ (("#include <boost/numeric/odeint/integrate/integrate.hpp>" match)
+ (string-append
+ "#include <boost/serialization/array_wrapper.hpp>\n" match)))
+ #t))
(add-after 'unpack 'adapt-to-libxml++-changes
(lambda _
(substitute* "configure"