diff options
author | root <root@rshg054.dnsready.net> | 2011-08-27 23:14:39 +0000 |
---|---|---|
committer | root <root@rshg054.dnsready.net> | 2011-08-27 23:14:39 +0000 |
commit | a4c358009dd89183b4124505c694ea7f5fcdbeec (patch) | |
tree | 2b157b1e89ca7df45bd35f6a72c39b26af558827 /extra/kdeedu-marble/gpsd3.patch | |
parent | d7d02f7c02a5c761e8a64df49598ae976640e450 (diff) |
Sat Aug 27 23:14:39 UTC 2011
Diffstat (limited to 'extra/kdeedu-marble/gpsd3.patch')
-rw-r--r-- | extra/kdeedu-marble/gpsd3.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/extra/kdeedu-marble/gpsd3.patch b/extra/kdeedu-marble/gpsd3.patch new file mode 100644 index 000000000..e11859b0b --- /dev/null +++ b/extra/kdeedu-marble/gpsd3.patch @@ -0,0 +1,42 @@ +diff -up marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp +--- marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig 2011-05-20 15:34:41.000000000 -0500 ++++ marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp 2011-08-24 13:38:37.050200241 -0500 +@@ -20,6 +20,9 @@ using namespace Marble; + + GpsdConnection::GpsdConnection( QObject* parent ) + : QObject( parent ), ++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) ++ m_gpsd("localhost", DEFAULT_GPSD_PORT), ++#endif + m_timer( 0 ) + { + m_oldLocale = setlocale( LC_NUMERIC, NULL ); +@@ -35,7 +38,11 @@ GpsdConnection::~GpsdConnection() + void GpsdConnection::initialize() + { + m_timer.stop(); ++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) ++ gps_data_t* data; ++#else + gps_data_t* data = m_gpsd.open(); ++#endif + if ( data ) { + m_status = PositionProviderStatusAcquiring; + emit statusChanged( m_status ); +@@ -82,8 +89,16 @@ void GpsdConnection::initialize() + void GpsdConnection::update() + { + #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET ) ++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) ++ if ( m_gpsd.waiting(0) ) { ++#else + if ( m_gpsd.waiting() ) { ++#endif ++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) ++ gps_data_t* data = m_gpsd.read(); ++#else + gps_data_t* data = m_gpsd.poll(); ++#endif + if ( data && data->set & PACKET_SET ) { + emit gpsdInfo( *data ); + } |