rpm/marble
SHA256
1
0
Fork 0
forked from pool/marble
Code Pull Requests Activity

Accepting request 366264 from KDE:Applications

Browse Source 
Enable marble to build with glib 2.13. Should be added to Staging:B

OBS-URL: https://build.opensuse.org/request/show/366264
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/marble?expand=0&rev=74
This commit is contained in:
Dominique Leuenberger 2016-03-07 14:02:40 +00:00 committed by Git OBS Bridge
commit 906d54dd3c
3 changed files with 65 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
marble-glibc-2.23.patch Normal file
View File

@ -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 <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 );
}

5
marble.changes
View File

@ -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

3
marble.spec
View File

@ -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