From 3f7de961fffcb04f6f83026fe5433984f3e19e3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
Date: Wed, 31 Aug 2016 11:42:43 +0200
Subject: [PATCH] drumstick: fix build with gcc-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../drumstick/drumstick_1.0.2.bb              |  6 +-
 .../files/0001-fix-build-with-gcc6.patch      | 58 +++++++++++++++++++
 2 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 recipes-misc/recipes-multimedia/drumstick/files/0001-fix-build-with-gcc6.patch

diff --git a/recipes-misc/recipes-multimedia/drumstick/drumstick_1.0.2.bb b/recipes-misc/recipes-multimedia/drumstick/drumstick_1.0.2.bb
index dc0b220e..cbb94287 100644
--- a/recipes-misc/recipes-multimedia/drumstick/drumstick_1.0.2.bb
+++ b/recipes-misc/recipes-multimedia/drumstick/drumstick_1.0.2.bb
@@ -10,8 +10,10 @@ DEPENDS += " \
     qtsvg \
     fluidsynth \
 "
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${PV}/${BPN}-${PV}.tar.bz2"
+SRC_URI = " \
+    ${SOURCEFORGE_MIRROR}/project/${BPN}/${PV}/${BPN}-${PV}.tar.bz2 \
+    file://0001-fix-build-with-gcc6.patch \
+"
 SRC_URI[md5sum] = "f8e6d9de7943853146c39e52242cb705"
 SRC_URI[sha256sum] = "34aab5812c35ba16f8e606632a56c38879f470e3e395d580412c73ef937f8750"
 
diff --git a/recipes-misc/recipes-multimedia/drumstick/files/0001-fix-build-with-gcc6.patch b/recipes-misc/recipes-multimedia/drumstick/files/0001-fix-build-with-gcc6.patch
new file mode 100644
index 00000000..55f57e36
--- /dev/null
+++ b/recipes-misc/recipes-multimedia/drumstick/files/0001-fix-build-with-gcc6.patch
@@ -0,0 +1,58 @@
+From f8e2a41b8f17f0f6f726d3ac03ea71bce08f6560 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 31 Aug 2016 11:37:14 +0200
+Subject: [PATCH] fix build with gcc6
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+stolen at [1]
+
+[1] http://pkgs.fedoraproject.org/cgit/rpms/drumstick.git/plain/drumstick-1.0.2-gcc6.patch
+
+Upstream-Status:Pending
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ library/file/qove.cpp           | 4 ++--
+ utils/testevents/testevents.cpp | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/library/file/qove.cpp b/library/file/qove.cpp
+index 516ebd7..c369c08 100644
+--- a/library/file/qove.cpp
++++ b/library/file/qove.cpp
+@@ -11356,7 +11356,7 @@ void QOve::convertSignatures() {
+ 				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 @@ void QOve::convertNotes(int trackNo, int measureTick, OVE::NoteContainer* contai
+ 				}
+ 				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) + std::abs(art->getSoundEffect().second);
+ 						int tickAmount = (soundEffect / notes.size()) * ((notes.size() - i) - 1);
+ 						startTick -= tickAmount;
+ 					//}
+diff --git a/utils/testevents/testevents.cpp b/utils/testevents/testevents.cpp
+index b980211..2435725 100644
+--- a/utils/testevents/testevents.cpp
++++ b/utils/testevents/testevents.cpp
+@@ -262,7 +262,7 @@ void QTestEvents::run()
+     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};
++    char sysex[] = {'\xf0', '\x41', '\x10', '\x42', '\x12', '\x40', '\0', '\x7f', '\0', '\x41', '\xf7'};
+     dumpEvent(new SysExEvent(QByteArray(sysex, sizeof(sysex))));
+     QString text = "This can be a copyright, song name, instrument, lyric...";
+     TextEvent te(text, 3);
+-- 
+2.5.5
+