[marble/f19] rebase (backport) the geonames-api (kde#331004) patch

[Kevin Kofler]

commit cda4a6a21c14a80709852b61b99f0cb6e6fc7c5f
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Thu Feb 27 02:46:30 2014 +0100

    rebase (backport) the geonames-api (kde#331004) patch

 marble-4.11.5-geonames-api.patch |   52 +++++++++++++++++++++
 marble-4.12.2-geonames-api.patch |   95 --------------------------------------
 marble.spec                      |    2 +-
 3 files changed, 53 insertions(+), 96 deletions(-)
---
diff --git a/marble-4.11.5-geonames-api.patch b/marble-4.11.5-geonames-api.patch
new file mode 100644
index 0000000..e6feb68
--- /dev/null
+++ b/marble-4.11.5-geonames-api.patch
@@ -0,0 +1,52 @@
+diff -ur marble-4.11.5/src/plugins/render/earthquake/EarthquakeModel.cpp marble-4.11.5-geonames-api/src/plugins/render/earthquake/EarthquakeModel.cpp
+--- marble-4.11.5/src/plugins/render/earthquake/EarthquakeModel.cpp	2014-01-02 20:30:33.000000000 +0100
++++ marble-4.11.5-geonames-api/src/plugins/render/earthquake/EarthquakeModel.cpp	2014-02-27 02:41:03.000000000 +0100
+@@ -68,6 +68,7 @@
+     geonamesUrl += "&west="    + QString::number( box.west() * RAD2DEG );
+     geonamesUrl += "&date=" + m_endDate.toString( "yyyy-MM-dd" );
+     geonamesUrl += "&maxRows=" + QString::number( number );
++    geonamesUrl += "&username=marble";
+     geonamesUrl += "&formatted=true";
+     downloadDescriptionFile( QUrl( geonamesUrl ) );
+ }
+diff -ur marble-4.11.5/src/plugins/render/postalcode/PostalCodeModel.cpp marble-4.11.5-geonames-api/src/plugins/render/postalcode/PostalCodeModel.cpp
+--- marble-4.11.5/src/plugins/render/postalcode/PostalCodeModel.cpp	2014-01-02 20:30:33.000000000 +0100
++++ marble-4.11.5-geonames-api/src/plugins/render/postalcode/PostalCodeModel.cpp	2014-02-27 02:42:42.000000000 +0100
+@@ -55,6 +55,7 @@
+     geonamesUrl.addQueryItem( "lng", QString::number( lon ) );
+     geonamesUrl.addQueryItem( "radius", QString::number( radius ) );
+     geonamesUrl.addQueryItem( "maxRows", QString::number( number ) );
++    geonamesUrl.addQueryItem( "username", "marble" );
+ 
+     downloadDescriptionFile( QUrl( geonamesUrl ) );
+ }
+diff -ur marble-4.11.5/src/plugins/render/weather/GeoNamesWeatherService.cpp marble-4.11.5-geonames-api/src/plugins/render/weather/GeoNamesWeatherService.cpp
+--- marble-4.11.5/src/plugins/render/weather/GeoNamesWeatherService.cpp	2014-01-02 20:30:33.000000000 +0100
++++ marble-4.11.5-geonames-api/src/plugins/render/weather/GeoNamesWeatherService.cpp	2014-02-27 02:43:28.000000000 +0100
+@@ -52,6 +52,7 @@
+     geonamesUrl.addQueryItem( "east", QString::number( box.east( GeoDataCoordinates::Degree ) ) );
+     geonamesUrl.addQueryItem( "west", QString::number( box.west( GeoDataCoordinates::Degree ) ) );
+     geonamesUrl.addQueryItem( "maxRows", QString::number( number ) );
++    geonamesUrl.addQueryItem( "username", "marble" );
+ 
+     emit downloadDescriptionFileRequested( geonamesUrl );
+ }
+@@ -65,6 +66,7 @@
+     if ( id.startsWith(QLatin1String("geonames_") ) ) {
+         QUrl geonamesUrl( "http://ws.geonames.org/weatherIcaoJSON" );
+         geonamesUrl.addQueryItem( "ICAO", id.mid( 9 ) );
++        geonamesUrl.addQueryItem( "username", "marble" );
+         emit downloadDescriptionFileRequested( geonamesUrl );
+     }
+ }
+diff -ur marble-4.11.5/src/plugins/render/wikipedia/WikipediaModel.cpp marble-4.11.5-geonames-api/src/plugins/render/wikipedia/WikipediaModel.cpp
+--- marble-4.11.5/src/plugins/render/wikipedia/WikipediaModel.cpp	2014-01-02 20:30:33.000000000 +0100
++++ marble-4.11.5-geonames-api/src/plugins/render/wikipedia/WikipediaModel.cpp	2014-02-27 02:44:17.000000000 +0100
+@@ -68,6 +68,7 @@
+     geonamesUrl.addQueryItem( "west", QString::number( box.west( GeoDataCoordinates::Degree ) ) );
+     geonamesUrl.addQueryItem( "maxRows", QString::number( number ) );
+     geonamesUrl.addQueryItem( "lang", m_languageCode );
++    geonamesUrl.addQueryItem( "username", "marble" );
+     
+     downloadDescriptionFile( geonamesUrl );
+ }
diff --git a/marble.spec b/marble.spec
index f0e409d..96b6a95 100644
--- a/marble.spec
+++ b/marble.spec
@@ -26,7 +26,7 @@ Patch0: marble-4.10.90-qextserialport.patch
 
 ## upstream patches
 # fix some online services failing due to geonames.org API change (kde#331004)
-Patch100: marble-4.12.2-geonames-api.patch
+Patch100: marble-4.11.5-geonames-api.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: kdelibs4-devel >= %{version}