Date: Tuesday, October 4, 2011 @ 13:49:56 Author: andrea Revision: 139688
KDE 4.7.2 Modified: kdeedu-marble/trunk/PKGBUILD Deleted: kdeedu-marble/trunk/gpsd3.patch -------------+ PKGBUILD | 11 +++-------- gpsd3.patch | 42 ------------------------------------------ 2 files changed, 3 insertions(+), 50 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-10-04 17:49:53 UTC (rev 139687) +++ PKGBUILD 2011-10-04 17:49:56 UTC (rev 139688) @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <and...@archlinux.org> pkgname=kdeedu-marble -pkgver=4.7.1 +pkgver=4.7.2 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -13,15 +13,10 @@ makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2" - 'gpsd3.patch') -sha1sums=('71c9ccd884495b34c8af4f7c432ca8942dfaa9dd' - '3916dd6307109d70d0dd538de913c91eede81d78') +source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2") +sha1sums=('2b6353ff589d66dcf95a3eb79059275f620e03b2') build() { - cd "${srcdir}"/marble-${pkgver} - patch -p1 -i "${srcdir}"/gpsd3.patch - cd "${srcdir}" mkdir build cd build Deleted: gpsd3.patch =================================================================== --- gpsd3.patch 2011-10-04 17:49:53 UTC (rev 139687) +++ gpsd3.patch 2011-10-04 17:49:56 UTC (rev 139688) @@ -1,42 +0,0 @@ -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 ); - }