Date: Wednesday, September 7, 2011 @ 13:20:56
Author: andrea
Revision: 137387
db-move: moved kdeedu-marble from [staging] to [extra] (x86_64)
Added:
kdeedu-marble/repos/extra-x86_64/PKGBUILD
(from rev 137385, kdeedu-marble/repos/staging-x86_64/PKGBUILD)
kdeedu-marble/repos/extra-x86_64/gpsd3.patch
(from rev 137385, kdeedu-marble/repos/staging-x86_64/gpsd3.patch)
kdeedu-marble/repos/extra-x86_64/kdeedu-marble.install
(from rev 137385, kdeedu-marble/repos/staging-x86_64/kdeedu-marble.install)
Deleted:
kdeedu-marble/repos/extra-x86_64/PKGBUILD
kdeedu-marble/repos/extra-x86_64/gpsd3.patch
kdeedu-marble/repos/extra-x86_64/kdeedu-marble.install
kdeedu-marble/repos/staging-x86_64/
-----------------------+
PKGBUILD | 74 +++++++++++++++++++++---------------------
gpsd3.patch | 84 ++++++++++++++++++++++++------------------------
kdeedu-marble.install | 24 ++++++-------
3 files changed, 91 insertions(+), 91 deletions(-)
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-09-07 17:20:55 UTC (rev 137386)
+++ extra-x86_64/PKGBUILD 2011-09-07 17:20:56 UTC (rev 137387)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <and...@archlinux.org>
-
-pkgname=kdeedu-marble
-pkgver=4.7.0
-pkgrel=3
-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=('bbe08a57a33e06fceea3a51aed1406bc71ee02a9'
- '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/extra-x86_64/PKGBUILD (from rev 137385,
kdeedu-marble/repos/staging-x86_64/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-09-07 17:20:56 UTC (rev 137387)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Andrea Scarpino <and...@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
+}
Deleted: extra-x86_64/gpsd3.patch
===================================================================
--- extra-x86_64/gpsd3.patch 2011-09-07 17:20:55 UTC (rev 137386)
+++ extra-x86_64/gpsd3.patch 2011-09-07 17:20:56 UTC (rev 137387)
@@ -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 );
- }
Copied: kdeedu-marble/repos/extra-x86_64/gpsd3.patch (from rev 137385,
kdeedu-marble/repos/staging-x86_64/gpsd3.patch)
===================================================================
--- extra-x86_64/gpsd3.patch (rev 0)
+++ extra-x86_64/gpsd3.patch 2011-09-07 17:20:56 UTC (rev 137387)
@@ -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 );
+ }
Deleted: extra-x86_64/kdeedu-marble.install
===================================================================
--- extra-x86_64/kdeedu-marble.install 2011-09-07 17:20:55 UTC (rev 137386)
+++ extra-x86_64/kdeedu-marble.install 2011-09-07 17:20:56 UTC (rev 137387)
@@ -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
-}
Copied: kdeedu-marble/repos/extra-x86_64/kdeedu-marble.install (from rev
137385, kdeedu-marble/repos/staging-x86_64/kdeedu-marble.install)
===================================================================
--- extra-x86_64/kdeedu-marble.install (rev 0)
+++ extra-x86_64/kdeedu-marble.install 2011-09-07 17:20:56 UTC (rev 137387)
@@ -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
+}
