diff -Nru marble-4.12.2/debian/changelog marble-4.12.3/debian/changelog --- marble-4.12.2/debian/changelog 2014-02-24 13:34:22.000000000 +0000 +++ marble-4.12.3/debian/changelog 2014-03-04 20:12:10.000000000 +0000 @@ -1,3 +1,9 @@ +marble (4:4.12.3-0ubuntu1) trusty; urgency=medium + + * New upstream bugfix release + + -- Rohan Garg Tue, 04 Mar 2014 21:12:07 +0100 + marble (4:4.12.2-0ubuntu3) trusty; urgency=medium * Add libwlocate0 as explicit dependency of marble-plugins. It is a diff -Nru marble-4.12.2/debian/control marble-4.12.3/debian/control --- marble-4.12.2/debian/control 2014-02-24 13:34:22.000000000 +0000 +++ marble-4.12.3/debian/control 2014-03-04 20:12:10.000000000 +0000 @@ -8,7 +8,7 @@ cmake, debhelper (>= 7.3.16), pkg-kde-tools (>= 0.12), - kdelibs5-dev (>= 4:4.12.2), + kdelibs5-dev (>= 4:4.12.3), pkg-config, libgps-dev (>= 2.90), libx11-dev, diff -Nru marble-4.12.2/src/apps/marble-mobile/MobileMainWindow.cpp marble-4.12.3/src/apps/marble-mobile/MobileMainWindow.cpp --- marble-4.12.2/src/apps/marble-mobile/MobileMainWindow.cpp 2014-01-27 18:34:20.000000000 +0000 +++ marble-4.12.3/src/apps/marble-mobile/MobileMainWindow.cpp 2014-02-26 21:22:15.000000000 +0000 @@ -121,7 +121,7 @@ m_workOfflineAct->setChecked( m_marbleWidget->model()->workOffline() ); connect( m_workOfflineAct, SIGNAL(triggered(bool)), this, SLOT(setWorkOffline(bool)) ); - m_kineticScrollingAction = menuBar()->addAction( QApplication::translate("MarbleNavigationSettingsWidget", "&Inertial Globe Rotation", 0, QApplication::UnicodeUTF8) ); + m_kineticScrollingAction = menuBar()->addAction( tr( "&Inertial Globe Rotation" ) ); m_kineticScrollingAction->setCheckable( true ); connect( m_kineticScrollingAction, SIGNAL(triggered(bool)), this, SLOT(setKineticScrollingEnabled(bool)) ); diff -Nru marble-4.12.2/src/lib/marble/CMakeLists.txt marble-4.12.3/src/lib/marble/CMakeLists.txt --- marble-4.12.2/src/lib/marble/CMakeLists.txt 2014-01-27 18:34:20.000000000 +0000 +++ marble-4.12.3/src/lib/marble/CMakeLists.txt 2014-02-26 21:22:15.000000000 +0000 @@ -433,6 +433,7 @@ geodata/data/GeoDataLabelStyle.h geodata/data/GeoDataLatLonAltBox.h geodata/data/GeoDataLatLonBox.h + geodata/data/GeoDataLatLonQuad.h geodata/data/GeoDataLinearRing.h geodata/data/GeoDataLineString.h geodata/data/GeoDataLineStyle.h diff -Nru marble-4.12.2/src/plugins/render/earthquake/EarthquakeModel.cpp marble-4.12.3/src/plugins/render/earthquake/EarthquakeModel.cpp --- marble-4.12.2/src/plugins/render/earthquake/EarthquakeModel.cpp 2014-01-27 18:34:20.000000000 +0000 +++ marble-4.12.3/src/plugins/render/earthquake/EarthquakeModel.cpp 2014-02-26 21:22:15.000000000 +0000 @@ -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 -Nru marble-4.12.2/src/plugins/render/postalcode/PostalCodeModel.cpp marble-4.12.3/src/plugins/render/postalcode/PostalCodeModel.cpp --- marble-4.12.2/src/plugins/render/postalcode/PostalCodeModel.cpp 2014-01-27 18:34:20.000000000 +0000 +++ marble-4.12.3/src/plugins/render/postalcode/PostalCodeModel.cpp 2014-02-26 21:22:15.000000000 +0000 @@ -60,12 +60,14 @@ 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 -Nru marble-4.12.2/src/plugins/render/satellites/sgp4/sgp4ext.cpp marble-4.12.3/src/plugins/render/satellites/sgp4/sgp4ext.cpp --- marble-4.12.2/src/plugins/render/satellites/sgp4/sgp4ext.cpp 2014-01-27 18:34:20.000000000 +0000 +++ marble-4.12.3/src/plugins/render/satellites/sgp4/sgp4ext.cpp 2014-02-26 21:22:15.000000000 +0000 @@ -283,7 +283,7 @@ // -------------------- hyperbolic -------------------- if ( ecc > 1.0 + small ) { - if ((ecc > 1.0 ) && (fabs(nu)+0.00001 < pi-acos(1.0 /ecc))) + if ((ecc > 1.0 ) && (fabs(nu)+0.00001 < M_PI-acos(1.0 /ecc))) { sine= ( sqrt( ecc*ecc-1.0 ) * sin(nu) ) / ( 1.0 + ecc*cos(nu) ); e0 = asinh( sine ); @@ -292,7 +292,7 @@ } else // ----------------- parabolic --------------------- - if ( fabs(nu) < 168.0*pi/180.0 ) + if ( fabs(nu) < 168.0*M_PI/180.0 ) { e0= tan( nu*0.5 ); m = e0 + (e0*e0*e0)/3.0; @@ -300,10 +300,10 @@ if ( ecc < 1.0 ) { - m = fmod( m,2.0 *pi ); + m = fmod( m,2.0 *M_PI ); if ( m < 0.0 ) - m = m + 2.0 *pi; - e0 = fmod( e0,2.0 *pi ); + m = m + 2.0 *M_PI; + e0 = fmod( e0,2.0 *M_PI ); } } // end newtonnu @@ -378,8 +378,8 @@ int i; char typeorbit[3]; - twopi = 2.0 * pi; - halfpi = 0.5 * pi; + twopi = 2.0 * M_PI; + halfpi = 0.5 * M_PI; small = 0.00000001; undefined = 999999.1; infinite = 999999.9; @@ -421,7 +421,7 @@ if ( ecc < small ) { // ---------------- circular equatorial --------------- - if ((incl pi) { + if (fabs(xnoh - nodep) > M_PI) { if (nodep < xnoh) { nodep = nodep + twopi; } @@ -434,7 +434,7 @@ const double zcosis = 0.91744867; const double zcosgs = 0.1945905; const double zsings = -0.98088458; - const double twopi = 2.0 * pi; + const double twopi = 2.0 * M_PI; /* --------------------- local variables ------------------------ */ int lsflg; @@ -704,7 +704,7 @@ ) { /* --------------------- local variables ------------------------ */ - const double twopi = 2.0 * pi; + const double twopi = 2.0 * M_PI; double ainv2 , aonv=0.0, cosisq, eoc, f220 , f221 , f311 , f321 , f322 , f330 , f441 , f442 , f522 , f523 , @@ -746,7 +746,7 @@ sghs = ss4 * zns * (sz31 + sz33 - 6.0); shs = -zns * ss2 * (sz21 + sz23); // sgp4fix for 180 deg incl - if ((inclm < 5.2359877e-2) || (inclm > pi - 5.2359877e-2)) + if ((inclm < 5.2359877e-2) || (inclm > M_PI - 5.2359877e-2)) shs = 0.0; if (sinim != 0.0) shs = shs / sinim; @@ -759,7 +759,7 @@ sghl = s4 * znl * (z31 + z33 - 6.0); shll = -znl * s2 * (z21 + z23); // sgp4fix for 180 deg incl - if ((inclm < 5.2359877e-2) || (inclm > pi - 5.2359877e-2)) + if ((inclm < 5.2359877e-2) || (inclm > M_PI - 5.2359877e-2)) shll = 0.0; domdt = sgs + sghl; dnodt = shs; @@ -992,7 +992,7 @@ double& mm, double& xni, double& nodem, double& dndt, double& nm ) { - const double twopi = 2.0 * pi; + const double twopi = 2.0 * M_PI; int iretn; double delt, ft, theta, x2li, x2omi, xl, xldot , xnddt, xndt, xomi, g22, g32, g44, g52, g54, fasx2, fasx4, fasx6, rptim , step2, stepn , stepp; @@ -1196,7 +1196,7 @@ // sgp4fix use old way of finding gst double ds70; double ts70, tfrac, c1, thgr70, fk5r, c1p2p; - const double twopi = 2.0 * pi; + const double twopi = 2.0 * M_PI; /* ----------------------- earth constants ---------------------- */ // sgp4fix identify constants and allow alternate values @@ -1513,7 +1513,7 @@ satrec.x7thm1 = 7.0 * cosio2 - 1.0; /* --------------- deep space initialization ------------- */ - if ((2*pi / satrec.no) >= 225.0) + if ((2*M_PI / satrec.no) >= 225.0) { satrec.method = 'd'; satrec.isimp = 1; @@ -1718,7 +1718,7 @@ // the old check used 1.0 + cos(pi-1.0e-9), but then compared it to // 1.5 e-12, so the threshold was changed to 1.5e-12 for consistency const double temp4 = 1.5e-12; - twopi = 2.0 * pi; + twopi = 2.0 * M_PI; x2o3 = 2.0 / 3.0; // sgp4fix identify constants and allow alternate values getgravconst( whichconst, tumin, mu, radiusearthkm, xke, j2, j3, j4, j3oj2 ); @@ -1847,8 +1847,8 @@ if (xincp < 0.0) { xincp = -xincp; - nodep = nodep + pi; - argpp = argpp - pi; + nodep = nodep + M_PI; + argpp = argpp - M_PI; } if ((ep < 0.0 ) || ( ep > 1.0)) { @@ -2009,8 +2009,8 @@ double jdut1 ) { - const double twopi = 2.0 * pi; - const double deg2rad = pi / 180.0; + const double twopi = 2.0 * M_PI; + const double deg2rad = M_PI / 180.0; double temp, tut1; tut1 = (jdut1 - 2451545.0) / 36525.0; diff -Nru marble-4.12.2/src/plugins/render/satellites/sgp4/sgp4unit.h marble-4.12.3/src/plugins/render/satellites/sgp4/sgp4unit.h --- marble-4.12.2/src/plugins/render/satellites/sgp4/sgp4unit.h 2014-01-27 18:34:20.000000000 +0000 +++ marble-4.12.3/src/plugins/render/satellites/sgp4/sgp4unit.h 2014-02-26 21:22:15.000000000 +0000 @@ -48,7 +48,9 @@ #include #define SGP4Version "SGP4 Version 2008-11-03" -#define pi 3.14159265358979323846 +#ifndef M_PI +#define M_PI 3.14159265358979323846 +#endif // -------------------------- structure declarations ---------------------------- typedef enum diff -Nru marble-4.12.2/src/plugins/render/weather/GeoNamesWeatherService.cpp marble-4.12.3/src/plugins/render/weather/GeoNamesWeatherService.cpp --- marble-4.12.2/src/plugins/render/weather/GeoNamesWeatherService.cpp 2014-01-27 18:34:20.000000000 +0000 +++ marble-4.12.3/src/plugins/render/weather/GeoNamesWeatherService.cpp 2014-02-26 21:22:15.000000000 +0000 @@ -57,6 +57,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" ); #else QUrlQuery urlQuery; urlQuery.addQueryItem( "north", QString::number( box.north( GeoDataCoordinates::Degree ) ) ); @@ -64,6 +65,7 @@ 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 @@ 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 -Nru marble-4.12.2/src/plugins/render/wikipedia/WikipediaModel.cpp marble-4.12.3/src/plugins/render/wikipedia/WikipediaModel.cpp --- marble-4.12.2/src/plugins/render/wikipedia/WikipediaModel.cpp 2014-01-27 18:34:20.000000000 +0000 +++ marble-4.12.3/src/plugins/render/wikipedia/WikipediaModel.cpp 2014-02-26 21:22:15.000000000 +0000 @@ -73,6 +73,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" ); #else QUrlQuery urlQuery; urlQuery.addQueryItem( "north", QString::number( box.north( GeoDataCoordinates::Degree ) ) ); @@ -81,6 +82,7 @@ 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