-
Notifications
You must be signed in to change notification settings - Fork 106
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
changes: bugfixes -make it build against gpsd-2.96
- Loading branch information
drochner
committed
Apr 11, 2011
1 parent
38dfa27
commit c38f7fd
Showing
4 changed files
with
68 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -1,5 +1,6 @@ | |||
$NetBSD: distinfo,v 1.7 2011/01/13 22:24:34 jkunz Exp $ | $NetBSD: distinfo,v 1.8 2011/04/11 20:15:00 drochner Exp $ | ||
|
|
||
SHA1 (merkaartor-0.17.0.tar.bz2) = bd7a162a6bac0073e05b4960db2d941ae41b6e7e | SHA1 (merkaartor-0.17.2.tar.bz2) = f789141db427bf25bb3b61801fefc98ab0430012 | ||
RMD160 (merkaartor-0.17.0.tar.bz2) = c342bdf3c19c4d76c96c62ec9801b3e6a50c9254 | RMD160 (merkaartor-0.17.2.tar.bz2) = c5c8944872828ba5ada6003cd5821f33899da3cb | ||
Size (merkaartor-0.17.0.tar.bz2) = 7138228 bytes | Size (merkaartor-0.17.2.tar.bz2) = 7138991 bytes | ||
SHA1 (patch-aa) = a5bdc832ed6a14c9fffe0a6db046cf9842686877 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Original file line | Diff line number | Diff line change |
---|---|---|---|
@@ -0,0 +1,52 @@ | |||
$NetBSD: patch-aa,v 1.3 2011/04/11 20:15:00 drochner Exp $ | |||
|
|||
--- src/GPS/qgpsdevice.cpp.orig 2011-02-10 12:00:35.000000000 +0000 | |||
+++ src/GPS/qgpsdevice.cpp | |||
@@ -959,10 +959,9 @@ void QGPSDDevice::run() | |||
// exec(); | |||
QEventLoop l; | |||
|
|||
- Server = new gpsmm(); | |||
errno = 0; | |||
- gpsdata = Server->open(M_PREFS->getGpsdHost().toAscii().data(),QString::number(M_PREFS->getGpsdPort()).toAscii().data()); | |||
- if (!gpsdata) { | |||
+ Server = new gpsmm(M_PREFS->getGpsdHost().toAscii().data(),QString::number(M_PREFS->getGpsdPort()).toAscii().data()); | |||
+ if (!Server) { | |||
#ifndef Q_OS_WIN32 | |||
QString msg( (errno<0) ? gps_errstr(errno) : strerror(errno) ); | |||
#else | |||
@@ -978,7 +977,7 @@ void QGPSDDevice::run() | |||
|
|||
forever { | |||
#if GPSD_API_MAJOR_VERSION > 3 | |||
- if (Server->waiting()) | |||
+ if (Server->waiting(0)) | |||
#endif | |||
onDataAvailable(); | |||
l.processEvents(); | |||
@@ -994,7 +993,7 @@ void QGPSDDevice::onDataAvailable() | |||
if (!gpsdata) | |||
return; | |||
#else | |||
- if ( Server->waiting() ) | |||
+ if ( Server->waiting(0) ) | |||
{ | |||
errno = 0; | |||
gpsdata = Server->read(); | |||
@@ -1027,13 +1026,13 @@ void QGPSDDevice::onDataAvailable() | |||
setLatitude(gpsdata->fix.latitude); | |||
setLongitude(gpsdata->fix.longitude); | |||
double Alt = gpsdata->fix.altitude; | |||
- if (!__isnan(Alt)) | |||
+ if (!std::isnan(Alt)) | |||
setAltitude(Alt); | |||
double Speed = gpsdata->fix.speed; | |||
- if (!__isnan(Speed)) | |||
+ if (!std::isnan(Speed)) | |||
setSpeed(Speed); | |||
double Heading = gpsdata->fix.track; | |||
- if (!__isnan(Heading)) | |||
+ if (!std::isnan(Heading)) | |||
setHeading(Heading); | |||
if (gpsdata->fix.time) | |||
cur_datetime = QDateTime::fromTime_t(gpsdata->fix.time); |