Date: Wed, 1 Aug 2018 06:04:56 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r476156 - in head/audio/spiralsynthmodular: . files Message-ID: <201808010604.w7164upE030721@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Wed Aug 1 06:04:56 2018 New Revision: 476156 URL: https://svnweb.freebsd.org/changeset/ports/476156 Log: 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 Added: head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_PoshSamplerPlugin_PoshSamplerPluginGUI.C (contents, props changed) head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_SpiralLoopPlugin_SpiralLoopPluginGUI.C (contents, props changed) head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_StreamPlugin_StreamPluginGUI.C (contents, props changed) head/audio/spiralsynthmodular/files/patch-SpiralSynthModular.C (contents, props changed) Modified: head/audio/spiralsynthmodular/Makefile Modified: head/audio/spiralsynthmodular/Makefile ============================================================================== --- head/audio/spiralsynthmodular/Makefile Wed Aug 1 05:50:59 2018 (r476155) +++ head/audio/spiralsynthmodular/Makefile Wed Aug 1 06:04:56 2018 (r476156) @@ -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} Added: head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_PoshSamplerPlugin_PoshSamplerPluginGUI.C ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_PoshSamplerPlugin_PoshSamplerPluginGUI.C Wed Aug 1 06:04:56 2018 (r476156) @@ -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); Added: head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_SpiralLoopPlugin_SpiralLoopPluginGUI.C ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_SpiralLoopPlugin_SpiralLoopPluginGUI.C Wed Aug 1 06:04:56 2018 (r476156) @@ -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); Added: head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_StreamPlugin_StreamPluginGUI.C ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/spiralsynthmodular/files/patch-SpiralSound_Plugins_StreamPlugin_StreamPluginGUI.C Wed Aug 1 06:04:56 2018 (r476156) @@ -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); Added: head/audio/spiralsynthmodular/files/patch-SpiralSynthModular.C ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/spiralsynthmodular/files/patch-SpiralSynthModular.C Wed Aug 1 06:04:56 2018 (r476156) @@ -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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808010604.w7164upE030721>