diff options
| author | Parabola <dev@list.parabolagnulinux.org> | 2011-08-03 04:50:40 +0000 |
|---|---|---|
| committer | Parabola <dev@list.parabolagnulinux.org> | 2011-08-03 04:50:40 +0000 |
| commit | 991d38faccf4e1fb27f31f236ad58ee840103734 (patch) | |
| tree | 38dd960b48df86472b58d3904caa122aaf06da41 /kde-unstable/kdeedu-marble | |
| parent | bf35116f9d203dcafce808a6c7b3dd5a0db8afbc (diff) | |
Wed Aug 3 04:50:40 UTC 2011
Diffstat (limited to 'kde-unstable/kdeedu-marble')
| -rw-r--r-- | kde-unstable/kdeedu-marble/PKGBUILD | 36 | ||||
| -rw-r--r-- | kde-unstable/kdeedu-marble/gpsd-2.96.patch | 41 | ||||
| -rw-r--r-- | kde-unstable/kdeedu-marble/kdeedu-marble.install | 12 |
3 files changed, 0 insertions, 89 deletions
diff --git a/kde-unstable/kdeedu-marble/PKGBUILD b/kde-unstable/kdeedu-marble/PKGBUILD deleted file mode 100644 index 85aa4c346..000000000 --- a/kde-unstable/kdeedu-marble/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 131293 2011-07-12 17:46:45Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> - -pkgname=kdeedu-marble -pkgver=4.6.95 -pkgrel=1 -pkgdesc="Desktop Globe" -url="http://kde.org/applications/education/marble/" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'FDL') -groups=('kde' 'kdeedu') -depends=('kdebase-runtime' 'gpsd') -makedepends=('cmake' 'automoc4') -install=${pkgname}.install -source=("http://download.kde.org/unstable/${pkgver}/src/marble-${pkgver}.tar.bz2" - 'gpsd-2.96.patch') -sha1sums=('f70645d42f246e38e912d84d4009ec0795be4c31' - 'f44dfd3bb384e631d59b93d7dda3413795da8183') - -build() { - cd "${srcdir}"/marble-${pkgver} - patch -p1 -i "${srcdir}"/gpsd-2.96.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../marble-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/kde-unstable/kdeedu-marble/gpsd-2.96.patch b/kde-unstable/kdeedu-marble/gpsd-2.96.patch deleted file mode 100644 index e27702181..000000000 --- a/kde-unstable/kdeedu-marble/gpsd-2.96.patch +++ /dev/null @@ -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 ); - } diff --git a/kde-unstable/kdeedu-marble/kdeedu-marble.install b/kde-unstable/kdeedu-marble/kdeedu-marble.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/kde-unstable/kdeedu-marble/kdeedu-marble.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} |