[SCM] supercollider/master: Fix FTBFS with gcc-4.9. Closes: #746917

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4b4a10af0e4fa1e52b953422036ae1aa1ec7acfd
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Jun 6 13:24:59 2014 -0400

    Fix FTBFS with gcc-4.9. Closes: #746917

diff --git a/debian/patches/ftbfs-gcc-4.9.patch b/debian/patches/ftbfs-gcc-4.9.patch
new file mode 100644
index 0000000..c554d10
--- /dev/null
+++ b/debian/patches/ftbfs-gcc-4.9.patch
@@ -0,0 +1,20 @@
+From: Felipe Sateler <fsateler at debian.org>
+Date: Fri, 6 Jun 2014 13:15:18 -0400
+Subject: Fix implementation of aligned_allocator::construct<U>.
+
+Fixes a build failure with gcc >= 4.9, because it defines __cplusplus >= 201103L.
+
+A typo, apparently. This patch can be dropped in the next upstream release.
+diff --git a/server/supernova/utilities/malloc_aligned.hpp b/server/supernova/utilities/malloc_aligned.hpp
+index e572dcb..89277ff 100644
+--- a/server/supernova/utilities/malloc_aligned.hpp
++++ b/server/supernova/utilities/malloc_aligned.hpp
+@@ -243,7 +243,7 @@ public:
+     template< class U, class... Args >
+     void construct(U * p, Args&& ... args)
+     {
+-        ::new(p) T(std::forward<Args>(args)...);
++        ::new(p) U(std::forward<Args>(args)...);
+     }
+ #endif
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 87e37f4..b8b8c42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ perf-counter-include.patch
 supernova-i686-march-flag.patch
 two-extra-dev-headers.patch
 system-lockfree.patch
+ftbfs-gcc-4.9.patch

-- 
supercollider packaging