[SCM] mixxx/master: Add patch to fix SIGSEGV in the scripts evaluation.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 15197a7364495e73505acb9de30268c7da430e45
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Dec 1 09:12:53 2010 +0100

    Add patch to fix SIGSEGV in the scripts evaluation.

diff --git a/debian/patches/1001-scripts_eval_sigsegv.patch b/debian/patches/1001-scripts_eval_sigsegv.patch
new file mode 100644
index 0000000..f598340
--- /dev/null
+++ b/debian/patches/1001-scripts_eval_sigsegv.patch
@@ -0,0 +1,55 @@
+Description: Fix a bug in MidiScriptEngine in which old constructors of
+ QScriptValue are used. This causes SIGSEGV in script evaluation.
+Origin: upstream, commit:2663
+---
+ src/midi/midiscriptengine.cpp |   20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+--- mixxx.orig/src/midi/midiscriptengine.cpp
++++ mixxx/src/midi/midiscriptengine.cpp
+@@ -396,7 +396,7 @@ bool MidiScriptEngine::safeExecute(QStri
+         return false;
+ 
+     QScriptValueList args;
+-    args << QScriptValue(m_pEngine, data);
++    args << QScriptValue(data);
+ 
+     scriptFunction.call(QScriptValue(), args);
+     if (checkException())
+@@ -427,11 +427,11 @@ bool MidiScriptEngine::safeExecute(QStri
+         return false;
+ 
+     QScriptValueList args;
+-    args << QScriptValue(m_pEngine, channel);
+-    args << QScriptValue(m_pEngine, control);
+-    args << QScriptValue(m_pEngine, value);
+-    args << QScriptValue(m_pEngine, status);
+-    args << QScriptValue(m_pEngine, group);
++    args << QScriptValue(channel);
++    args << QScriptValue(control);
++    args << QScriptValue(value);
++    args << QScriptValue(status);
++    args << QScriptValue(group);
+ 
+     scriptFunction.call(QScriptValue(), args);
+     if (checkException())
+@@ -743,9 +743,9 @@ void MidiScriptEngine::slotValueChanged(
+         // Could branch to safeExecute from here, but for now do it this way.
+         QScriptValue function_value = m_pEngine->evaluate(function);
+         QScriptValueList args;
+-        args << QScriptValue(m_pEngine, value);
+-        args << QScriptValue(m_pEngine, key.group); // Added by Math`
+-        args << QScriptValue(m_pEngine, key.item);  // Added by Math`
++        args << QScriptValue(value);
++        args << QScriptValue(key.group); // Added by Math`
++        args << QScriptValue(key.item);  // Added by Math`
+         QScriptValue result = function_value.call(QScriptValue(), args);
+         if (result.isError()) {
+             qWarning()<< "MidiScriptEngine: Call to " << function << " resulted in an error:  " << result.toString();
+@@ -1136,4 +1136,4 @@ void MidiScriptEngine::scratchDisable(in
+     else m_rampTo[deck]=0.0;
+ 
+     m_ramp[deck] = true;    // Activate the ramping in scratchProcess()
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/series b/debian/patches/series
index 1ca9120..e185903 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 30-disable_soundsourcem4a.patch
 40-alpha_ftbfs.patch
 91-desktop_file.patch
+1001-scripts_eval_sigsegv.patch

-- 
mixxx packaging