[SCM] libdrumstick/master: Extend gcc6 patch for new upstream version

[ross-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3ed0d2662e7975cdd2d9553138fa019f41759770
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Fri Aug 12 22:52:42 2016 +0200

    Extend gcc6 patch for new upstream version

diff --git a/debian/patches/gcc6.patch b/debian/patches/gcc6.patch
index a8aed21..7040ddf 100644
--- a/debian/patches/gcc6.patch
+++ b/debian/patches/gcc6.patch
@@ -1,11 +1,16 @@
 Description: Fix FTBFS with GCC 6
+ Patch for extended for drumstick 1.0.2. Cherry-picked from
+ upsream commit r317, which also included a version of Jame's
+ patch for 0.5.0.
 Author: James Cowgill <jcowgill at debian.org>
 Bug-Debian: https://bugs.debian.org/811736
+Origin: https://sourceforge.net/p/drumstick/code/317/
+Last-Update: 2016-08-12
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/utils/testevents/testevents.cpp
-+++ b/utils/testevents/testevents.cpp
-@@ -262,8 +262,8 @@ void QTestEvents::run()
+--- libdrumstick.orig/utils/testevents/testevents.cpp
++++ libdrumstick/utils/testevents/testevents.cpp
+@@ -262,8 +262,8 @@
      dumpEvent(new KeyPressEvent(5, 60, 124));
      dumpEvent(new ChanPressEvent(6, 111));
      dumpEvent(new PitchBendEvent(7, 1234));
@@ -16,3 +21,23 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
      QString text = "This can be a copyright, song name, instrument, lyric...";
      TextEvent te(text, 3);
      dumpEvent(new TextEvent(te));
+--- libdrumstick.orig/library/file/qove.cpp
++++ libdrumstick/library/file/qove.cpp
+@@ -11356,7 +11356,7 @@
+ 				OVE::MeasureData* measureData = d->ove.getMeasureData(i, j, k);
+ 				QList<OVE::MusicData*> tempoPtrs = measureData->getMusicDatas(OVE::MusicData_Tempo);
+ 
+-				if (k == 0 || (k > 0 && abs(measure->getTypeTempo()	- d->ove.getMeasure(k - 1)->getTypeTempo()) > 0.01)) {
++				if (k == 0 || (k > 0 && std::abs(measure->getTypeTempo()	- d->ove.getMeasure(k - 1)->getTypeTempo()) > 0.01)) {
+ 					int tick = d->mtt.getTick(k, 0);
+ 					int tempo = (int) measure->getTypeTempo();
+ 					tempos[tick] = tempo;
+@@ -11739,7 +11739,7 @@
+ 				}
+ 				case OVE::Articulation_Arpeggio: {
+ 					//if( art->getChangeSoundEffect() ) {
+-						unsigned int soundEffect = abs(art->getSoundEffect().first) + abs(art->getSoundEffect().second);
++						unsigned int soundEffect = std::abs(art->getSoundEffect().first) + abs(art->getSoundEffect().second);
+ 						int tickAmount = (soundEffect / notes.size()) * ((notes.size() - i) - 1);
+ 						startTick -= tickAmount;
+ 					//}

-- 
libdrumstick packaging