summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2012-02-21 15:39:24 +0000
committerJohannes Huber <johu@gentoo.org>2012-02-21 15:39:24 +0000
commitc5e57d9940e0a75087968ddda65838dca1cf9e2e (patch)
treec734f7f1c906e430fc9c34e62d6327603f8f1324 /kde-base
parentRemove old. (diff)
downloadgentoo-2-c5e57d9940e0a75087968ddda65838dca1cf9e2e.tar.gz
gentoo-2-c5e57d9940e0a75087968ddda65838dca1cf9e2e.tar.bz2
gentoo-2-c5e57d9940e0a75087968ddda65838dca1cf9e2e.zip
Remove old.
(Portage version: 2.2.0_alpha86/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/marble/ChangeLog6
-rw-r--r--kde-base/marble/files/marble-4.5.5-gpsd.patch43
-rw-r--r--kde-base/marble/files/marble-4.6.2-magic.patch18
3 files changed, 5 insertions, 62 deletions
diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index d3c5a127fa8a..bfa1b04a7104 100644
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/marble
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.127 2012/02/21 12:52:25 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.128 2012/02/21 15:39:24 johu Exp $
+
+ 21 Feb 2012; Johannes Huber <johu@gentoo.org> -files/marble-4.5.5-gpsd.patch,
+ -files/marble-4.6.2-magic.patch:
+ Remove old.
20 Feb 2012; Johannes Huber <johu@gentoo.org> -marble-4.6.3.ebuild:
Remove KDE SC 4.6.3
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 ec515e99d88e..000000000000
--- 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/files/marble-4.6.2-magic.patch b/kde-base/marble/files/marble-4.6.2-magic.patch
deleted file mode 100644
index dc907958edb6..000000000000
--- a/kde-base/marble/files/marble-4.6.2-magic.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ruN marble-4.6.2.orig/marble/src/plugins/positionprovider/CMakeLists.txt marble-4.6.2/marble/src/plugins/positionprovider/CMakeLists.txt
---- marble-4.6.2.orig/marble/src/plugins/positionprovider/CMakeLists.txt 2011-01-19 23:06:11.000000000 +0100
-+++ marble-4.6.2/marble/src/plugins/positionprovider/CMakeLists.txt 2011-04-11 03:56:00.449066967 +0200
-@@ -1,4 +1,4 @@
--find_package(libgps)
-+macro_optional_find_package(libgps)
- if(LIBGPS_FOUND)
- message( STATUS "Building with gpsd position provider")
- add_subdirectory( gpsd )
-@@ -6,7 +6,7 @@
- message( STATUS "Not building with gpsd position provider")
- endif(LIBGPS_FOUND)
-
--find_package(liblocation)
-+macro_optional_find_package(liblocation)
- if(liblocation_FOUND)
- message( STATUS "Building with Maemo GPS support")
- add_subdirectory( maemo )