[SCM] KDE Base Workspace module packaging branch, kde4.6, updated. debian/4.6.5-4-2-g80716b4

[Pino Toscano]

The following commit has been merged in the kde4.6 branch:
commit 80716b48ecc2a84988f01e9146632a119035c907
Author: Pino Toscano <pino at debian.org>
Date:   Tue Dec 13 17:49:01 2011 +0100

    backport upstream patch to fix open errors in the gpsd support (#651950)
---
 debian/changelog                                   |    3 ++
 debian/patches/series                              |    1 +
 ...s_open-return-value-as-condition-instead-.patch |   37 ++++++++++++++++++++
 3 files changed, 41 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5e4fd62..44f569a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 kdebase-workspace (4:4.6.5-5) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Backport upstream patch to fix open errors in the gpsd support.
+    (Closes: #651950)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 13 Dec 2011 17:44:49 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 1e17a43..d801835 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,3 +20,4 @@ enable_dlrestrcitions.diff
 kdm_vt_switching_on_kfreebsd.diff
 kwin_avoid_deep_vector_copies.diff
 upstream_gpsd-api-has-changed-and-for-GPSD_API_MAJOR_VERSION.patch
+upstream_Used-the-gps_open-return-value-as-condition-instead-.patch
diff --git a/debian/patches/upstream_Used-the-gps_open-return-value-as-condition-instead-.patch b/debian/patches/upstream_Used-the-gps_open-return-value-as-condition-instead-.patch
new file mode 100644
index 0000000..a8d1e87
--- /dev/null
+++ b/debian/patches/upstream_Used-the-gps_open-return-value-as-condition-instead-.patch
@@ -0,0 +1,37 @@
+From 60d13c58234086816b8c241cb5a0b29539e23303 Mon Sep 17 00:00:00 2001
+From: Max Lin <max7442 at gmail.com>
+Date: Thu, 3 Nov 2011 16:00:08 +0800
+Subject: [PATCH] Used the gps_open() return value as condition instead of
+ checking m_gpsdata
+
+Checking the return value of gps_open() as condition instead of checking
+m_gpsdata for GPSD_API_MAJOR_VERSION >=5, there should be prevent crash
+occurred when no gpsd running.
+
+BUG: 277036
+REVIEW: 103035
+---
+ .../dataengines/geolocation/location_gps.cpp       |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plasma/generic/dataengines/geolocation/location_gps.cpp b/plasma/generic/dataengines/geolocation/location_gps.cpp
+index 9ed8f92..67b1b64 100644
+--- a/plasma/generic/dataengines/geolocation/location_gps.cpp
++++ b/plasma/generic/dataengines/geolocation/location_gps.cpp
+@@ -83,11 +83,11 @@ Gps::Gps(QObject* parent, const QVariantList& args)
+ {
+ #if GPSD_API_MAJOR_VERSION >= 5
+     m_gpsdata = new gps_data_t;
+-    gps_open("localhost", DEFAULT_GPSD_PORT, m_gpsdata);
++    if (gps_open("localhost", DEFAULT_GPSD_PORT, m_gpsdata) != -1) {
+ #else
+     gps_data_t* m_gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT);
+-#endif
+     if (m_gpsdata) {
++#endif
+         kDebug() << "gpsd found.";
+         m_gpsd = new Gpsd(m_gpsdata);
+         connect(m_gpsd, SIGNAL(dataReady(const Plasma::DataEngine::Data&)),
+-- 
+1.7.7.3
+

-- 
KDE Base Workspace module packaging