[SCM] sineshaper/master: Store patches in 0001-ftbfs.patch
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Mon Jul 25 08:10:31 UTC 2011
The following commit has been merged in the master branch:
commit 5eb7b91bf1a1bcc62d8f9b160370624940c445a9
Author: Alessio Treglia <alessio at debian.org>
Date: Mon Jul 25 10:09:55 2011 +0200
Store patches in 0001-ftbfs.patch
diff --git a/debian/patches/0001-ftbfs.patch b/debian/patches/0001-ftbfs.patch
new file mode 100644
index 0000000..061ca3e
--- /dev/null
+++ b/debian/patches/0001-ftbfs.patch
@@ -0,0 +1,65 @@
+Origin: Debian
+Bug-Debian: http://bugs.debian.org/527667
+ http://bugs.debian.org/421231
+Description: Fix FTBFS with GCC4.3
+ Specify sigc:: namespace to avoid conflicts with signal(2)
+---
+ src/common/dssiplugin.hpp | 1 +
+ src/common/dssiuiclient.hpp | 8 ++++----
+ src/sineshaper/sineshapergui.hpp | 4 ++--
+ 3 files changed, 7 insertions(+), 6 deletions(-)
+
+--- sineshaper.orig/src/common/dssiplugin.hpp
++++ sineshaper/src/common/dssiplugin.hpp
+@@ -26,6 +26,7 @@
+
+ #include <unistd.h>
+
++#include <cstdlib>
+ #include <cstring>
+ #include <string>
+ #include <vector>
+--- sineshaper.orig/src/common/dssiuiclient.hpp
++++ sineshaper/src/common/dssiuiclient.hpp
+@@ -99,13 +99,13 @@ public:
+ // Host to UI
+ /** This signal is emitted when the host sends a new control value.
+ The parameters are the control port number and the new control value. */
+- signal<void, int, float> control_received;
++ sigc::signal<void, int, float> control_received;
+ /** Emitted when the host sends a program change. The parameters are the
+ bank and program numbers. */
+- signal<void, int, int> program_received;
++ sigc::signal<void, int, int> program_received;
+ /** Emitted when the host sends a configuration value. The parameters are
+ the configuration key and the configuration value. */
+- signal<void, const string, const string> configure_received;
++ sigc::signal<void, const string, const string> configure_received;
+ /** Emitted when the host wants the UI to be visible. A DSSI GUI should not
+ show any windows until this signal is emitted. */
+ Dispatcher show_received;
+@@ -134,7 +134,7 @@ public:
+ void* allocate_shared_memory(int bytes);
+
+ /** Emitted when the plugin has attached to the shared memory segment. */
+- signal<void> plugin_attached;
++ sigc::signal<void> plugin_attached;
+
+ /** Returns true if the plugin has attached to the shared memory segment. */
+ bool plugin_has_attached();
+--- sineshaper.orig/src/sineshaper/sineshapergui.hpp
++++ sineshaper/src/sineshaper/sineshapergui.hpp
+@@ -31,11 +31,11 @@ public:
+ void program_selected(int bank, int program);
+
+ /** This signal is emitted when the user selects a program in the GUI. */
+- signal<void, unsigned long, unsigned long> signal_select_program;
++ sigc::signal<void, unsigned long, unsigned long> signal_select_program;
+
+ /** This signal is emitted when the user has edited the programs and
+ the plugin needs to reload the file with the user presets. */
+- signal<void> signal_programs_changed;
++ sigc::signal<void> signal_programs_changed;
+
+ protected:
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d181f7e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-ftbfs.patch
--
sineshaper packaging
More information about the pkg-multimedia-commits
mailing list