[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)

4 files changed, 6 insertions, 62 deletions

diff --git a/kde-base/marble/Manifest b/kde-base/marble/Manifest
index 17255ba0c48..9579659ef41 100644
--- a/kde-base/marble/Manifest
+++ b/kde-base/marble/Manifest
@@ -1,27 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-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-r1.patch 1801 RMD160 27e157f23903d7ce070682abffd534159eb8e3f1 SHA1 04264060be347156ed0d1d4555de84612b54f702 SHA256 9d5a32d90f0a00492ef53ff523abfb25729f1d23d0ce213be6e6fa96edb31cbe
 AUX marble-4.7-magic.patch 997 RMD160 7b8229a0d6496c9452fce4185dde4050734c1152 SHA1 03fba22202648b73a013226eff70de5a158303eb SHA256 6e9b37be7cf5088eb812617f239e0948f0472a3d5bc47ddac7cc93a2f2ef6047
-EBUILD marble-4.7.49.9999.ebuild 1780 RMD160 70d9a4787e62913b785538f846a98d1c79fb7b99 SHA1 17723b7409a152692d79b0253926113c06d54f7a SHA256 fabcbef0300c75b898f057d9dcaea0e697373200b13c0de62e36bfeb3952cba4
-EBUILD marble-9999.ebuild 1780 RMD160 70d9a4787e62913b785538f846a98d1c79fb7b99 SHA1 17723b7409a152692d79b0253926113c06d54f7a SHA256 fabcbef0300c75b898f057d9dcaea0e697373200b13c0de62e36bfeb3952cba4
+EBUILD marble-4.7.49.9999.ebuild 1740 RMD160 950be5e28822bad9a63245c53bd9a66b4a62dd03 SHA1 b9789d419be626dfeb6fd76425b44c8e20dc3d15 SHA256 e9ca9ed0a288b6e3cca0606e7b96cbf18f7e8e8ca6feb40f4e62485d017f1a07
+EBUILD marble-9999.ebuild 1740 RMD160 950be5e28822bad9a63245c53bd9a66b4a62dd03 SHA1 b9789d419be626dfeb6fd76425b44c8e20dc3d15 SHA256 e9ca9ed0a288b6e3cca0606e7b96cbf18f7e8e8ca6feb40f4e62485d017f1a07
 MISC metadata.xml 229 RMD160 89a06578feff3283191d983da046834d4b369ebf SHA1 c143ab8509226dd499dd5991087c7eb48df72229 SHA256 f684e92296ad3ee40649c640c678f420d7b56b9ae3a27eff5c35ea1115657fb2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOZ+OJAAoJEOf+E+/4L5LmzmEP/jKYfIDax5MJYTX3Puq0tJTL
-r1g4QZdyg5m8yTLVHDxfd6DMB1neVreiU5Y0duiVGSUFjBptoDVRVzYua2cEeMAQ
-qCfOZO13nrGaG6Zqllu4hokesVGD62E4rOQlUSXbHkoOhGmQNhIDWrb18+kr0JEF
-0TdcC8/pOnH8T69kr6p3FxGW/tIAnCAdl4I82tYOBXhNIa0QTezF2GrjqAsenCF1
-/Omjs30I+UsQtJ+LeuWL3YdtVTOa+cpQiloX+w0rhRlGUa3mbF3OCYHHG1Id29Vv
-UPP+wCrMLgMv2Lx6SaCYzAEQt3Ew4xL45BDaifowyN1OrVMnicsE8+yk7fdk2kmA
-ucIdcMtjo5mY9aP1x9sFF6QEL0bKh0MV1Tbu1rXOuUUrQzDhNy6gILozGpqS+asQ
-lg0njyprUxWEVJkeunpiRm53q3lQM/GE9I41KMjg0nFQRV8ILvBnipwrMsGimlTs
-J2JTJxb+wTAj7hPdsMisGaWBwegIrfia7yVQJVy78zPn7IGZHm1qP6GykbKYoekv
-H5q3RnXoFaGYaj77HOYu7tn37ZNZgnPeP04ifBKqCEqQNzFRlTaTillAMkssjd45
-eWqqAAaAdarr/xKpXmuPkIBsGxekmjcRob2zmUq7i38xnMekZsdmmr+K8wdKgcTj
-ueKuHawCweTK/DvpCbET
-=/brx
+iD8DBQFOgyi8KWxsyjWmQTQRAnWYAJ0QpF9ed1UiXlMjwyKiUWA+Eu41tgCgvE+g
+ZG9jZxIej3R7t64gIGzvIqg=
+=HXQS
 -----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
deleted file mode 100644
index ec515e99d88..00000000000
--- 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 e5d263b1841..37acfd76071 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 e5d263b1841..37acfd76071 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() {