[SCM] libdrumstick/master: Drop gcc6 patch, included in this upstream version

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

The following commit has been merged in the master branch:
commit 2901d6a630cddc4b09600ee88a2d0cfe0660278b
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Sat Mar 18 12:53:09 2017 +0100

    Drop gcc6 patch, included in this upstream version

diff --git a/debian/patches/gcc6.patch b/debian/patches/gcc6.patch
deleted file mode 100644
index 7040ddf..0000000
--- a/debian/patches/gcc6.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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/
---- 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));
--    char sysex[] = {0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 0x41, 0xf7};
--    dumpEvent(new SysExEvent(QByteArray(sysex, sizeof(sysex))));
-+    unsigned char sysex[] = {0xf0, 0x41, 0x10, 0x42, 0x12, 0x40, 0, 0x7f, 0, 0x41, 0xf7};
-+    dumpEvent(new SysExEvent(QByteArray((char *) sysex, sizeof(sysex))));
-     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;
- 					//}
diff --git a/debian/patches/series b/debian/patches/series
index 7f02195..0818ebe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-gcc6.patch
 desktop.patch

-- 
libdrumstick packaging