Hello community, here is the log from the commit of package marble for openSUSE:Factory checked in at 2016-03-07 15:02:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/marble (Old) and /work/SRC/openSUSE:Factory/.marble.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "marble" Changes: -------- --- /work/SRC/openSUSE:Factory/marble/marble.changes 2016-02-22 10:20:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.marble.new/marble.changes 2016-03-07 15:02:44.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Mar 5 07:30:59 UTC 2016 - [email protected] + +- Add marble-glibc-2.23.patch to build against glibc 2.23 + +------------------------------------------------------------------- New: ---- marble-glibc-2.23.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ marble.spec ++++++ --- /var/tmp/diff_new_pack.ZMngTw/_old 2016-03-07 15:02:46.000000000 +0100 +++ /var/tmp/diff_new_pack.ZMngTw/_new 2016-03-07 15:02:46.000000000 +0100 @@ -27,6 +27,8 @@ Source0: %{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE make_astro_coinstall.diff [email protected] -- Make astro coinstallable with its Qt4 version Patch1: make_astro_coinstall.diff +# PATCH-FIX-OPENSUSE marble-glibc-2.23.patch -- Make it build with glibc 2.23 +Patch2: marble-glibc-2.23.patch BuildRequires: fdupes BuildRequires: gpsd-devel BuildRequires: perl @@ -135,6 +137,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build %ifarch ppc ppc64 ++++++ marble-glibc-2.23.patch ++++++ diff -urB marble-15.12.2/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp new/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp --- marble-15.12.2/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp 2016-01-31 20:57:21.000000000 +0100 +++ new/src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp 2016-03-05 08:28:57.888629725 +0100 @@ -12,7 +12,7 @@ #include "GpsdThread.h" #include "MarbleDebug.h" -#include <math.h> +#include <cmath> using namespace Marble; /* TRANSLATOR Marble::GpsdPositionProviderPlugin */ @@ -76,7 +76,7 @@ { PositionProviderStatus oldStatus = m_status; GeoDataCoordinates oldPosition = m_position; - if ( data.status == STATUS_NO_FIX || isnan( data.fix.longitude ) || isnan( data.fix.latitude ) ) + if ( data.status == STATUS_NO_FIX || std::isnan( data.fix.longitude ) || std::isnan( data.fix.latitude ) ) m_status = PositionProviderStatusAcquiring; else { m_status = PositionProviderStatusAvailable; @@ -88,29 +88,29 @@ m_accuracy.level = GeoDataAccuracy::Detailed; #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) - if ( !isnan( data.fix.epx ) && !isnan( data.fix.epy ) ) { + if ( !std::isnan( data.fix.epx ) && !std::isnan( data.fix.epy ) ) { m_accuracy.horizontal = qMax( data.fix.epx, data.fix.epy ); } #else - if ( !isnan( data.fix.eph ) ) { + if ( !std::isnan( data.fix.eph ) ) { m_accuracy.horizontal = data.fix.eph; } #endif - if ( !isnan( data.fix.epv ) ) { + if ( !std::isnan( data.fix.epv ) ) { m_accuracy.vertical = data.fix.epv; } - if( !isnan(data.fix.speed ) ) + if( !std::isnan(data.fix.speed ) ) { m_speed = data.fix.speed; } - if( !isnan( data.fix.track ) ) + if( !std::isnan( data.fix.track ) ) { m_track = data.fix.track; } - if ( !isnan( data.fix.time ) ) + if ( !std::isnan( data.fix.time ) ) { m_timestamp = QDateTime::fromMSecsSinceEpoch( data.fix.time * 1000 ); }
