[kde-base/marble] Fix bug #367571

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

diff --git a/kde-base/marble/ChangeLog b/kde-base/marble/ChangeLog
index 33b7c8d80127e73f9dbc8d76b82d609370246eed..b9a3e7d2840bff5dbce7a622375de1dc7e96bd0b 100644 (file)
--- a/kde-base/marble/ChangeLog
+++ b/kde-base/marble/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/marble
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.101 2011/07/27 14:04:48 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.102 2011/07/28 20:02:13 alexxy Exp $
+
+  28 Jul 2011; Alexey Shvetsov <alexxy@gentoo.org>
+  +files/marble-4.5.5-gpsd.patch, marble-4.7.0.ebuild:
+  Fix bug #367571
 
 *marble-4.7.0 (27 Jul 2011)
 

diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest
index bf9581c53cf0427600607abe72c7633977ee7968..7b13b82487ed8a4f27cd8a298f4a6c064f0e5f29 100644 (file)
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX marble-4.5.5-gpsd.patch 1644 RMD160 34379056c5c59ddc50d249bbfd7ef971343e744d SHA1 fd6b6b81945d951bb6ad0bb735df33c11bb2008e SHA256 d0361623c91e511d016c65ad21caa3402b38571372b1ba7463e37cc86da0f50b
 AUX marble-4.6.2-magic.patch 828 RMD160 1522e8dbeda1a17d19e7e78b8093424b93ee7b0c SHA1 f0c8bcc01a3381e99191d958b728e660b63caf9d SHA256 25d4c077da9218ca6f8400a803553203df596cdace0eee1eaf5ec56e6604e174
 AUX marble-4.7-magic.patch 997 RMD160 7b8229a0d6496c9452fce4185dde4050734c1152 SHA1 03fba22202648b73a013226eff70de5a158303eb SHA256 6e9b37be7cf5088eb812617f239e0948f0472a3d5bc47ddac7cc93a2f2ef6047
 DIST kdeedu-4.6.3.tar.bz2 71499808 RMD160 3c417bf3abe85d33bb4d239432b98ddae3aec2aa SHA1 4b27e6e1670760982dae13dc8c51c814c6853396 SHA256 fcbb21f7e8846796349bfdd3a942997ab0c3161879bcdcc3fa18b396d71f6be0
@@ -10,23 +11,23 @@ DIST marble-4.7.0.tar.bz2 21019383 RMD160 41628a5a1628c31da16a69474d55975c0da615
 EBUILD marble-4.6.3.ebuild 1848 RMD160 2f3aecd8ac4773f3627aa672f620e0bb6e23714c SHA1 33931df08ad78892ea81c6d67752c8293e45b407 SHA256 39417a0f53dd2b17d2dd11a219a6f90fd86d64bc4ef6314e741f5c1abfede32e
 EBUILD marble-4.6.4.ebuild 1847 RMD160 4176372d850ba9faa21cb8d8f5f2f8139522e89a SHA1 6905a91d2094cb45d691ca7e5bfe42601e125761 SHA256 e33b977bee95bff61d446e52db55248b5c9cf13e6d6e0c3abf1fc407463ff04d
 EBUILD marble-4.6.5.ebuild 1844 RMD160 30aa6ebba01ab979cb71053867d8f36b53d621f5 SHA1 ab42e1ce8ccfd3e6e4d417578ded64fca3861003 SHA256 e4186a3cd067ae283fbd022d3cb5d11723925a15c35dc167fa55c2190b0e113c
-EBUILD marble-4.7.0.ebuild 1719 RMD160 137ecb091aa97310fd26ddd84f975c3eddb3e167 SHA1 d2c0bc0285869b66203781cd4bbd08fd1298a99a SHA256 9b79b6b7e610609bd4b58e04240e80bcb3b7db66dbdbb518c79a3c891576011c
-MISC ChangeLog 12865 RMD160 6be42bec4f4f869caa72168c5f56fb6b148990db SHA1 47a562db74ce73e25228dbd6b40779ba1ae7480c SHA256 982852dd8be10d38542b8992819061b5f79f88ba5e4ced63f1804c7dc4a4a849
+EBUILD marble-4.7.0.ebuild 1765 RMD160 6b8a653dc54468a06421e0a47400f9261528d49b SHA1 ca48fd7960405e4f25399dd6c017edac9c032232 SHA256 ab267a274708988cf2a8d0ec72c29aef208a5df56f4d217438f2299f2665ef11
+MISC ChangeLog 12990 RMD160 7461023c81228afdf3ecb0d3094d08ca49fbe81e SHA1 9e8aae67dbfbdc1f7b561777f12a5cc3cc0ba8a4 SHA256 9455b83308ae3775319e220ebd8185e7f3d9c3f85e6613115ad68c45a572cb05
 MISC metadata.xml 229 RMD160 89a06578feff3283191d983da046834d4b369ebf SHA1 c143ab8509226dd499dd5991087c7eb48df72229 SHA256 f684e92296ad3ee40649c640c678f420d7b56b9ae3a27eff5c35ea1115657fb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOMBvFAAoJEOf+E+/4L5Lmq4IP/191Z6brj/m/xaBZrOZiquxU
