From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1R8uhr-00032i-Ou for garchives@archives.gentoo.org; Wed, 28 Sep 2011 14:01:52 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3DDA21C05C; Wed, 28 Sep 2011 14:01:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 872DD21C05C for ; Wed, 28 Sep 2011 14:01:44 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2F2F1B401C for ; Wed, 28 Sep 2011 14:01:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 3225F80042 for ; Wed, 28 Sep 2011 14:01:43 +0000 (UTC) From: "Marc Schiffbauer" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marc Schiffbauer" Message-ID: <6b623d50516ed0d032b1ef14dc20dd7a17b6d1f7.mschiff@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/marble/, kde-base/marble/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/marble/files/marble-4.5.5-gpsd.patch kde-base/marble/marble-4.7.49.9999.ebuild kde-base/marble/marble-9999.ebuild X-VCS-Directories: kde-base/marble/ kde-base/marble/files/ X-VCS-Committer: mschiff X-VCS-Committer-Name: Marc Schiffbauer X-VCS-Revision: 6b623d50516ed0d032b1ef14dc20dd7a17b6d1f7 Date: Wed, 28 Sep 2011 14:01:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: aed1e9f909a9d9a366face4691768172 commit: 6b623d50516ed0d032b1ef14dc20dd7a17b6d1f7 Author: Marc Schiffbauer gentoo org> AuthorDate: Wed Sep 28 14:01:32 2011 +0000 Commit: Marc Schiffbauer schiffbauer net> CommitDate: Wed Sep 28 14:01:32 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D6b623d50 [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/mar= ble/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/GpsdConnect= ion.cpp -=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ---- kdeedu-4.5.5.orig/marble/src/plugins/positionprovider/gpsd/GpsdConne= ction.cpp -+++ kdeedu-4.5.5/marble/src/plugins/positionprovider/gpsd/GpsdConnection= .cpp -@@ -18,6 +18,9 @@ using namespace Marble; -=20 - GpsdConnection::GpsdConnection( QObject* parent ) - : QObject( parent ), -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >=3D = 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 >=3D = 5 ) -+ gps_data_t* data; -+#else - gps_data_t* data =3D m_gpsd.open(); -+#endif - if ( data ) { - m_status =3D 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 >=3D = 3 ) && defined( PACKET_SET ) -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >=3D = 5 ) -+ if ( m_gpsd.waiting(0) ) { -+#else - if ( m_gpsd.waiting() ) { -+#endif -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >=3D = 5 ) -+ gps_data_t* data =3D m_gpsd.read(); -+#else - gps_data_t* data =3D 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=3D"${DEPEND} =20 PATCHES=3D( "${FILESDIR}/${PN}-4.7-magic-r1.patch" - "${FILESDIR}/${PN}-4.5.5-gpsd.patch" ) =20 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=3D"${DEPEND} =20 PATCHES=3D( "${FILESDIR}/${PN}-4.7-magic-r1.patch" - "${FILESDIR}/${PN}-4.5.5-gpsd.patch" ) =20 pkg_setup() {