c91d3fb7f4
* gnu/packages/boost.scm (boost): Update to 1.60.0. [source]: Remove patch. * gnu/packages/patches/boost-mips-avoid-m32.patch: Delete patch * gnu-system.am (dist_patch_DATA): Remove patch. Also fix dependent packages: * gnu/packages/patches/csound-header-ordering.patch: New patch. * gnu/packages/audio.scm (csound)[source]: Use it. [arguments]: Add 'set-flags phase. * gnu/packages/patches/libcmis-fix-test-onedrive.patch: New patch. * gnu/packages/libreoffice.scm (libcmis)[source]: Use it. (libreoffice)[arguments]: Add LDFLAGS to #:configure-flags. (librevenge)[inputs]: Move boost from here... [propogated-inputs]: to here. [arguments]: Add LDFLAGS to #:configure-flags. * gnu/packages/patches/openimageio-boost-1.60.patch: New patch. * gnu/packages/graphics.scm (openimageio): Use it. * gnu-system.am (dist_patch_DATA): Add patches.
20 lines
597 B
Diff
20 lines
597 B
Diff
Prevent compilation issues with boost-1.60.0.
|
|
|
|
Reported upstream at https://github.com/csound/csound/issues/570
|
|
|
|
--- Csound6.05/Opcodes/chua/ChuaOscillator.cpp 2015-04-25 14:06:22.995646234 -0500
|
|
+++ Csound6.05/Opcodes/chua/ChuaOscillator.cpp 2015-12-21 10:31:58.182362640 -0600
|
|
@@ -117,11 +117,12 @@
|
|
// d = sys_variables(12);
|
|
// gnor = a*(x.^3) + b*(x.^2) + c*x + d;
|
|
|
|
-#include <OpcodeBase.hpp>
|
|
#include <boost/numeric/ublas/vector.hpp>
|
|
using namespace boost::numeric;
|
|
#include <cmath>
|
|
|
|
+#include <OpcodeBase.hpp>
|
|
+
|
|
#undef CS_KSMPS
|
|
#define CS_KSMPS (opds.insdshead->ksmps)
|
|
|