Hi Petri,

I'm in contact with the Debian Qt/KDE packagers team and they asked me to 
commit attached patch. I committed a similar patch to marble trunk / 4.4 
yesterday.

Can I commit the attached patch to trunk and 4.4?


Kind regards,

Jens-Michael


ps: these are the marble patches:
http://websvn.kde.org/?view=rev&revision=1098876
http://websvn.kde.org/?view=rev&revision=1098879
Author: Modestas Vainius <mo...@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");
_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel

Reply via email to