[SCM] supercollider/master: Fix FTBFS with gcc 7

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Mon Sep 25 15:32:00 UTC 2017


The following commit has been merged in the master branch:
commit bbacdf2de31d05967b9ffb2b8054fff002dfef8f
Author: Felipe Sateler <fsateler at debian.org>
Date:   Thu Sep 7 19:44:03 2017 -0300

    Fix FTBFS with gcc 7
    
    Thanks to Adrian Bunk for the patches.
    
    Closes: #853671

diff --git a/debian/patches/DiskIO_UGens-include-functional.patch b/debian/patches/DiskIO_UGens-include-functional.patch
new file mode 100644
index 0000000..e3f578c
--- /dev/null
+++ b/debian/patches/DiskIO_UGens-include-functional.patch
@@ -0,0 +1,22 @@
+From: Brian Heim <brianlheim at gmail.com>
+Date: Tue, 4 Jul 2017 13:26:00 -0400
+Subject: DiskIO_UGens: include <functional>
+
+std::bind is in <functional> according to the C++ ISO standard, and
+gcc7.1 enforces this.
+---
+ server/plugins/DiskIO_UGens.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/server/plugins/DiskIO_UGens.cpp b/server/plugins/DiskIO_UGens.cpp
+index b695b70..a6a8764 100644
+--- a/server/plugins/DiskIO_UGens.cpp
++++ b/server/plugins/DiskIO_UGens.cpp
+@@ -28,6 +28,7 @@
+ 
+ #include <atomic>
+ #include <new>
++#include <functional>
+ #include <SC_Lock.h>
+ 
+ #include <boost/lockfree/queue.hpp>
diff --git a/debian/patches/PyrSched.cpp-include-functional-to-fix-FTBFS.patch b/debian/patches/PyrSched.cpp-include-functional-to-fix-FTBFS.patch
new file mode 100644
index 0000000..7b29dd4
--- /dev/null
+++ b/debian/patches/PyrSched.cpp-include-functional-to-fix-FTBFS.patch
@@ -0,0 +1,21 @@
+From: Adrian Bunk <bunk at debian.org>
+Date: Thu, 7 Sep 2017 19:38:46 -0300
+Subject: PyrSched.cpp: #include <functional> to fix FTBFS
+
+Bug-Debian: https://bugs.debian.org/853671
+---
+ lang/LangPrimSource/PyrSched.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lang/LangPrimSource/PyrSched.cpp b/lang/LangPrimSource/PyrSched.cpp
+index 5ae8766..426941a 100644
+--- a/lang/LangPrimSource/PyrSched.cpp
++++ b/lang/LangPrimSource/PyrSched.cpp
+@@ -37,6 +37,7 @@
+ #include <string.h>
+ #include <math.h>
+ #include <limits>
++#include <functional>
+ 
+ #if defined(__APPLE__) || defined(__linux__)
+ # include <pthread.h>
diff --git a/debian/patches/adding-functional-header-in-PyrSerialPrim.cpp.patch b/debian/patches/adding-functional-header-in-PyrSerialPrim.cpp.patch
new file mode 100644
index 0000000..64ae479
--- /dev/null
+++ b/debian/patches/adding-functional-header-in-PyrSerialPrim.cpp.patch
@@ -0,0 +1,20 @@
+From: hlolli <hlolli at gmail.com>
+Date: Mon, 10 Jul 2017 18:32:22 +0200
+Subject: adding functional header in PyrSerialPrim.cpp
+
+---
+ lang/LangPrimSource/PyrSerialPrim.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lang/LangPrimSource/PyrSerialPrim.cpp b/lang/LangPrimSource/PyrSerialPrim.cpp
+index 7935255..45933af 100644
+--- a/lang/LangPrimSource/PyrSerialPrim.cpp
++++ b/lang/LangPrimSource/PyrSerialPrim.cpp
+@@ -36,6 +36,7 @@
+ #include <termios.h>
+ #include <unistd.h>
+ #include <boost/atomic.hpp>
++#include <functional>
+ 
+ #include <stdexcept>
+ #include <sstream>
diff --git a/debian/patches/series b/debian/patches/series
index 981f5f8..d9be227 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,6 @@ cmake-fix-systemboost.patch
 tlsf-fPIC-flag.patch
 fix-oscpack-ftbfs.patch
 Disable-128bit-float-constants.patch
+adding-functional-header-in-PyrSerialPrim.cpp.patch
+DiskIO_UGens-include-functional.patch
+PyrSched.cpp-include-functional-to-fix-FTBFS.patch

-- 
supercollider packaging



More information about the pkg-multimedia-commits mailing list