[SCM] csoundqt/master: Resolve ambiguous conversion from uint64_t to QVariant. Closes: #830420

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 888312d021f526e17ebdd2684a3c676c3d2a238d
Author: Felipe Sateler <fsateler at debian.org>
Date:   Sun Jul 10 22:40:22 2016 -0400

    Resolve ambiguous conversion from uint64_t to QVariant. Closes: #830420

diff --git a/debian/changelog b/debian/changelog
index d466147..b3c9509 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+csoundqt (0.9.2.1-3) UNRELEASED; urgency=medium
+
+  * Resolve ambiguous conversion from uint64_t to QVariant.
+    Closes: #830420
+
+ -- Felipe Sateler <fsateler at debian.org>  Sun, 10 Jul 2016 22:39:25 -0400
+
 csoundqt (0.9.2.1-2) unstable; urgency=medium
 
   * Split examples into separate Arch: all package.
diff --git a/debian/patches/0001-fix-build-failure-when-csound-debugger-is-enabled.patch b/debian/patches/0001-fix-build-failure-when-csound-debugger-is-enabled.patch
new file mode 100644
index 0000000..3fcf1d5
--- /dev/null
+++ b/debian/patches/0001-fix-build-failure-when-csound-debugger-is-enabled.patch
@@ -0,0 +1,21 @@
+From: Felipe Sateler <fsateler at gmail.com>
+Date: Sun, 10 Jul 2016 22:28:31 -0400
+Subject: fix build failure when csound debugger is enabled
+
+---
+ src/csoundengine.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/csoundengine.cpp b/src/csoundengine.cpp
+index d6c9e79..086036b 100644
+--- a/src/csoundengine.cpp
++++ b/src/csoundengine.cpp
+@@ -1249,7 +1249,7 @@ void CsoundEngine::breakpointCallback(CSOUND *csound, debug_bkpt_info_t *bkpt_in
+ 		QVariantList instance;
+ 		instance << debug_instr_list->p1;
+ 		instance << QString("%1 %2").arg(debug_instr_list->p2).arg(debug_instr_list->p3);
+-		instance << debug_instr_list->kcounter;
++		instance << (qulonglong)debug_instr_list->kcounter;
+ 		cs->m_instrumentList << instance;
+ 		debug_instr_list = debug_instr_list->next;
+ 	}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b7ef835
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-fix-build-failure-when-csound-debugger-is-enabled.patch

-- 
csoundqt packaging