rev 16381 - in trunk/packages/kdebase-workspace/debian: . patches

[Modestas Vainius]

Author: modax
Date: 2009-12-09 20:49:43 +0000 (Wed, 09 Dec 2009)
New Revision: 16381

Added:
   trunk/packages/kdebase-workspace/debian/patches/27_geolocation_gpsd_2.90_compat.diff
Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/patches/series
Log:
Make geolocation plugin build against version 2.9 of the gpsd library API.
Patch 27_geolocation_gpsd_2.90_compat.diff. Also bump build depends to this
version of the library.

Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2009-12-09 18:47:00 UTC (rev 16380)
+++ trunk/packages/kdebase-workspace/debian/changelog	2009-12-09 20:49:43 UTC (rev 16381)
@@ -16,6 +16,9 @@
   +++ Changes by Modestas Vainius:
 
   * Update install files.
+  * Make geolocation plugin build against version 2.9 of the gpsd library API.
+    Patch 27_geolocation_gpsd_2.90_compat.diff. Also bump build depends to this
+    version of the library.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 09 Dec 2009 00:24:06 +0200
 

Added: trunk/packages/kdebase-workspace/debian/patches/27_geolocation_gpsd_2.90_compat.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/27_geolocation_gpsd_2.90_compat.diff	                        (rev 0)
+++ trunk/packages/kdebase-workspace/debian/patches/27_geolocation_gpsd_2.90_compat.diff	2009-12-09 20:49:43 UTC (rev 16381)
@@ -0,0 +1,18 @@
+From: Modestas Vainius <modestas at vainius.eu>
+Subject: Make geolocation code compatible with gpsd 2.9 API
+  Based on http://gpsd.berlios.de/protocol-transition.html section "Virtue is
+  rewarded". This patch breaks compatibility with the earlier version of the
+  library.
+Forwarded: no
+
+--- a/plasma/dataengines/geolocation/location_gps.cpp
++++ b/plasma/dataengines/geolocation/location_gps.cpp
+@@ -41,7 +41,7 @@
+ 
+ void Gpsd::run()
+ {
+-    gps_query(m_gpsdata, "w+x\n");
++    gps_stream(gpsdata, WATCH_ENABLE, NULL);
+ 
+     while (!m_abort) {
+         Plasma::DataEngine::Data d;

Modified: trunk/packages/kdebase-workspace/debian/patches/series
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/series	2009-12-09 18:47:00 UTC (rev 16380)
+++ trunk/packages/kdebase-workspace/debian/patches/series	2009-12-09 20:49:43 UTC (rev 16381)
@@ -12,4 +12,5 @@
 24_do_not_search_for_libeet.diff
 25_task.h_forward_decl_netwininfo.diff
 26_run_kaboom_when_starting_kde.diff
+27_geolocation_gpsd_2.90_compat.diff
 97_fix_target_link_libraries.diff