[arch-commits] Commit in kdeedu-marble/repos/extra-i686 (5 files)

[Andrea Scarpino]

    Date: Thursday, August 25, 2011 @ 04:58:15
  Author: andrea
Revision: 136262

archrelease: copy trunk to extra-i686

Added:
  kdeedu-marble/repos/extra-i686/PKGBUILD
    (from rev 136261, kdeedu-marble/trunk/PKGBUILD)
  kdeedu-marble/repos/extra-i686/kdeedu-marble.install
    (from rev 136261, kdeedu-marble/trunk/kdeedu-marble.install)
Deleted:
  kdeedu-marble/repos/extra-i686/PKGBUILD
  kdeedu-marble/repos/extra-i686/gpsd-2.96.patch
  kdeedu-marble/repos/extra-i686/kdeedu-marble.install

-----------------------+
 PKGBUILD              |   74 ++++++++++++++++++++++++------------------------
 gpsd-2.96.patch       |   41 --------------------------
 kdeedu-marble.install |   24 +++++++--------
 3 files changed, 49 insertions(+), 90 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-25 08:57:13 UTC (rev 136261)
+++ PKGBUILD	2011-08-25 08:58:15 UTC (rev 136262)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kdeedu-marble
-pkgver=4.7.0
-pkgrel=2
-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"
-        'gpsd-2.96.patch')
-sha1sums=('bbe08a57a33e06fceea3a51aed1406bc71ee02a9'
-          '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
-}

Copied: kdeedu-marble/repos/extra-i686/PKGBUILD (from rev 136261, kdeedu-marble/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2011-08-25 08:58:15 UTC (rev 136262)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at 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
+}

Deleted: gpsd-2.96.patch
===================================================================
--- gpsd-2.96.patch	2011-08-25 08:57:13 UTC (rev 136261)
+++ gpsd-2.96.patch	2011-08-25 08:58:15 UTC (rev 136262)
@@ -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 );
-         }

Deleted: kdeedu-marble.install
===================================================================
--- kdeedu-marble.install	2011-08-25 08:57:13 UTC (rev 136261)
+++ kdeedu-marble.install	2011-08-25 08:58:15 UTC (rev 136262)
@@ -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-i686/kdeedu-marble.install (from rev 136261, kdeedu-marble/trunk/kdeedu-marble.install)
===================================================================
--- kdeedu-marble.install	                        (rev 0)
+++ kdeedu-marble.install	2011-08-25 08:58:15 UTC (rev 136262)
@@ -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
+}