rev 16386 - in trunk/packages/kdeedu/debian: . patches

[Modestas Vainius]

Author: modax
Date: 2009-12-09 22:34:49 +0000 (Wed, 09 Dec 2009)
New Revision: 16386

Added:
   trunk/packages/kdeedu/debian/patches/01_gpsd_2.90_compat.diff
Modified:
   trunk/packages/kdeedu/debian/changelog
   trunk/packages/kdeedu/debian/control
   trunk/packages/kdeedu/debian/patches/series
Log:
* Imperfect attempt to port marble positionprovider to gpsd 2.90 API.
  Untested, might be buggy and should probably be replaced by proper fix from
  upstream. Patch 01_gpsd_2.90_compat.diff.
* Bump build depends to libgps-dev >= 2.90.

Modified: trunk/packages/kdeedu/debian/changelog
===================================================================
--- trunk/packages/kdeedu/debian/changelog	2009-12-09 22:33:47 UTC (rev 16385)
+++ trunk/packages/kdeedu/debian/changelog	2009-12-09 22:34:49 UTC (rev 16386)
@@ -24,6 +24,10 @@
   +++ Changes by Modestas Vainius:
 
   * Update install files.
+  * Imperfect attempt to port marble positionprovider to gpsd 2.90 API.
+    Untested, might be buggy and should probably be replaced by proper fix from
+    upstream. Patch 01_gpsd_2.90_compat.diff.
+  * Bump build depends to libgps-dev >= 2.90.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 09 Dec 2009 00:24:06 +0200
 

Modified: trunk/packages/kdeedu/debian/control
===================================================================
--- trunk/packages/kdeedu/debian/control	2009-12-09 22:33:47 UTC (rev 16385)
+++ trunk/packages/kdeedu/debian/control	2009-12-09 22:34:49 UTC (rev 16386)
@@ -8,7 +8,7 @@
  libboost-python-dev, libcfitsio3-dev (>= 3.040),
  libglu1-mesa-dev, libgs-dev, libnova-dev, libqt4-opengl-dev,
  libreadline-dev, libusb-dev, libxslt-dev, ocaml, zlib1g-dev,
- libfacile-ocaml-dev, libopenbabel-dev, openbabel, pkg-config, libgps-dev,
+ libfacile-ocaml-dev, libopenbabel-dev, openbabel, pkg-config, libgps-dev (>= 2.90),
  xplanet, libeigen2-dev (>> 2.0.3), libgsl0-dev, libqalculate-dev, libglib2.0-dev
 Standards-Version: 3.8.3
 Homepage: http://edu.kde.org/

Added: trunk/packages/kdeedu/debian/patches/01_gpsd_2.90_compat.diff
===================================================================
--- trunk/packages/kdeedu/debian/patches/01_gpsd_2.90_compat.diff	                        (rev 0)
+++ trunk/packages/kdeedu/debian/patches/01_gpsd_2.90_compat.diff	2009-12-09 22:34:49 UTC (rev 16386)
@@ -0,0 +1,30 @@
+From: Modestas Vainius <modestas at vainius.eu>
+Subject: Attempt to port to gpsd 2.90 API. Might not work, not tested
+ Based on http://gpsd.berlios.de/protocol-transition.html
+          http://gpsd.berlios.de/gpsd.html
+          http://gpsd.berlios.de/libgps.html
+ Probably should be replaced by proper fix from upstream (when available).
+Forwarded: no
+
+--- a/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
++++ b/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
+@@ -22,6 +22,7 @@
+ {
+     gps_data_t* data = m_gpsd.open();
+     if ( data ) {
++        m_gpsd.stream(WATCH_ENABLE);
+         connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
+         m_timer.start( 1000 );
+     } else
+@@ -29,7 +30,10 @@
+ }
+ 
+ void GpsdConnection::update() {
+-    gps_data_t* data = m_gpsd.query( "o" );
++    gps_data_t* data;
++    while ((data = m_gpsd.poll()) && !(data->set & POLICY_SET)) {
++        data = m_gpsd.poll();
++    }
+     if ( data )
+         emit gpsdInfo( *data );
+ }

Modified: trunk/packages/kdeedu/debian/patches/series
===================================================================
--- trunk/packages/kdeedu/debian/patches/series	2009-12-09 22:33:47 UTC (rev 16385)
+++ trunk/packages/kdeedu/debian/patches/series	2009-12-09 22:34:49 UTC (rev 16386)
@@ -1,2 +1,3 @@
 step_needs_-lcln.diff
 00_kfreebsd.diff
+01_gpsd_2.90_compat.diff