| 1 |
commit: 6b623d50516ed0d032b1ef14dc20dd7a17b6d1f7 |
| 2 |
Author: Marc Schiffbauer <mschiff <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 28 14:01:32 2011 +0000 |
| 4 |
Commit: Marc Schiffbauer <marc <AT> schiffbauer <DOT> net> |
| 5 |
CommitDate: Wed Sep 28 14:01:32 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=6b623d50 |
| 7 |
|
| 8 |
[kde-base/marble] marble-4.5.5-gpsd.patch has been commited upstream |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha59/git/Linux x86_64, signed Manifest commit with key 0x35A64134) |
| 11 |
|
| 12 |
--- |
| 13 |
kde-base/marble/files/marble-4.5.5-gpsd.patch | 43 ------------------------- |
| 14 |
kde-base/marble/marble-4.7.49.9999.ebuild | 1 - |
| 15 |
kde-base/marble/marble-9999.ebuild | 1 - |
| 16 |
3 files changed, 0 insertions(+), 45 deletions(-) |
| 17 |
|
| 18 |
diff --git a/kde-base/marble/files/marble-4.5.5-gpsd.patch b/kde-base/marble/files/marble-4.5.5-gpsd.patch |
| 19 |
deleted file mode 100644 |
| 20 |
index ec515e9..0000000 |
| 21 |
--- a/kde-base/marble/files/marble-4.5.5-gpsd.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,43 +0,0 @@ |
| 24 |
-Index: kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp |
| 25 |
-=================================================================== |
| 26 |
---- kdeedu-4.5.5.orig/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp |
| 27 |
-+++ kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection.cpp |
| 28 |
-@@ -18,6 +18,9 @@ using namespace Marble; |
| 29 |
- |
| 30 |
- GpsdConnection::GpsdConnection( QObject* parent ) |
| 31 |
- : QObject( parent ), |
| 32 |
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) |
| 33 |
-+ m_gpsd("localhost", DEFAULT_GPSD_PORT), |
| 34 |
-+#endif |
| 35 |
- m_timer( 0 ) |
| 36 |
- { |
| 37 |
- connect( &m_timer, SIGNAL( timeout() ), this, SLOT( update() ) ); |
| 38 |
-@@ -26,7 +29,11 @@ GpsdConnection::GpsdConnection( QObject* |
| 39 |
- void GpsdConnection::initialize() |
| 40 |
- { |
| 41 |
- m_timer.stop(); |
| 42 |
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) |
| 43 |
-+ gps_data_t* data; |
| 44 |
-+#else |
| 45 |
- gps_data_t* data = m_gpsd.open(); |
| 46 |
-+#endif |
| 47 |
- if ( data ) { |
| 48 |
- m_status = PositionProviderStatusAcquiring; |
| 49 |
- emit statusChanged( m_status ); |
| 50 |
-@@ -73,8 +80,16 @@ void GpsdConnection::initialize() |
| 51 |
- void GpsdConnection::update() |
| 52 |
- { |
| 53 |
- #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET ) |
| 54 |
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) |
| 55 |
-+ if ( m_gpsd.waiting(0) ) { |
| 56 |
-+#else |
| 57 |
- if ( m_gpsd.waiting() ) { |
| 58 |
-+#endif |
| 59 |
-+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) |
| 60 |
-+ gps_data_t* data = m_gpsd.read(); |
| 61 |
-+#else |
| 62 |
- gps_data_t* data = m_gpsd.poll(); |
| 63 |
-+#endif |
| 64 |
- if ( data && data->set & PACKET_SET ) { |
| 65 |
- emit gpsdInfo( *data ); |
| 66 |
- } |
| 67 |
|
| 68 |
diff --git a/kde-base/marble/marble-4.7.49.9999.ebuild b/kde-base/marble/marble-4.7.49.9999.ebuild |
| 69 |
index e5d263b..37acfd7 100644 |
| 70 |
--- a/kde-base/marble/marble-4.7.49.9999.ebuild |
| 71 |
+++ b/kde-base/marble/marble-4.7.49.9999.ebuild |
| 72 |
@@ -30,7 +30,6 @@ RDEPEND="${DEPEND} |
| 73 |
|
| 74 |
PATCHES=( |
| 75 |
"${FILESDIR}/${PN}-4.7-magic-r1.patch" |
| 76 |
- "${FILESDIR}/${PN}-4.5.5-gpsd.patch" |
| 77 |
) |
| 78 |
|
| 79 |
pkg_setup() { |
| 80 |
|
| 81 |
diff --git a/kde-base/marble/marble-9999.ebuild b/kde-base/marble/marble-9999.ebuild |
| 82 |
index e5d263b..37acfd7 100644 |
| 83 |
--- a/kde-base/marble/marble-9999.ebuild |
| 84 |
+++ b/kde-base/marble/marble-9999.ebuild |
| 85 |
@@ -30,7 +30,6 @@ RDEPEND="${DEPEND} |
| 86 |
|
| 87 |
PATCHES=( |
| 88 |
"${FILESDIR}/${PN}-4.7-magic-r1.patch" |
| 89 |
- "${FILESDIR}/${PN}-4.5.5-gpsd.patch" |
| 90 |
) |
| 91 |
|
| 92 |
pkg_setup() { |
Archives