diff options
| author | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-29 22:59:51 -0500 |
|---|---|---|
| committer | Joshua Ismael Haase Hernandez <hahj87@gmail.com> | 2011-05-29 22:59:51 -0500 |
| commit | 0aa81f04b6149c3eb5faedd57512a981e6d3c624 (patch) | |
| tree | 98b1d03925fafa426c20c3075d69145c8bb2f4d8 /community/qlandkartegt | |
| parent | b18caf89fb235f174419d578a7da0237e456ef3d (diff) | |
| parent | c399070d50c89903ec1dea55aa4aa5147a367565 (diff) | |
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el
Conflicts:
community/csfml/PKGBUILD
community/evolution-rss/PKGBUILD
community/inn/PKGBUILD
community/libssh2/PKGBUILD
community/perl-xml-dom/PKGBUILD
community/php52/PKGBUILD
community/python-pysfml/PKGBUILD
community/skype-call-recorder/PKGBUILD
extra/ipod-sharp/PKGBUILD
extra/madwifi-utils/PKGBUILD
extra/madwifi/PKGBUILD
Diffstat (limited to 'community/qlandkartegt')
| -rw-r--r-- | community/qlandkartegt/gpsd-2.96.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/community/qlandkartegt/gpsd-2.96.patch b/community/qlandkartegt/gpsd-2.96.patch deleted file mode 100644 index 634e9ad7e..000000000 --- a/community/qlandkartegt/gpsd-2.96.patch +++ /dev/null @@ -1,49 +0,0 @@ -$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(); - -$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 |