[arch-commits] Commit in kdeedu-marble/trunk (PKGBUILD gpsd-2.96.patch gpsd3.patch)
Andrea Scarpino
andrea at archlinux.org
Thu Aug 25 08:57:13 UTC 2011
Date: Thursday, August 25, 2011 @ 04:57:13
Author: andrea
Revision: 136261
upgpkg: kdeedu-marble 4.7.0-3
Update patch for gpsd 3.0
Added:
kdeedu-marble/trunk/gpsd3.patch
Modified:
kdeedu-marble/trunk/PKGBUILD
Deleted:
kdeedu-marble/trunk/gpsd-2.96.patch
-----------------+
PKGBUILD | 8 ++++----
gpsd-2.96.patch | 41 -----------------------------------------
gpsd3.patch | 42 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 46 insertions(+), 45 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-08-25 08:51:06 UTC (rev 136260)
+++ PKGBUILD 2011-08-25 08:57:13 UTC (rev 136261)
@@ -3,7 +3,7 @@
pkgname=kdeedu-marble
pkgver=4.7.0
-pkgrel=2
+pkgrel=3
pkgdesc="Desktop Globe"
url="http://kde.org/applications/education/marble/"
arch=('i686' 'x86_64')
@@ -14,13 +14,13 @@
optdepends=('gpsd: gps support')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2"
- 'gpsd-2.96.patch')
+ 'gpsd3.patch')
sha1sums=('bbe08a57a33e06fceea3a51aed1406bc71ee02a9'
- 'f44dfd3bb384e631d59b93d7dda3413795da8183')
+ '3916dd6307109d70d0dd538de913c91eede81d78')
build() {
cd "${srcdir}"/marble-${pkgver}
- patch -p1 -i "${srcdir}"/gpsd-2.96.patch
+ patch -p1 -i "${srcdir}"/gpsd3.patch
cd "${srcdir}"
mkdir build
Deleted: gpsd-2.96.patch
===================================================================
--- gpsd-2.96.patch 2011-08-25 08:51:06 UTC (rev 136260)
+++ gpsd-2.96.patch 2011-08-25 08:57:13 UTC (rev 136261)
@@ -1,41 +0,0 @@
---- marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-+++ marble-4.6.80/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-@@ -18,6 +18,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 )
- {
- connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) );
-@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject*
- 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 );
-@@ -73,8 +80,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 );
- }
Added: gpsd3.patch
===================================================================
--- gpsd3.patch (rev 0)
+++ gpsd3.patch 2011-08-25 08:57:13 UTC (rev 136261)
@@ -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 );
+ }
More information about the arch-commits
mailing list