[marble] apply upstream fix for geonames.org API change (kde#331004)

[Kevin Kofler]

commit 532cd782d936f961c819442516fa84d5fc853c73
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Thu Feb 27 01:43:59 2014 +0100

    apply upstream fix for geonames.org API change (kde#331004)
    
    * Thu Feb 27 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:4.12.2-3
    - apply upstream fix for geonames.org API change (kde#331004)

 marble-4.12.2-geonames-api.patch |   95 ++++++++++++++++++++++++++++++++++++++
 marble.spec                      |    8 +++-
 2 files changed, 102 insertions(+), 1 deletions(-)
---
diff --git a/marble-4.12.2-geonames-api.patch b/marble-4.12.2-geonames-api.patch
new file mode 100644
index 0000000..5575dd1
--- /dev/null
+++ b/marble-4.12.2-geonames-api.patch
@@ -0,0 +1,95 @@
+commit f23aaea5812dbdfce26d3134a56d2dabc8967fd6
+Author: Dennis Nienhüser <earthwings at gentoo.org>
+Date:   Wed Feb 26 22:03:27 2014 +0100
+
+    Fix geonames based online services after API change
+    
+    Affects Wikipedia, weather, postal codes and earthquakes services.
+    
+    BUG: 331004
+    FIXED-IN: 4.12.2
+    (cherry picked from commit 12a1f748dedb75b20ae9e1b1bb6020be0a4f3a2f)
+
+diff --git a/src/plugins/render/earthquake/EarthquakeModel.cpp b/src/plugins/render/earthquake/EarthquakeModel.cpp
+index ea69955..6574a5f 100644
+--- a/src/plugins/render/earthquake/EarthquakeModel.cpp
++++ b/src/plugins/render/earthquake/EarthquakeModel.cpp
+@@ -68,6 +68,7 @@ void EarthquakeModel::getAdditionalItems( const GeoDataLatLonAltBox& box, qint32
+     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 --git a/src/plugins/render/postalcode/PostalCodeModel.cpp b/src/plugins/render/postalcode/PostalCodeModel.cpp
+index a035f9a..329e42b 100644
+--- a/src/plugins/render/postalcode/PostalCodeModel.cpp
++++ b/src/plugins/render/postalcode/PostalCodeModel.cpp
+@@ -60,12 +60,14 @@ void PostalCodeModel::getAdditionalItems( const GeoDataLatLonAltBox& box,
+     geonamesUrl.addQueryItem( "lng", QString::number( lon ) );
+     geonamesUrl.addQueryItem( "radius", QString::number( radius ) );
+     geonamesUrl.addQueryItem( "maxRows", QString::number( number ) );
++    geonamesUrl.addQueryItem( "username", "marble" );
+ #else
+     QUrlQuery urlQuery;
+     urlQuery.addQueryItem( "lat", QString::number( lat ) );
+     urlQuery.addQueryItem( "lng", QString::number( lon ) );
+     urlQuery.addQueryItem( "radius", QString::number( radius ) );
+     urlQuery.addQueryItem( "maxRows", QString::number( number ) );
++    urlQuery.addQueryItem( "username", "marble" );
+     geonamesUrl.setQuery( urlQuery );
+ #endif
+ 
+diff --git a/src/plugins/render/weather/GeoNamesWeatherService.cpp b/src/plugins/render/weather/GeoNamesWeatherService.cpp
+index cf5cc0b..036f6ee 100644
+--- a/src/plugins/render/weather/GeoNamesWeatherService.cpp
++++ b/src/plugins/render/weather/GeoNamesWeatherService.cpp
+@@ -57,6 +57,7 @@ void GeoNamesWeatherService::getAdditionalItems( const GeoDataLatLonAltBox& box,
+     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" );
+ #else
+     QUrlQuery urlQuery;
+     urlQuery.addQueryItem( "north", QString::number( box.north( GeoDataCoordinates::Degree ) ) );
+@@ -64,6 +65,7 @@ void GeoNamesWeatherService::getAdditionalItems( const GeoDataLatLonAltBox& box,
+     urlQuery.addQueryItem( "east", QString::number( box.east( GeoDataCoordinates::Degree ) ) );
+     urlQuery.addQueryItem( "west", QString::number( box.west( GeoDataCoordinates::Degree ) ) );
+     urlQuery.addQueryItem( "maxRows", QString::number( number ) );
++    urlQuery.addQueryItem( "username", "marble" );
+     geonamesUrl.setQuery( urlQuery );
+ #endif
+ 
+@@ -80,9 +82,11 @@ void GeoNamesWeatherService::getItem( const QString &id )
+         QUrl geonamesUrl( "http://ws.geonames.org/weatherIcaoJSON" );
+ #if QT_VERSION < 0x050000
+         geonamesUrl.addQueryItem( "ICAO", id.mid( 9 ) );
++        geonamesUrl.addQueryItem( "username", "marble" );
+ #else
+         QUrlQuery urlQuery;
+         urlQuery.addQueryItem( "ICAO", id.mid( 9 ) );
++        urlQuery.addQueryItem( "username", "marble" );
+         geonamesUrl.setQuery( urlQuery );
+ #endif
+         emit downloadDescriptionFileRequested( geonamesUrl );
+diff --git a/src/plugins/render/wikipedia/WikipediaModel.cpp b/src/plugins/render/wikipedia/WikipediaModel.cpp
+index 2a84e45..e92f1dc 100644
+--- a/src/plugins/render/wikipedia/WikipediaModel.cpp
++++ b/src/plugins/render/wikipedia/WikipediaModel.cpp
+@@ -73,6 +73,7 @@ void WikipediaModel::getAdditionalItems( const GeoDataLatLonAltBox& box,
+     geonamesUrl.addQueryItem( "west", QString::number( box.west( GeoDataCoordinates::Degree ) ) );
+     geonamesUrl.addQueryItem( "maxRows", QString::number( number ) );
+     geonamesUrl.addQueryItem( "lang", m_languageCode );
++    geonamesUrl.addQueryItem( "username", "marble" );
+ #else
+     QUrlQuery urlQuery;
+     urlQuery.addQueryItem( "north", QString::number( box.north( GeoDataCoordinates::Degree ) ) );
+@@ -81,6 +82,7 @@ void WikipediaModel::getAdditionalItems( const GeoDataLatLonAltBox& box,
+     urlQuery.addQueryItem( "west", QString::number( box.west( GeoDataCoordinates::Degree ) ) );
+     urlQuery.addQueryItem( "maxRows", QString::number( number ) );
+     urlQuery.addQueryItem( "lang", m_languageCode );
++    urlQuery.addQueryItem( "username", "marble" );
+     geonamesUrl.setQuery( urlQuery );
+ #endif
+ 
diff --git a/marble.spec b/marble.spec
index 04e0dee..0ce67fd 100644
--- a/marble.spec
+++ b/marble.spec
@@ -7,7 +7,7 @@ Name:    marble
 Summary: Virtual globe and world atlas 
 Epoch:   1
 Version: 4.12.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: LGPLv2+
 #URL:    https://projects.kde.org/projects/kde/kdeedu/marble
@@ -32,6 +32,8 @@ Patch0: marble-4.11.90-qextserialport.patch
 Patch50:  marble-4.12.0-app_versions.patch
 
 ## upstream patches
+# fix some online services failing due to geonames.org API change (kde#331004)
+Patch100: marble-4.12.2-geonames-api.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: kdelibs4-devel >= %{version}
@@ -141,6 +143,7 @@ Requires: pykde4%{?_kde4_version: >= %{_kde4_version}}
 
 %patch0 -p1 -b .qextserialport
 %patch50 -p1 -b .app_versions
+%patch100 -p1 -b .kde#331004
 
 
 %build
@@ -259,6 +262,9 @@ fi
 
 
 %changelog
+* Thu Feb 27 2014 Kevin Kofler <Kevin at tigcc.ticalc.org> - 1:4.12.2-3
+- apply upstream fix for geonames.org API change (kde#331004)
+
 * Thu Feb 06 2014 Rex Dieter <rdieter at fedoraproject.org> - 1:4.12.2-2
 - -libs: track libmarblewidget soname