-+78wGzWh+a5SG/XxcWrv1x+Luv0S4VBZzb1+oDXRWFWCkU67NpWZ3TO3tqUqhQQO
-ATe6eanoFxicvclcHfxUjfDhCOfPS2KO+Nhlp1Vj7G9X7kf7NQ2NcZ0x2aDTPgHo
-lrIU4ZY/I6/gE8Ydcy7kc4Mnf8gZy+N26F5D2PYB2CmCQR0abNaqWw3gW48Jsruw
-SPCpUOMyl8IkHqt8t9b8lZbWjcUvQEpxwA8cd3pOQWmGpnccSXhYyEM975/WtW8g
-LFfwdvWnOIOvyDvCzMOpC+Z9amNVZzIavAllaR2cb0M3AUAZVFPiU1X2XvQORvkD
-DvwBJubizQlEHPu3Hnkv3L5SFPvxmRaUwlkyVcX+RA/ONXcKM+oAYb2NcsWiF/kX
-5LP6Nv2tYsTK2vzxXLKBEipKw4md6sQKfTxU4oYfzxWg3KiEH7Rha9kN2+odoNBO
-8zvqYYkT4J5GZTCJWIQ8jgF6FroF2vvR7Z9fuOJHe72Yvr3VCy6CHBKwVSr2gZlT
-iNY1HrraKM+QfGzcmWbJPmPTMuOXXuZfL0tMhqBx7kneYMzYTcJUc0sr07ZnJpRB
-u2RQFfoGSkGYGvvrUh+K1uHt12i02HRsbq0Fer6g0Repe7IKcv9RLRmk1/E2Qq67
-DG1LpVr9jh4txAvCNIWS
-=Ghzz
+iQIcBAEBCAAGBQJOMcBLAAoJEOf+E+/4L5LmVpUP/3rsVqvEZ7R2SPfsYwm6LkfF
+Y/VchS0VHcY8rONxszh3uDZqWAQ1si8bDdNJozub/Dg1PDb2KpcLMOJYISTDf7cC
+9RvwEghkvjRP2wu1ZOwpwpw/soWiH1QH0RerG9E6xmERxmNEzO7F6a0TO9PY/VDm
+uY6NnLjdgVHFRt/v6FtjbPnH7rBf5SCNWE+om3nah6Sfc08F2s2rkEn23Xx85E8h
+KDsPnenGeMIFNoT9FiGSUIZDSm5/grP/YK6RzYxCJvENEsYBTDCrjtCkWmVODQ0m
+eq/Uq/+dD0rAr+sesNb+sB+prPDb/uPLzfaeKpOZJp7WNpZSFLsfQbdKBE67US5T
+H3ipSkOMc6bt/ADr+Od7JXkkAWLuwwUrjRIkhfx1HYcMDo0BC//BnWzxL5ubXMYR
+LP9ik1HPc3Ns+d4lZ0FCdRhHAWO+q7vZdLhx0TKOb+FqhAdLzjeeRqhe1EnYl9Pu
+hCJbncCaVC/N96lmSTYZZMuac7FBetj28AsBlcHoHj9wAXHphY+7ofOaixQe1bz5
+NRADp9IP/4sOz6fpbwl4VxOuxUKeXr1saLeEu3pJ94rOE2WYdjEoeTMkylw+rjis
+D9AWl57K7Jhi0jwBPw0nC+Ywi1ic6ABk/HedI90/5GA+mp36xsIDeC9A4OC2igsl
+WezscumC0jLtlzjnJB2P
+=NbQ5
 -----END PGP SIGNATURE-----

diff --git a/kde-base/marble/files/marble-4.5.5-gpsd.patch b/kde-base/marble/files/marble-4.5.5-gpsd.patch
new file mode 100644 (file)
index 0000000..ec515e9
--- /dev/null
+++ b/kde-base/marble/files/marble-4.5.5-gpsd.patch
@@ -0,0 +1,43 @@
+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.0.ebuild b/kde-base/marble/marble-4.7.0.ebuild
index fd43545e6a111f85edc6fd9f5024637b8d777c01..ed27093c08d81e7f3d0c278f7ecc6434e3cf549e 100644 (file)
--- a/kde-base/marble/marble-4.7.0.ebuild
+++ b/kde-base/marble/marble-4.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.0.ebuild,v 1.1 2011/07/27 14:04:48 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.7.0.ebuild,v 1.2 2011/07/28 20:02:13 alexxy Exp $
 
 EAPI=3
 
@@ -28,7 +28,10 @@ RDEPEND="${DEPEND}
        !sci-geosciences/marble
 "
 
-PATCHES=( "${FILESDIR}/${PN}-4.7-magic.patch" )
+PATCHES=( 
+                       "${FILESDIR}/${PN}-4.7-magic.patch"
+                       "${FILESDIR}/${PN}-4.5.5-gpsd.patch"
+               )
 # note that this patch will not work if we ever make a qt-only build
 
 pkg_setup() {