diff options
| author |   Ryan Hill <rhill@gentoo.org> | 2010-01-30 06:06:17 +0000 |
|---|---|---|
| committer | Ryan Hill <rhill@gentoo.org> | 2010-01-30 06:06:17 +0000 |
| commit | fbd3a24a09af2abce6fdec52baf64ab8c6e30cc8 (patch) | |
| tree | 36f7cb9eb24e308e83044d25354e4a53228be960 /app-misc/roadnav | |
| parent | Updated my email (diff) | |
| download | historical-fbd3a24a09af2abce6fdec52baf64ab8c6e30cc8.tar.gz historical-fbd3a24a09af2abce6fdec52baf64ab8c6e30cc8.tar.bz2 historical-fbd3a24a09af2abce6fdec52baf64ab8c6e30cc8.zip | |
Fix build error w/ gcc-4.5.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'app-misc/roadnav')
| -rw-r--r-- | app-misc/roadnav/ChangeLog | 8 | ||||
| -rw-r--r-- | app-misc/roadnav/Manifest | 11 | ||||
| -rw-r--r-- | app-misc/roadnav/files/roadnav-0.19-gcc45.patch | 26 | ||||
| -rw-r--r-- | app-misc/roadnav/roadnav-0.19.ebuild | 7 |
4 files changed, 42 insertions, 10 deletions
diff --git a/app-misc/roadnav/ChangeLog b/app-misc/roadnav/ChangeLog index 80fdc7304797..09ba15bd3495 100644 --- a/app-misc/roadnav/ChangeLog +++ b/app-misc/roadnav/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-misc/roadnav -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/roadnav/ChangeLog,v 1.10 2009/07/28 05:17:41 dirtyepic Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/roadnav/ChangeLog,v 1.11 2010/01/30 06:06:16 dirtyepic Exp $ + + 30 Jan 2010; Ryan Hill <dirtyepic@gentoo.org> roadnav-0.19.ebuild, + +files/roadnav-0.19-gcc45.patch: + Fix build error w/ gcc-4.5. 28 Jul 2009; Ryan Hill <dirtyepic@gentoo.org> -roadnav-0.18.ebuild: Remove old. diff --git a/app-misc/roadnav/Manifest b/app-misc/roadnav/Manifest index 71c66c09566f..19842206a4b8 100644 --- a/app-misc/roadnav/Manifest +++ b/app-misc/roadnav/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX roadnav-0.19-gcc45.patch 1156 RMD160 5451b651711dca4b86ac3d19ac9a1129bc09b794 SHA1 95f7e815669ac199e5682b59ecfe3ce4959d411e SHA256 23ede46c06cdaf6f85538209f22812044d841d3c6e845a27e11f430192f9b184 DIST roadnav-0.19.tar.gz 1289497 RMD160 c4ead3450bc3944c40b04108e5ae91b788813f2e SHA1 b9d3580bbd46ccbb03462a329f79962328bd2116 SHA256 6354600e10ec6be17a8f7c0282a11e80b1ad6cb4e59c979dd7e336ffcc22143e -EBUILD roadnav-0.19.ebuild 1438 RMD160 6c1a42ec4cf0afc914b7904511b2d709f7a71e2d SHA1 41331d50c579365670186a5888ade082c7ae1dcf SHA256 e29ab04a804a0a7d5c6e5168868d4c1606bd4c57c193017901886bbdfbc041f3 -MISC ChangeLog 1656 RMD160 7cf4821cd363b5d44a74ebfda7cc707297c3b81b SHA1 b4b3f6ec26659511e598bed00ae86a02b2aedbbc SHA256 b5a5c8a2cb398f89806fa2feccb95a3b03b5850963b380a2bf8acde02ae32fb0 +EBUILD roadnav-0.19.ebuild 1484 RMD160 18e99fc203eb20d8f992a6662c04ef0d29c07f71 SHA1 398d6a44ab396249384e345bdea8417ad32eefe5 SHA256 e2505099c01fff3df48faee65c0be81e5418c5e313dfd5dd712389b73fd049c3 +MISC ChangeLog 1791 RMD160 0ba70af129d2ebc33e6be0c974a099d8c19f72ac SHA1 f62dee43caaa8d0f024cbd8688db3d647ede9015 SHA256 269e18508f8b4f8a7d1876031a75ef6ef54650608415366b2a847ce9817a7f08 MISC metadata.xml 558 RMD160 05d16c22ba44f236d9474beb76192176d711f0da SHA1 977dc2cb84a8068bc837d423d960dded4600fec9 SHA256 faf9ff8ecc20fe53a587b9901e7d1bda8bc7b2c2b21f46e8448f9e405143dbfc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.11 (GNU/Linux) -iEYEARECAAYFAkpuihsACgkQiqiDRvmkBmLBBgCfVrZbqJm1JVauMPBfza0WV7Wx -ydsAnjXJstrQuJcT7gntd8WnlqpfZ/eG -=KliT +iEYEARECAAYFAktjzOIACgkQiqiDRvmkBmKANgCfXTnosGSox9c3tGWm/vIJbnEU +k6UAn2ZSESpXv8eYwn+YbdqnSXtqtvo9 +=s+3/ -----END PGP SIGNATURE----- diff --git a/app-misc/roadnav/files/roadnav-0.19-gcc45.patch b/app-misc/roadnav/files/roadnav-0.19-gcc45.patch new file mode 100644 index 000000000000..60e562bfa789 --- /dev/null +++ b/app-misc/roadnav/files/roadnav-0.19-gcc45.patch @@ -0,0 +1,26 @@ +diff --git a/src/GPSInterface_Serial.cpp b/src/GPSInterface_Serial.cpp +index c3e9435..fcae209 100644 +--- a/src/GPSInterface_Serial.cpp ++++ b/src/GPSInterface_Serial.cpp +@@ -243,7 +243,7 @@ IGPSInterface::EGPSStatus GPSInterface_Serial::GetData(wxGPSEvent * pGPSEvent) + + // 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 +diff --git a/src/TTS_Festival.cpp b/src/TTS_Festival.cpp +index 8623cb3..2950490 100644 +--- a/src/TTS_Festival.cpp ++++ b/src/TTS_Festival.cpp +@@ -88,7 +88,7 @@ ITTS::ETTSStatus TTS_Festival::Speak(const wxString & strText) + 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); diff --git a/app-misc/roadnav/roadnav-0.19.ebuild b/app-misc/roadnav/roadnav-0.19.ebuild index 5223d93cbaec..eaebeb983f5d 100644 --- a/app-misc/roadnav/roadnav-0.19.ebuild +++ b/app-misc/roadnav/roadnav-0.19.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/roadnav/roadnav-0.19.ebuild,v 1.1 2009/07/01 05:22:28 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/roadnav/roadnav-0.19.ebuild,v 1.2 2010/01/30 06:06:16 dirtyepic Exp $ EAPI=2 -inherit wxwidgets +inherit eutils wxwidgets DESCRIPTION="Roadnav is a street map application with routing and GPS support" HOMEPAGE="http://roadnav.sourceforge.net" @@ -26,6 +26,7 @@ RDEPEND="${DEPEND}" src_prepare() { WX_GTK_VER=2.8 need-wxwidgets gtk2 + epatch "${FILESDIR}"/${P}-gcc45.patch } src_configure() { |