From 0273f7a516b1c63023b43d9049266dffa5700288769dfa8ff5c0ec6a4424b099 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Sat, 5 Mar 2016 07:31:18 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=85 --- marble-glibc-2.23.patch | 57 +++++++++++++++++++++++++++++++++++++++++ marble.changes | 5 ++++ marble.spec | 3 +++ 3 files changed, 65 insertions(+) create mode 100644 marble-glibc-2.23.patch diff --git a/marble-glibc-2.23.patch b/marble-glibc-2.23.patch new file mode 100644 index 0000000..c7882a5 --- /dev/null +++ b/marble-glibc-2.23.patch @@ -0,0 +1,57 @@ +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 ++#include + + 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 ); + } diff --git a/marble.changes b/marble.changes index 7e09bc0..7ba9b4f 100644 --- a/marble.changes +++ b/marble.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Mar 5 07:30:59 UTC 2016 - tittiatcoke@gmail.com + +- Add marble-glibc-2.23.patch to build against glibc 2.23 + ------------------------------------------------------------------- Sat Feb 13 08:24:54 UTC 2016 - tittiatcoke@gmail.com diff --git a/marble.spec b/marble.spec index 65355f7..7a6afae 100644 --- a/marble.spec +++ b/marble.spec @@ -27,6 +27,8 @@ Url: http://edu.kde.org Source0: %{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE make_astro_coinstall.diff tittiatcoke@gmail.com -- 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 @@ The Astronomy shared library for the MarbleWidget shared library. %prep %setup -q %patch1 -p1 +%patch2 -p1 %build %ifarch ppc ppc64