cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use wx 2.8 (unicode version)

Browse Source 
Fix build with modern c++ compilers [1]

Obtained from:	Gentoo
This commit is contained in:
Baptiste Daroussin 2014-03-24 11:30:42 +00:00
parent b38caed684
commit 4baa63d7a0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=348938
4 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
astro/libroadnav/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= libroadnav
PORTVERSION= 0.19
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= astro geography
MASTER_SITES= SF/roadnav/LibRoadnav/${PORTVERSION}
@ -12,8 +12,9 @@ COMMENT= Helper library for Roadnav (3D GPS mapping program)
OPTIONS_DEFINE= DOCS
USE_WX= 2.6+
USE_WX= 2.8+
WX_COMPS= wx contrib
WX_UNICODE= yes
USES= gmake
GNU_CONFIGURE= yes

6
astro/roadnav/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= roadnav
PORTVERSION= 0.19
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= astro geography
MASTER_SITES= SF/${PORTNAME}/Roadnav/${PORTVERSION}
@ -12,9 +12,11 @@ COMMENT= 3D GPS mapping program
BUILD_DEPENDS= ${LOCALBASE}/lib/libroadnav.a:${PORTSDIR}/astro/libroadnav
USE_WX= 2.6+
USE_WX= 2.8+
WX_COMPS= wx contrib
WX_UNICODE= yes
USES= gmake
CXXFLAGS+= -Wnon-pod-varargs
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-wx-prefix=${LOCALBASE} --with-wx-config=${WX_CONFIG}

11
astro/roadnav/files/patch-src__GPSInterface_Serial.cpp Normal file
View File

@ -0,0 +1,11 @@
--- ./src/GPSInterface_Serial.cpp.orig 2007-10-09 04:02:14.000000000 +0200
+++ ./src/GPSInterface_Serial.cpp 2014-03-24 12:27:07.000000000 +0100
@@ -243,7 +243,7 @@
// Echo DeLorme Tripmate's and Earthmate's hello message
LibRoadnavDebug1(wxT("SerialIO"), wxT("Echoing hello message: %s"), strSentence.c_str());
- sprintf(szOut, "%s\r\n", strSentence.mb_str(*wxConvCurrent));
+ sprintf(szOut, "%s\r\n", static_cast<const char *>(strSentence.mb_str(*wxConvCurrent)));
WriteSerial(szOut);
}
else if (!VerifyGPSChecksum(strSentence)) // check NMEA validity

11
astro/roadnav/files/patch-src__TTS_Festival.cpp Normal file
View File

@ -0,0 +1,11 @@
--- ./src/TTS_Festival.cpp.orig 2007-10-09 04:02:14.000000000 +0200
+++ ./src/TTS_Festival.cpp 2014-03-24 12:28:17.000000000 +0100
@@ -88,7 +88,7 @@
ppszArgs[2],
64 + strText.Length(),
wxT("echo \\(SayText \\\"%ss\\\"\\) | festival"),
- strText.mb_str(*wxConvCurrent)
+ static_cast<const char *>strText.mb_str(*wxConvCurrent)
);
wxExecute(ppszArgs, wxEXEC_SYNC);