Date: Sat, 21 Jan 2017 21:23:45 +0000 (UTC) From: Ganael LAPLANCHE <martymac@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432081 - in head/games/flightgear: . files Message-ID: <201701212123.v0LLNjpb042175@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: martymac Date: Sat Jan 21 21:23:45 2017 New Revision: 432081 URL: https://svnweb.freebsd.org/changeset/ports/432081 Log: Fix build with Clang 4.0.0 PR: 216203 Submitted by: jbeich Added: head/games/flightgear/files/patch-CLANG_4.txt (contents, props changed) Modified: head/games/flightgear/Makefile Modified: head/games/flightgear/Makefile ============================================================================== --- head/games/flightgear/Makefile Sat Jan 21 21:12:05 2017 (r432080) +++ head/games/flightgear/Makefile Sat Jan 21 21:23:45 2017 (r432081) @@ -3,6 +3,7 @@ PORTNAME= flightgear PORTVERSION= 2016.4.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/flightgear/release-${PORTVERSION:R} Added: head/games/flightgear/files/patch-CLANG_4.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/flightgear/files/patch-CLANG_4.txt Sat Jan 21 21:23:45 2017 (r432081) @@ -0,0 +1,41 @@ +Fix build with Clang 4.0 + +--- src/FDM/JSBSim/FGFDMExec.cpp 2017-01-20 21:38:08.784722000 +0000 ++++ src/FDM/JSBSim/FGFDMExec.cpp 2017-01-20 22:55:24.501656000 +0000 +@@ -211,7 +211,7 @@ + + SetGroundCallback(0); + +- if (FDMctr > 0) (*FDMctr)--; ++ if (FDMctr != 0) (*FDMctr)--; + + Debug(1); + } +--- src/FDM/JSBSim/input_output/FGInputSocket.cpp.orig 2017-01-21 20:58:27.676020000 +0100 ++++ src/FDM/JSBSim/input_output/FGInputSocket.cpp 2017-01-21 21:02:08.818597000 +0100 +@@ -192,7 +192,7 @@ + } else { + socket->Reply("Must be in HOLD to search properties\n"); + } +- } else if (node > 0) { ++ } else { + ostringstream buf; + buf << argument << " = " << setw(12) << setprecision(6) << node->getDoubleValue() << endl; + socket->Reply(buf.str()); +--- src/Network/native_ctrls.cxx.orig 2017-01-21 21:06:09.165609000 +0100 ++++ src/Network/native_ctrls.cxx 2017-01-21 21:10:14.120123000 +0100 +@@ -428,10 +428,10 @@ + // node->setDoubleValue( net->brake_right ); + + node = fgGetNode( "/controls/switches", true ); +- node->setBoolValue( "master-bat", net->master_bat > 0 ); +- node->setBoolValue( "master-alt", net->master_alt > 0); +- node->setBoolValue( "master-avionics", net->master_avionics > 0); +- ++ node->setBoolValue( "master-bat", net->master_bat != 0 ); ++ node->setBoolValue( "master-alt", net->master_alt != 0 ); ++ node->setBoolValue( "master-avionics", net->master_avionics > 0 ); ++ + node = fgGetNode( "/environment", true ); + node->setDoubleValue( "wind-speed-kt", net->wind_speed_kt ); + node->setDoubleValue( "wind-from-heading-deg", net->wind_dir_deg );
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701212123.v0LLNjpb042175>