aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-02-08 16:53:08 +0700
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-02-08 16:53:08 +0700
commitb877063514bb434156b124523851f6b019ad340a (patch)
tree76de8aa7c21c743a4b81077430dd4197ba0d93b7
parent87943dc32d3d43b354bb216ffe64da9fd05795b7 (diff)
audio/sooperlooper: Fix build against newer libsigc.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--audio/sooperlooper/libsigc.patch96
-rw-r--r--audio/sooperlooper/sooperlooper.SlackBuild5
2 files changed, 100 insertions, 1 deletions
diff --git a/audio/sooperlooper/libsigc.patch b/audio/sooperlooper/libsigc.patch
new file mode 100644
index 000000000000..6072b02d5fbf
--- /dev/null
+++ b/audio/sooperlooper/libsigc.patch
@@ -0,0 +1,96 @@
+diff -ur a/sooperlooper-1.7.3/src/control_osc.hpp b/sooperlooper-1.7.3/src/control_osc.hpp
+--- a/sooperlooper-1.7.3/src/control_osc.hpp 2013-10-18 18:37:39.000000000 +0300
++++ b/sooperlooper-1.7.3/src/control_osc.hpp 2015-12-05 01:40:01.848107565 +0200
+@@ -27,7 +27,7 @@
+ #include <list>
+ #include <utility>
+
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+
+ #include "event.hpp"
+ #include "event_nonrt.hpp"
+diff -ur a/sooperlooper-1.7.3/src/gui/app_frame.hpp b/sooperlooper-1.7.3/src/gui/app_frame.hpp
+--- a/sooperlooper-1.7.3/src/gui/app_frame.hpp 2014-02-03 18:52:15.000000000 +0200
++++ b/sooperlooper-1.7.3/src/gui/app_frame.hpp 2015-12-05 01:40:01.844774250 +0200
+@@ -26,7 +26,7 @@
+ #include <string>
+ #include <vector>
+
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+ #include <sigc++/signal.h>
+ #include <sigc++/connection.h>
+
+diff -ur a/sooperlooper-1.7.3/src/gui/config_panel.hpp b/sooperlooper-1.7.3/src/gui/config_panel.hpp
+--- a/sooperlooper-1.7.3/src/gui/config_panel.hpp 2013-10-18 18:37:39.000000000 +0300
++++ b/sooperlooper-1.7.3/src/gui/config_panel.hpp 2015-12-05 01:40:01.841440935 +0200
+@@ -26,7 +26,7 @@
+
+ #include <string>
+ #include <vector>
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+
+ class wxListCtrl;
+ class wxSpinCtrl;
+diff -ur a/sooperlooper-1.7.3/src/gui/keys_panel.hpp b/sooperlooper-1.7.3/src/gui/keys_panel.hpp
+--- a/sooperlooper-1.7.3/src/gui/keys_panel.hpp 2013-10-18 18:37:39.000000000 +0300
++++ b/sooperlooper-1.7.3/src/gui/keys_panel.hpp 2015-12-05 01:40:01.838107619 +0200
+@@ -26,7 +26,7 @@
+
+ #include <string>
+ #include <vector>
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+
+ class wxListCtrl;
+
+diff -ur a/sooperlooper-1.7.3/src/gui/latency_panel.hpp b/sooperlooper-1.7.3/src/gui/latency_panel.hpp
+--- a/sooperlooper-1.7.3/src/gui/latency_panel.hpp 2013-10-18 18:37:39.000000000 +0300
++++ b/sooperlooper-1.7.3/src/gui/latency_panel.hpp 2015-12-05 01:40:01.834774304 +0200
+@@ -26,7 +26,7 @@
+
+ #include <string>
+ #include <vector>
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+
+ class wxListCtrl;
+
+diff -ur a/sooperlooper-1.7.3/src/gui/main_panel.hpp b/sooperlooper-1.7.3/src/gui/main_panel.hpp
+--- a/sooperlooper-1.7.3/src/gui/main_panel.hpp 2014-02-04 18:39:55.000000000 +0200
++++ b/sooperlooper-1.7.3/src/gui/main_panel.hpp 2015-12-05 01:40:01.831440989 +0200
+@@ -26,7 +26,7 @@
+ #include <string>
+ #include <vector>
+
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+ #include <sigc++/signal.h>
+ #include <sigc++/connection.h>
+
+diff -ur a/sooperlooper-1.7.3/src/gui/midi_bind_panel.hpp b/sooperlooper-1.7.3/src/gui/midi_bind_panel.hpp
+--- a/sooperlooper-1.7.3/src/gui/midi_bind_panel.hpp 2013-10-18 18:37:39.000000000 +0300
++++ b/sooperlooper-1.7.3/src/gui/midi_bind_panel.hpp 2015-12-05 01:40:01.828107674 +0200
+@@ -26,7 +26,7 @@
+
+ #include <string>
+ #include <vector>
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+ #include <list>
+
+ #include <midi_bind.hpp>
+diff -ur a/sooperlooper-1.7.3/src/gui/prefs_dialog.hpp b/sooperlooper-1.7.3/src/gui/prefs_dialog.hpp
+--- a/sooperlooper-1.7.3/src/gui/prefs_dialog.hpp 2013-10-18 18:37:39.000000000 +0300
++++ b/sooperlooper-1.7.3/src/gui/prefs_dialog.hpp 2015-12-05 01:40:01.824774358 +0200
+@@ -26,7 +26,7 @@
+
+ #include <string>
+ #include <vector>
+-#include <sigc++/object.h>
++#include <sigc++/trackable.h>
+
+ class wxListCtrl;
+ class wxSpinCtrl;
diff --git a/audio/sooperlooper/sooperlooper.SlackBuild b/audio/sooperlooper/sooperlooper.SlackBuild
index 520e23cb7471..4f184f19f401 100644
--- a/audio/sooperlooper/sooperlooper.SlackBuild
+++ b/audio/sooperlooper/sooperlooper.SlackBuild
@@ -17,7 +17,7 @@
PRGNAM=sooperlooper
VERSION=${VERSION:-1.7.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -73,9 +73,12 @@ find -L . \
# allow building with wx 3.0, using a patch from Debian
[ "$WXVER" = "3.0" ] && patch -p1 < $CWD/04-build_with_wx_30.patch
+patch -p2 < $CWD/libsigc.patch
+
# Note: the CFLAGS are actually ignored here. Oh well.
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
+CPPFLAGS="-std=c++11" \
./configure \
--with-wxconfig-path=$WXCONFIG \
--prefix=/usr \