[gentoo-commits] proj/kde:master commit in: kde-base/marble/, kde-base/marble/files/

["Marc Schiffbauer" <marc@schiffbauer.net>]

commit:     6b623d50516ed0d032b1ef14dc20dd7a17b6d1f7
Author:     Marc Schiffbauer <mschiff <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 14:01:32 2011 +0000
Commit:     Marc Schiffbauer <marc <AT> schiffbauer <DOT> net>
CommitDate: Wed Sep 28 14:01:32 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6b623d50

[kde-base/marble] marble-4.5.5-gpsd.patch has been commited upstream

(Portage version: 2.2.0_alpha59/git/Linux x86_64, signed Manifest commit with key 0x35A64134)

---
 kde-base/marble/files/marble-4.5.5-gpsd.patch |   43 -------------------------
 kde-base/marble/marble-4.7.49.9999.ebuild     |    1 -
 kde-base/marble/marble-9999.ebuild            |    1 -
 3 files changed, 0 insertions(+), 45 deletions(-)

diff --git a/kde-base/marble/files/marble-4.5.5-gpsd.patch b/kde-base/marble/files/marble-4.5.5-gpsd.patch
deleted file mode 100644
index ec515e9..0000000
--- a/kde-base/marble/files/marble-4.5.5-gpsd.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-===================================================================
---- kdeedu-4.5.5.orig/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp
-+++ kdeedu-4.5.5/marble/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-base/marble/marble-4.7.49.9999.ebuild b/kde-base/marble/marble-4.7.49.9999.ebuild
index e5d263b..37acfd7 100644
--- a/kde-base/marble/marble-4.7.49.9999.ebuild
+++ b/kde-base/marble/marble-4.7.49.9999.ebuild
@@ -30,7 +30,6 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 			"${FILESDIR}/${PN}-4.7-magic-r1.patch"
-			"${FILESDIR}/${PN}-4.5.5-gpsd.patch"
 )
 
 pkg_setup() {

diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild
index e5d263b..37acfd7 100644
--- a/kde-base/marble/marble-9999.ebuild
+++ b/kde-base/marble/marble-9999.ebuild
@@ -30,7 +30,6 @@ RDEPEND="${DEPEND}
 
 PATCHES=(
 			"${FILESDIR}/${PN}-4.7-magic-r1.patch"
-			"${FILESDIR}/${PN}-4.5.5-gpsd.patch"
 )
 
 pkg_setup() {