diff options
| author | tobik <tobik@FreeBSD.org> | 2018-08-01 14:04:56 +0800 |
|---|---|---|
| committer | tobik <tobik@FreeBSD.org> | 2018-08-01 14:04:56 +0800 |
| commit | e270b29b1f7f1536854b63996be19fcae101d06d (patch) | |
| tree | 5a348c88531a941a686515bfb553aab784975e26 /audio | |
| parent | 4280d5367de6a6f8998448bae8f82070dee7d43b (diff) | |
| download | freebsd-ports-gnome-e270b29b1f7f1536854b63996be19fcae101d06d.tar.gz freebsd-ports-gnome-e270b29b1f7f1536854b63996be19fcae101d06d.tar.zst freebsd-ports-gnome-e270b29b1f7f1536854b63996be19fcae101d06d.zip | |
audio/spiralsynthmodular: Fix build with Clang 6
SpiralSynthModular.C:1016:14: error: comparison between pointer and integer ('char *' and 'int')
if (fn && fn!='\0')
~~^ ~~~~
http://beefy12.nyi.freebsd.org/data/head-amd64-default/p475478_s336801/logs/errors/spiralsynthmodular-0.2.2a_9.log
Diffstat (limited to 'audio')
5 files changed, 76 insertions, 1 deletions
diff --git a/audio/spiralsynthmodular/Makefile b/audio/spiralsynthmodular/Makefile index 05553f048e2a..88b942a8703b 100644 --- a/audio/spiralsynthmodular/Makefile +++ b/audio/spiralsynthmodular/Makefile @@ -3,7 +3,7 @@ PORTNAME= spiralsynthmodular PORTVERSION= 0.2.2a -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= audio MASTER_SITES= SF/spiralmodular/spiralmodular/${PORTVERSION}%20%28Latest%20Version%29 DISTNAME= spiralmodular-${PORTVERSION} diff --git a/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_PoshSamplerPlugin_PoshSamplerPluginGUI.C b/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_PoshSamplerPlugin_PoshSamplerPluginGUI.C new file mode 100644 index 000000000000..18f198c917c1 --- /dev/null +++ b/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_PoshSamplerPlugin_PoshSamplerPluginGUI.C @@ -0,0 +1,20 @@ +--- SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C.orig 2018-08-01 05:59:24 UTC ++++ SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C +@@ -502,7 +502,7 @@ inline void PoshSamplerPluginGUI::cb_Load_i(Fl_Button* + { + char *fn=fl_file_chooser("Load a sample", "{*.wav,*.WAV}", NULL); + +- if (fn && fn!='\0') ++ if (fn && *fn!='\0') + { + strcpy(m_TextBuf,fn); + m_GUICH->SetData("Name",m_TextBuf); +@@ -523,7 +523,7 @@ inline void PoshSamplerPluginGUI::cb_Save_i(Fl_Button* + { + char *fn=fl_file_chooser("Save sample", "{*.wav,*.WAV}", NULL); + +- if (fn && fn!='\0') ++ if (fn && *fn!='\0') + { + strcpy(m_TextBuf,fn); + m_GUICH->Set("Name",m_TextBuf); diff --git a/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_SpiralLoopPlugin_SpiralLoopPluginGUI.C b/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_SpiralLoopPlugin_SpiralLoopPluginGUI.C new file mode 100644 index 000000000000..78c1e199fa32 --- /dev/null +++ b/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_SpiralLoopPlugin_SpiralLoopPluginGUI.C @@ -0,0 +1,20 @@ +--- SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.C.orig 2018-08-01 06:00:29 UTC ++++ SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.C +@@ -350,7 +350,7 @@ inline void SpiralLoopPluginGUI::cb_Load_i(Fl_Button* + { + char *fn=fl_file_chooser("Load a sample", "{*.wav,*.WAV}", NULL); + +- if (fn && fn!='\0') ++ if (fn && *fn!='\0') + { + strcpy(m_TextBuf,fn); + m_GUICH->SetData("Name",m_TextBuf); +@@ -368,7 +368,7 @@ inline void SpiralLoopPluginGUI::cb_Save_i(Fl_Button* + { + char *fn=fl_file_chooser("Load a sample", "{*.wav,*.WAV}", NULL); + +- if (fn && fn!='\0') ++ if (fn && *fn!='\0') + { + strcpy(m_TextBuf,fn); + m_GUICH->SetData("Name",m_TextBuf); diff --git a/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_StreamPlugin_StreamPluginGUI.C b/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_StreamPlugin_StreamPluginGUI.C new file mode 100644 index 000000000000..c7d85d41934e --- /dev/null +++ b/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_StreamPlugin_StreamPluginGUI.C @@ -0,0 +1,11 @@ +--- SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.C.orig 2018-08-01 06:01:08 UTC ++++ SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.C +@@ -220,7 +220,7 @@ void StreamPluginGUI::cb_Pos (Fl_Slider* o, void* v) { + + inline void StreamPluginGUI::cb_Load_i (Fl_Button* o, void* v) { + char *fn=fl_file_chooser("Load a sample", "{*.wav,*.WAV}", NULL); +- if (fn && fn!='\0') { ++ if (fn && *fn!='\0') { + strcpy (m_TextBuf, fn); + m_GUICH->SetData ("FileName", (void*)m_TextBuf); + m_GUICH->SetCommand (StreamPlugin::LOAD); diff --git a/audio/spiralsynthmodular/files/patch-SpiralSynthModular.C b/audio/spiralsynthmodular/files/patch-SpiralSynthModular.C new file mode 100644 index 000000000000..67c270f896ef --- /dev/null +++ b/audio/spiralsynthmodular/files/patch-SpiralSynthModular.C @@ -0,0 +1,24 @@ +SpiralSynthModular.C:1016:14: error: comparison between pointer and integer ('char *' and 'int') + if (fn && fn!='\0') + ~~^ ~~~~ + +--- SpiralSynthModular.C.orig 2018-08-01 05:55:58 UTC ++++ SpiralSynthModular.C +@@ -1013,7 +1013,7 @@ inline void SynthModular::cb_Load_i(Fl_Button* o, void + + char *fn=fl_file_chooser("Load a patch", "*.ssm", NULL); + +- if (fn && fn!='\0') ++ if (fn && *fn!='\0') + { + ifstream inf(fn); + +@@ -1039,7 +1039,7 @@ inline void SynthModular::cb_Save_i(Fl_Button* o, void + { + char *fn=fl_file_chooser("Save a patch", "*.ssm", NULL); + +- if (fn && fn!='\0') ++ if (fn && *fn!='\0') + { + ifstream ifl(fn); + if (ifl) |