head 1.5; access; symbols pkgsrc-2020Q2:1.4.0.72 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.52 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.74 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.70 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.68 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.66 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.64 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.62 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.60 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.58 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.56 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.54 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.50 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.48 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.46 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.44 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.42 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.40 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.38 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.36 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.34 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.32 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.30 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.28 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.26 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.24 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.22 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.20 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.18 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.16 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.14 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.12 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.10 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.8 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.6 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.4 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.2 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.2.0.2 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q2:1.1.1.1.0.2 pkgsrc-2009Q2-base:1.1.1.1 pkgsrc_base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2020.09.02.00.24.26; author gdt; state dead; branches; next 1.4; commitid KgIB0WwipXUMfpmC; 1.4 date 2011.04.12.17.14.53; author drochner; state Exp; branches; next 1.3; 1.3 date 2011.04.11.20.15.00; author drochner; state Exp; branches; next 1.2; 1.2 date 2009.09.08.10.19.33; author drochner; state dead; branches; next 1.1; 1.1 date 2009.06.04.10.57.59; author drochner; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2009.06.04.10.57.59; author drochner; state Exp; branches; next ; desc @@ 1.5 log @geography/merkaator: Update to 0.18.4 Update originally by Ben Gergely, with modifications by gdt, from PR pkg/55592. pkgsrc changes: - Adjust dependencies to qt5 - Require gcc6, due to gcc5 lossage with -Wno-registers Upstream NEWS: - Support for qt5 - Lots of bugfixes and minor improvements @ text @$NetBSD: patch-aa,v 1.4 2011/04/12 17:14:53 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(); @@@@ -1026,14 +1025,22 @@@@ void QGPSDDevice::onDataAvailable() setFixStatus(StatusActive); setLatitude(gpsdata->fix.latitude); setLongitude(gpsdata->fix.longitude); + if (gpsdata->fix.latitude < 0) + setLatCardinal(CardinalSouth); + else + setLatCardinal(CardinalNorth); + if (gpsdata->fix.longitude < 0) + setLongCardinal(CardinalWest); + else + setLongCardinal(CardinalEast); 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); @ 1.4 log @cosmetical fix: use correct N/E/S/W letters in GPS display with gpsd @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @-update to 0.17.2 changes: bugfixes -make it build against gpsd-2.96 @ text @d36 2 a37 1 @@@@ -1027,13 +1026,13 @@@@ void QGPSDDevice::onDataAvailable() d40 8 @ 1.2 log @update to 0.14 changes: Switch to API 0.6, remove support for 0.5 Add a Features dock displaying the features in the current viewport Alternative way of drawing GPX tracks Support for proxy authentification Ability to create a junction between to crossing roads Ability to create polygons of any number of sides Ability to rotate roads/areas Ability to create house numbers "Karlsruhe" style Spatial indexing of features for faster display with large downloaded areas Support for multiple image layers Support for multi-selection of layers; allow to show/hide or readonly several layers at once Drag&drop re-ordering of layers plugin-bassed background layers Ability to choose Qt style Discardable dialog/messageboxes and other tweaks and little things... tested by Jochen Kunz (and me) @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2009/06/04 10:57:59 drochner Exp $ d3 50 a52 11 --- Merkaartor.pro.orig 2009-06-03 19:58:54.000000000 +0200 +++ Merkaartor.pro @@@@ -85,7 +85,7 @@@@ BINTRANSLATIONS += \ translations/merkaartor_ar.qm \ translations/merkaartor_cs.qm \ translations/merkaartor_de.qm \ - translations/merkaartor_es.ts \ + translations/merkaartor_es.qm \ translations/merkaartor_fr.qm \ translations/merkaartor_it.qm \ translations/merkaartor_pl.qm \ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ @ 1.1.1.1 log @import merkaartor-0.13.2, an openstreetmap editor, from Jochen Kunz per mail to pkgsrc-users @ text @@