packages: marble/marble.spec, marble/marble-gpsd3.patch (NEW) - rel 4; buil...

[arekm]

Author: arekm                        Date: Thu Sep 29 17:43:08 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; build with gpsd3; patch from fc

---- Files affected:
packages/marble:
   marble.spec (1.10 -> 1.11) , marble-gpsd3.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/marble/marble.spec
diff -u packages/marble/marble.spec:1.10 packages/marble/marble.spec:1.11
--- packages/marble/marble.spec:1.10	Tue Sep 27 21:50:21 2011
+++ packages/marble/marble.spec	Thu Sep 29 19:43:03 2011
@@ -10,11 +10,12 @@
 Summary(pl.UTF-8):	Marble
 Name:		marble
 Version:	4.7.1
-Release:	3
+Release:	4
 License:	LGPL v2
 Group:		X11/Libraries
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
 # Source0-md5:	c51019621e91c53b1ded13eb2cfc76c0
+Patch0:		%{name}-gpsd3.patch
 URL:		http://www.kde.org/
 # leave only required ones
 BuildRequires:	Qt3Support-devel >= %{qt_ver}
@@ -65,6 +66,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 install -d build
@@ -142,6 +144,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2011/09/29 17:43:03  arekm
+- rel 4; build with gpsd3; patch from fc
+
 Revision 1.10  2011/09/27 19:50:21  arekm
 - release 3
 

================================================================
Index: packages/marble/marble-gpsd3.patch
diff -u /dev/null packages/marble/marble-gpsd3.patch:1.1
--- /dev/null	Thu Sep 29 19:43:08 2011
+++ packages/marble/marble-gpsd3.patch	Thu Sep 29 19:43:03 2011
@@ -0,0 +1,42 @@
+diff -up marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
+--- marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig	2011-05-20 15:34:41.000000000 -0500
++++ marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp	2011-08-24 13:38:37.050200241 -0500
+@@ -20,6 +20,9 @@ using namespace Marble;
+ 
+ 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,7 +38,11 @@ GpsdConnection::~GpsdConnection()
+ void GpsdConnection::initialize()
+ {
+     m_timer.stop();
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++    gps_data_t* data;
++#else
+     gps_data_t* data = m_gpsd.open();
++#endif
+     if ( data ) {
+         m_status = PositionProviderStatusAcquiring;
+         emit statusChanged( m_status );
+@@ -82,8 +89,16 @@ void GpsdConnection::initialize()
+ 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) ) {
++#else
+     if ( m_gpsd.waiting() ) {
++#endif
++#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 )
++        gps_data_t* data = m_gpsd.read();
++#else
+         gps_data_t* data = m_gpsd.poll();
++#endif
+         if ( data && data->set & PACKET_SET ) {
+             emit gpsdInfo( *data );
+         }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/marble/marble.spec?r1=1.10&r2=1.11&f=u