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

[Modestas Vainius]

Author: modax
Date: 2010-03-04 15:13:10 +0000 (Thu, 04 Mar 2010)
New Revision: 17324

Added:
   trunk/packages/kdebase-workspace/debian/patches/00_fix_ftfbs_with_gpsd_2.92.diff
Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/patches/series
Log:
Add patch 00_fix_ftfbs_with_gpsd_2.92.diff to fix geolocation dataengine
build against gpsd 2.92.

Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2010-03-04 14:01:16 UTC (rev 17323)
+++ trunk/packages/kdebase-workspace/debian/changelog	2010-03-04 15:13:10 UTC (rev 17324)
@@ -83,6 +83,8 @@
   * Add cmake to Build-Depends.
   * Add kde-sc-dev-latest (>= 4:4.4.1) to Build-Depends.
   * Unversion conflicts with kdebase-workspace-libs4+5.
+  * Add patch 00_fix_ftfbs_with_gpsd_2.92.diff to fix geolocation dataengine
+    build against gpsd 2.92.
 
   [ Christian Perrier ]
   * Debconf translations:

Added: trunk/packages/kdebase-workspace/debian/patches/00_fix_ftfbs_with_gpsd_2.92.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/00_fix_ftfbs_with_gpsd_2.92.diff	                        (rev 0)
+++ trunk/packages/kdebase-workspace/debian/patches/00_fix_ftfbs_with_gpsd_2.92.diff	2010-03-04 15:13:10 UTC (rev 17324)
@@ -0,0 +1,16 @@
+Author: Modestas Vainius <modax at debian.org>
+Description: fix geolocation dataengine build against gpsd 2.92
+ Even if API version is bumped, it does not mean that the code will cease to
+ build or work.
+
+--- a/plasma/generic/dataengines/geolocation/location_gps.cpp
++++ b/plasma/generic/dataengines/geolocation/location_gps.cpp
+@@ -41,7 +41,7 @@
+ 
+ void Gpsd::run()
+ {
+-#if GPSD_API_MAJOR_VERSION == 3 && defined( WATCH_ENABLE )
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( WATCH_ENABLE )
+     gps_stream(m_gpsdata, WATCH_ENABLE, NULL);
+ #else
+     gps_query(m_gpsdata, "w+x\n");

Modified: trunk/packages/kdebase-workspace/debian/patches/series
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/series	2010-03-04 14:01:16 UTC (rev 17323)
+++ trunk/packages/kdebase-workspace/debian/patches/series	2010-03-04 15:13:10 UTC (rev 17324)
@@ -1,3 +1,4 @@
+00_fix_ftfbs_with_gpsd_2.92.diff
 06_kdm_does_not_wreak_havoc.diff
 07_kdmrc_defaults.diff
 08_genkdmconf.diff