From 2517c198ece6bc43cc440cd1132f443953aff219 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Mar 03 2015 16:08:54 +0000
Subject: s3m.h is also affected. *sigh*


---

diff --git a/audacious-plugins-3.6-arm-no-narrowing.patch b/audacious-plugins-3.6-arm-no-narrowing.patch
index 80628e8..6d2a58f 100644
--- a/audacious-plugins-3.6-arm-no-narrowing.patch
+++ b/audacious-plugins-3.6-arm-no-narrowing.patch
@@ -1,6 +1,3 @@
-On ARM char is unsigned by default, so the chnresolv array triggers
-a C++11 narrowing conversion error with GCC 5.
-
 diff -Nur audacious-plugins-3.6-orig/src/adplug/core/s3m.cc audacious-plugins-3.6/src/adplug/core/s3m.cc
 --- audacious-plugins-3.6-orig/src/adplug/core/s3m.cc	2015-02-28 22:57:53.000000000 +0100
 +++ audacious-plugins-3.6/src/adplug/core/s3m.cc	2015-03-03 16:53:52.260021152 +0100
@@ -13,3 +10,15 @@ diff -Nur audacious-plugins-3.6-orig/src/adplug/core/s3m.cc audacious-plugins-3.
    Cs3mPlayer::chnresolv[] =     // S3M -> adlib channel conversion
  { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3,
      4, 5, 6, 7, 8, -1, -1, -1, -1, -1, -1, -1 };
+diff -Nur audacious-plugins-3.6-orig/src/adplug/core/s3m.h audacious-plugins-3.6/src/adplug/core/s3m.h
+--- audacious-plugins-3.6-orig/src/adplug/core/s3m.h	2015-02-28 22:57:53.000000000 +0100
++++ audacious-plugins-3.6/src/adplug/core/s3m.h	2015-03-03 17:06:48.714707068 +0100
+@@ -90,7 +90,7 @@
+ 	unsigned char crow,ord,speed,tempo,del,songend,loopstart,loopcnt;
+ 
+ private:
+-	static const char chnresolv[];
++	static const signed char chnresolv[];
+ 	static const unsigned short notetable[12];
+ 	static const unsigned char vibratotab[32];
+