diff options
| author | Alberto Villa <avilla@FreeBSD.org> | 2011-10-17 00:03:42 +0000 |
|---|---|---|
| committer | Alberto Villa <avilla@FreeBSD.org> | 2011-10-17 00:03:42 +0000 |
| commit | a2d3b5a4bc5047210b788a128596ec34749ffa11 (patch) | |
| tree | c3c20b47c3435ddcaf02b8570db6aab5b70011af /x11/kdebase4-workspace/files/patch-plasma-generic-dataengines-geolocation-location_gps.cpp | |
| parent | - Add dependency on security/pam_kde. (diff) | |
The KDE/FreeBSD team is pleased to announce KDE Software Compilation
4.7.2. The official release notes can be found at:
http://kde.org/announcements/announce-4.7.2.php
This release ships with many improvements. Read more about them here:
http://FreeBSD.kde.org/news.php#itemKDESC472availableinports
We'd like to say thanks to all testers and contributors, especially to
lwhsu@ for his effort on hosting our test packages.
PR: 156293 [1]
159219 [2]
160164 [3]
Submitted by: Oleg Sidorkin <osidorkin@gmail.com> [1]
Alvaro Castillo <gobledb@gmail.com> [2]
dkeav04@gmail.com [3]
Tested by: exp-run via pav
Notes
Notes:
svn path=/head/; revision=283641
Diffstat (limited to 'x11/kdebase4-workspace/files/patch-plasma-generic-dataengines-geolocation-location_gps.cpp')
| -rw-r--r-- | x11/kdebase4-workspace/files/patch-plasma-generic-dataengines-geolocation-location_gps.cpp | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/x11/kdebase4-workspace/files/patch-plasma-generic-dataengines-geolocation-location_gps.cpp b/x11/kdebase4-workspace/files/patch-plasma-generic-dataengines-geolocation-location_gps.cpp deleted file mode 100644 index 7bdf60248966..000000000000 --- a/x11/kdebase4-workspace/files/patch-plasma-generic-dataengines-geolocation-location_gps.cpp +++ /dev/null @@ -1,54 +0,0 @@ ---- plasma/generic/dataengines/geolocation/location_gps.cpp.orig 2011-03-23 00:33:55.000000000 +0300 -+++ plasma/generic/dataengines/geolocation/location_gps.cpp 2011-03-23 00:48:57.000000000 +0300 -@@ -17,7 +17,7 @@ - - #include "location_gps.h" - --Gpsd::Gpsd(gps_data_t* gpsdata) -+Gpsd::Gpsd(gps_data_t gpsdata) - : m_gpsdata(gpsdata) - , m_abort(false) - { -@@ -41,24 +41,20 @@ - - void Gpsd::run() - { --#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"); --#endif -+ gps_stream(&m_gpsdata, WATCH_ENABLE, NULL); - - while (!m_abort) { - Plasma::DataEngine::Data d; - -- if (gps_poll(m_gpsdata) != -1) { -+ if (gps_read(&m_gpsdata) > 0) { - //kDebug() << "poll ok"; -- if (m_gpsdata->online) { -+ if (m_gpsdata.online) { - //kDebug() << "online"; -- if (m_gpsdata->status != STATUS_NO_FIX) { -+ if (m_gpsdata.status != STATUS_NO_FIX) { - //kDebug() << "fix"; - d["accuracy"] = 30; -- d["latitude"] = QString::number(m_gpsdata->fix.latitude); -- d["longitude"] = QString::number(m_gpsdata->fix.longitude); -+ d["latitude"] = QString::number(m_gpsdata.fix.latitude); -+ d["longitude"] = QString::number(m_gpsdata.fix.longitude); - } - } - } -@@ -73,8 +69,9 @@ - : GeolocationProvider(parent, args), - m_gpsd(0) - { -- gps_data_t* gpsdata = gps_open("localhost", DEFAULT_GPSD_PORT); -- if (gpsdata) { -+ gps_data_t gpsdata; -+ -+ if (gps_open("localhost", DEFAULT_GPSD_PORT, &gpsdata) == 0) { - kDebug() << "gpsd found."; - m_gpsd = new Gpsd(gpsdata); - connect(m_gpsd, SIGNAL(dataReady(const Plasma::DataEngine::Data&)), |