head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.4
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.2
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.1.0.8
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.6
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.4
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.2
	pkgsrc-2011Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2012.01.28.13.51.57;	author jkunz;	state dead;
branches;
next	1.1;

1.1
date	2011.03.31.20.21.34;	author drochner;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update to upstream version qlandkartegt-1.3.2.
@
text
@$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
@


1.1
log
@fix build with gpsd-2.96 (lightly tested with "gpsfake")
@
text
@d1 1
a1 1
$NetBSD$
@