Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:12.1 checked in at 2011-11-05 10:34:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1/kdebase4-workspace (Old) and /work/SRC/openSUSE:12.1/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:12.1/kdebase4-workspace/kdebase4-workspace.changes 2011-11-05 09:41:17.000000000 +0100 +++ /work/SRC/openSUSE:12.1/.kdebase4-workspace.new/kdebase4-workspace.changes 2011-11-05 10:34:52.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 3 15:46:31 UTC 2011 - [email protected] + +- Add plasma-detect-gpsd-correctly.diff + * used return value of gps_open() as condition instead of checking + m_gpsdata, that fix plasmoid crash when gpsd not running. (bnc#722133) + +------------------------------------------------------------------- New: ---- plasma-detect-gpsd-correctly.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.lZjJa9/_old 2011-11-05 10:34:59.000000000 +0100 +++ /var/tmp/diff_new_pack.lZjJa9/_new 2011-11-05 10:34:59.000000000 +0100 @@ -105,6 +105,7 @@ Patch202: plasma-disable-networkmanager.diff Patch211: disable-python-support.diff Patch212: kdebase4-workspace-powerdevil-kconfig-cbce41f0.diff +Patch213: plasma-detect-gpsd-correctly.diff Requires: kde4-kgreeter-plugins = %version Requires: kdebase4-workspace-liboxygenstyle = %version %kde4_runtime_requires @@ -181,6 +182,7 @@ %patch202 -p1 %patch211 %patch212 -p1 +%patch213 -p1 cp %{SOURCE3} kwin/effects/cube/data/cubecap.png %build ++++++ plasma-detect-gpsd-correctly.diff ++++++ >From 60d13c58234086816b8c241cb5a0b29539e23303 Mon Sep 17 00:00:00 2001 From: Max Lin <[email protected]> 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 Index: kde-workspace-4.7.2/plasma/generic/dataengines/geolocation/location_gps.cpp =================================================================== --- kde-workspace-4.7.2.orig/plasma/generic/dataengines/geolocation/location_gps.cpp +++ kde-workspace-4.7.2/plasma/generic/dataengines/geolocation/location_gps.cpp @@ -83,11 +83,11 @@ Gps::Gps(QObject* parent, const QVariant { #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&)), -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
