[arch-commits] Commit in kdeedu-marble/repos (8 files)
Andrea Scarpino
andrea at archlinux.org
Tue Sep 6 21:30:08 UTC 2011
Date: Tuesday, September 6, 2011 @ 17:30:08
Author: andrea
Revision: 137246
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
kdeedu-marble/repos/staging-i686/
kdeedu-marble/repos/staging-i686/PKGBUILD
(from rev 137245, kdeedu-marble/trunk/PKGBUILD)
kdeedu-marble/repos/staging-i686/gpsd3.patch
(from rev 137245, kdeedu-marble/trunk/gpsd3.patch)
kdeedu-marble/repos/staging-i686/kdeedu-marble.install
(from rev 137245, kdeedu-marble/trunk/kdeedu-marble.install)
kdeedu-marble/repos/staging-x86_64/
kdeedu-marble/repos/staging-x86_64/PKGBUILD
(from rev 137245, kdeedu-marble/trunk/PKGBUILD)
kdeedu-marble/repos/staging-x86_64/gpsd3.patch
(from rev 137245, kdeedu-marble/trunk/gpsd3.patch)
kdeedu-marble/repos/staging-x86_64/kdeedu-marble.install
(from rev 137245, kdeedu-marble/trunk/kdeedu-marble.install)
--------------------------------------+
staging-i686/PKGBUILD | 37 +++++++++++++++++++++++++++++
staging-i686/gpsd3.patch | 42 +++++++++++++++++++++++++++++++++
staging-i686/kdeedu-marble.install | 12 +++++++++
staging-x86_64/PKGBUILD | 37 +++++++++++++++++++++++++++++
staging-x86_64/gpsd3.patch | 42 +++++++++++++++++++++++++++++++++
staging-x86_64/kdeedu-marble.install | 12 +++++++++
6 files changed, 182 insertions(+)
Copied: kdeedu-marble/repos/staging-i686/PKGBUILD (from rev 137245, kdeedu-marble/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2011-09-06 21:30:08 UTC (rev 137246)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kdeedu-marble
+pkgver=4.7.1
+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')
+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')
+
+build() {
+ cd "${srcdir}"/marble-${pkgver}
+ patch -p1 -i "${srcdir}"/gpsd3.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
+}
Copied: kdeedu-marble/repos/staging-i686/gpsd3.patch (from rev 137245, kdeedu-marble/trunk/gpsd3.patch)
===================================================================
--- staging-i686/gpsd3.patch (rev 0)
+++ staging-i686/gpsd3.patch 2011-09-06 21:30:08 UTC (rev 137246)
@@ -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 );
+ }
Copied: kdeedu-marble/repos/staging-i686/kdeedu-marble.install (from rev 137245, kdeedu-marble/trunk/kdeedu-marble.install)
===================================================================
--- staging-i686/kdeedu-marble.install (rev 0)
+++ staging-i686/kdeedu-marble.install 2011-09-06 21:30:08 UTC (rev 137246)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kdeedu-marble/repos/staging-x86_64/PKGBUILD (from rev 137245, kdeedu-marble/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2011-09-06 21:30:08 UTC (rev 137246)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kdeedu-marble
+pkgver=4.7.1
+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')
+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')
+
+build() {
+ cd "${srcdir}"/marble-${pkgver}
+ patch -p1 -i "${srcdir}"/gpsd3.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
+}
Copied: kdeedu-marble/repos/staging-x86_64/gpsd3.patch (from rev 137245, kdeedu-marble/trunk/gpsd3.patch)
===================================================================
--- staging-x86_64/gpsd3.patch (rev 0)
+++ staging-x86_64/gpsd3.patch 2011-09-06 21:30:08 UTC (rev 137246)
@@ -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 );
+ }
Copied: kdeedu-marble/repos/staging-x86_64/kdeedu-marble.install (from rev 137245, kdeedu-marble/trunk/kdeedu-marble.install)
===================================================================
--- staging-x86_64/kdeedu-marble.install (rev 0)
+++ staging-x86_64/kdeedu-marble.install 2011-09-06 21:30:08 UTC (rev 137246)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list