[SCM] mixxx/master: Drop debian/patches/1001-scripts_eval_sigsegv.patch as it isn't needed anymore.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu Dec 16 23:04:10 UTC 2010


The following commit has been merged in the master branch:
commit e671ca8b0a93702d146783bbf3c6e936073770a0
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Dec 17 00:03:36 2010 +0100

    Drop debian/patches/1001-scripts_eval_sigsegv.patch as it isn't needed anymore.

diff --git a/debian/patches/1001-scripts_eval_sigsegv.patch b/debian/patches/1001-scripts_eval_sigsegv.patch
deleted file mode 100644
index f598340..0000000
--- a/debian/patches/1001-scripts_eval_sigsegv.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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 e185903..1ca9120 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@
 30-disable_soundsourcem4a.patch
 40-alpha_ftbfs.patch
 91-desktop_file.patch
-1001-scripts_eval_sigsegv.patch
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index 7f27d0b..e060b29 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -2,4 +2,3 @@
 #10_soundtouch.dpatch
 20_norpath.patch
 30-disable_soundsourcem4a.patch
-1001-scripts_eval_sigsegv.patch

-- 
mixxx packaging



More information about the pkg-multimedia-commits mailing list