| 1 |
dirtyepic 10/01/30 06:06:17 |
| 2 |
|
| 3 |
Added: roadnav-0.19-gcc45.patch |
| 4 |
Log: |
| 5 |
Fix build error w/ gcc-4.5. |
| 6 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 app-misc/roadnav/files/roadnav-0.19-gcc45.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/roadnav/files/roadnav-0.19-gcc45.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-misc/roadnav/files/roadnav-0.19-gcc45.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: roadnav-0.19-gcc45.patch |
| 15 |
=================================================================== |
| 16 |
diff --git a/src/GPSInterface_Serial.cpp b/src/GPSInterface_Serial.cpp |
| 17 |
index c3e9435..fcae209 100644 |
| 18 |
--- a/src/GPSInterface_Serial.cpp |
| 19 |
+++ b/src/GPSInterface_Serial.cpp |
| 20 |
@@ -243,7 +243,7 @@ IGPSInterface::EGPSStatus GPSInterface_Serial::GetData(wxGPSEvent * pGPSEvent) |
| 21 |
|
| 22 |
// Echo DeLorme Tripmate's and Earthmate's hello message |
| 23 |
LibRoadnavDebug1(wxT("SerialIO"), wxT("Echoing hello message: %s"), strSentence.c_str()); |
| 24 |
- sprintf(szOut, "%s\r\n", strSentence.mb_str(*wxConvCurrent)); |
| 25 |
+ sprintf(szOut, "%s\r\n", static_cast<const char *>(strSentence.mb_str(*wxConvCurrent))); |
| 26 |
WriteSerial(szOut); |
| 27 |
} |
| 28 |
else if (!VerifyGPSChecksum(strSentence)) // check NMEA validity |
| 29 |
diff --git a/src/TTS_Festival.cpp b/src/TTS_Festival.cpp |
| 30 |
index 8623cb3..2950490 100644 |
| 31 |
--- a/src/TTS_Festival.cpp |
| 32 |
+++ b/src/TTS_Festival.cpp |
| 33 |
@@ -88,7 +88,7 @@ ITTS::ETTSStatus TTS_Festival::Speak(const wxString & strText) |
| 34 |
ppszArgs[2], |
| 35 |
64 + strText.Length(), |
| 36 |
wxT("echo \\(SayText \\\"%ss\\\"\\) | festival"), |
| 37 |
- strText.mb_str(*wxConvCurrent) |
| 38 |
+ static_cast<const char *>(strText.mb_str(*wxConvCurrent)) |
| 39 |
); |
| 40 |
|
| 41 |
wxExecute(ppszArgs, wxEXEC_SYNC); |
Archives