diff options
author | root <root@rshg047.dnsready.net> | 2011-04-27 22:24:53 +0000 |
---|---|---|
committer | root <root@rshg047.dnsready.net> | 2011-04-27 22:24:53 +0000 |
commit | 18d6577d511b9a1ac36eaae50060133a401e42a3 (patch) | |
tree | f681f9444a7a0a95916de40af82d3b805d5fb8d3 /extra/kdeedu | |
parent | 69e1fada8bdc9588d0a3d8bc3403fa809d809a84 (diff) |
Wed Apr 27 22:24:53 UTC 2011
Diffstat (limited to 'extra/kdeedu')
-rw-r--r-- | extra/kdeedu/PKGBUILD | 15 | ||||
-rw-r--r-- | extra/kdeedu/gpsd-2.96.patch | 43 |
2 files changed, 53 insertions, 5 deletions
diff --git a/extra/kdeedu/PKGBUILD b/extra/kdeedu/PKGBUILD index 4de1a090c..d3c26577a 100644 --- a/extra/kdeedu/PKGBUILD +++ b/extra/kdeedu/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 118069 2011-04-05 10:08:07Z andrea $ +# $Id: PKGBUILD 119955 2011-04-17 11:47:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -26,7 +26,7 @@ pkgname=('kdeedu-blinken' 'kdeedu-rocs' 'kdeedu-step') pkgver=4.6.2 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -34,11 +34,16 @@ groups=('kde' 'kdeedu') makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'cfitsio' 'gpsd' 'kdebase-runtime' 'libqalculate' 'gsl' 'boost' 'libindi' 'r' 'libspectre' 'python2' 'docbook-xsl' 'avogadro') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") -sha1sums=('7c94a10f5c17237dcd5c348a8ac129973934cf05') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'gpsd-2.96.patch') +sha1sums=('7c94a10f5c17237dcd5c348a8ac129973934cf05' + 'fd6b6b81945d951bb6ad0bb735df33c11bb2008e') build() { - cd $srcdir + cd ${srcdir}/${pkgbase}-${pkgver} + patch -Np1 -i ${srcdir}/gpsd-2.96.patch + + cd ${srcdir} mkdir build cd build # rpath is needed for cantor to find R diff --git a/extra/kdeedu/gpsd-2.96.patch b/extra/kdeedu/gpsd-2.96.patch new file mode 100644 index 000000000..ec515e99d --- /dev/null +++ b/extra/kdeedu/gpsd-2.96.patch @@ -0,0 +1,43 @@ +Index: kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp +=================================================================== +--- kdeedu-4.5.5.orig/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp ++++ kdeedu-4.5.5/marble/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 ); + } |