[SCM] KDE Education module packaging branch, master, updated. debian/4.6.5-1-2-gcd84eae

[Pino Toscano]

The following commit has been merged in the master branch:
commit cd84eae0121f559cb3788e3fc5601f5724668a29
Author: Pino Toscano <pino at debian.org>
Date:   Fri Dec 2 18:31:38 2011 +0100

    fix Marble compatibility with gpsd >= 2.96 (#648502)
    
    work based on an upstream commit, partially manually adapted for Marble in kdeedu 4.6
---
 debian/changelog                |    2 +
 debian/patches/marble-gpsd.diff |   53 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |    1 +
 3 files changed, 56 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 26cbf5f..19e587c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 kdeedu (4:4.6.5-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Fix Marble compatibility with gpsd >= 2.96. (Closes: #648502)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 02 Dec 2011 16:27:42 +0100
 
diff --git a/debian/patches/marble-gpsd.diff b/debian/patches/marble-gpsd.diff
new file mode 100644
index 0000000..ebf714a
--- /dev/null
+++ b/debian/patches/marble-gpsd.diff
@@ -0,0 +1,53 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Fix Marble compatibility with gpsd 2.96 and above.
+ Largely inspired by upstream commit 7fd1dd92e421ca6e0b8755a9aa2e47b5fa8c3ac0,
+ but rewritten the part in GpsdConnection::update() to adapt to the older
+ Marble codebase.
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2011-12-02
+
+--- a/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
++++ b/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
+@@ -20,6 +20,9 @@
+ 
+ GpsdConnection::GpsdConnection( QObject* parent )
+     : QObject( parent ),
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++      m_gpsd( "localhost", DEFAULT_GPSD_PORT ),
++#endif
+       m_timer( 0 )
+ {
+     m_oldLocale = setlocale( LC_NUMERIC, NULL );
+@@ -35,8 +38,14 @@
+ void GpsdConnection::initialize()
+ {
+     m_timer.stop();
++    bool success = false;
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++    success = true;
++#else
+     gps_data_t* data = m_gpsd.open();
+-    if ( data ) {
++    success = ( data != 0 );
++#endif
++    if ( success ) {
+         m_status = PositionProviderStatusAcquiring;
+         emit statusChanged( m_status );
+ 
+@@ -81,7 +90,14 @@
+ 
+ void GpsdConnection::update()
+ {
+-#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET )
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++    if ( m_gpsd.waiting( 0 ) ) {
++        gps_data_t* data = m_gpsd.read();
++        if ( data && data->set & PACKET_SET ) {
++            emit gpsdInfo( *data );
++        }
++    }
++#elif defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET )
+     if ( m_gpsd.waiting() ) {
+         gps_data_t* data = m_gpsd.poll();
+         if ( data && data->set & PACKET_SET ) {
diff --git a/debian/patches/series b/debian/patches/series
index 3335079..6fa1c5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 no_install_rpath_use_link_path.diff
 enable_debianabimanager.diff
+marble-gpsd.diff

-- 
KDE Education module packaging