diff options
| author | drochner <drochner> | 2011-03-31 20:21:34 +0000 |
|---|---|---|
| committer | drochner <drochner> | 2011-03-31 20:21:34 +0000 |
| commit | 1aeb8eb1f6924cbc3d4cf09637513c56e9c07cc8 (patch) | |
| tree | 9880d00c5c9452b52bb29474a2a1f697cfe43325 /geography | |
| parent | 5a7962cad61dfee6545fa532e3b625ac032dcfb6 (diff) | |
| download | pkgsrc-1aeb8eb1f6924cbc3d4cf09637513c56e9c07cc8.tar.gz | |
fix build with gpsd-2.96 (lightly tested with "gpsfake")
Diffstat (limited to 'geography')
| -rw-r--r-- | geography/qlandkartegt/distinfo | 4 | ||||
| -rw-r--r-- | geography/qlandkartegt/patches/patch-ab | 15 | ||||
| -rw-r--r-- | geography/qlandkartegt/patches/patch-ac | 34 |
3 files changed, 52 insertions, 1 deletions
diff --git a/geography/qlandkartegt/distinfo b/geography/qlandkartegt/distinfo index fcd346d3bd8..6d840a5d1be 100644 --- a/geography/qlandkartegt/distinfo +++ b/geography/qlandkartegt/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.4 2011/01/17 11:22:43 drochner Exp $ +$NetBSD: distinfo,v 1.5 2011/03/31 20:21:34 drochner Exp $ SHA1 (qlandkartegt-1.0.0.tar.gz) = 1152383dcec41b3f698897bc4cd1f8cf0b5cbfe9 RMD160 (qlandkartegt-1.0.0.tar.gz) = 373924997ca707007daa024e394c8e033df42f9e Size (qlandkartegt-1.0.0.tar.gz) = 3799397 bytes SHA1 (patch-aa) = e81de01cd6227b6b486eeee244c31ee486363d6a +SHA1 (patch-ab) = 86ca39903638df9aa5dd904cf1d071dd851ca2b7 +SHA1 (patch-ac) = 4f410abe01923d0a66a08b2f4c584b895867a6fd diff --git a/geography/qlandkartegt/patches/patch-ab b/geography/qlandkartegt/patches/patch-ab new file mode 100644 index 00000000000..7ee9673bc0e --- /dev/null +++ b/geography/qlandkartegt/patches/patch-ab @@ -0,0 +1,15 @@ +$NetBSD: patch-ab,v 1.1 2011/03/31 20:21:34 drochner Exp $ + +for gpsd-2.96 + +--- src/CDeviceGPSD.h.orig 2011-03-15 20:13:04.000000000 +0000 ++++ src/CDeviceGPSD.h +@@ -56,7 +56,7 @@ class CGPSDThread : public QThread + protected: + virtual void run(); + +- gps_data_t* gpsdata; ++ gps_data_t* gpsdata, gpsdata_store; + + bool decodeData(); + diff --git a/geography/qlandkartegt/patches/patch-ac b/geography/qlandkartegt/patches/patch-ac new file mode 100644 index 00000000000..ca5571ec843 --- /dev/null +++ b/geography/qlandkartegt/patches/patch-ac @@ -0,0 +1,34 @@ +$NetBSD: patch-ac,v 1.1 2011/03/31 20:21:34 drochner Exp $ + +for gpsd-2.96 + +--- src/CDeviceGPSD.cpp.orig 2011-03-15 20:13:04.000000000 +0000 ++++ src/CDeviceGPSD.cpp +@@ -138,6 +138,7 @@ CGPSDThread::CGPSDThread( int _pipe_fd ) + log_mutex( new QMutex() ), + pipe_fd( _pipe_fd ) + { ++ gpsdata = &gpsdata_store; + } + + +@@ -149,8 +150,8 @@ CGPSDThread::~CGPSDThread() + + void CGPSDThread::run() + { +- gpsdata = gps_open( "localhost", DEFAULT_GPSD_PORT ); +- if( !gpsdata ) ++ int res = gps_open( "localhost", DEFAULT_GPSD_PORT, gpsdata ); ++ if( res ) + { + // TODO: message box (from other thread) + qDebug() << "gps_open failed."; +@@ -187,7 +188,7 @@ void CGPSDThread::run() + } // if + else if( FD_ISSET( gpsdata->gps_fd, &fds ) ) + { +- gps_poll( gpsdata ); ++ gps_read( gpsdata ); + if( !decodeData() ) break; + } // else if + } // else if |