Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 8 Nov 2016 19:53:45 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r425759 - head/astro/marble/files
Message-ID:  <201611081953.uA8JrjTu071944@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: tcberner
Date: Tue Nov  8 19:53:44 2016
New Revision: 425759
URL: https://svnweb.freebsd.org/changeset/ports/425759

Log:
  Fix build with newer gcc versions.
  
  Add upstream patch [1] that uses
  	* math.h  -> cmath
  	* isnan() -> std::isnan()
  
  This fixes compilation with gcc5.
  
  [1] https://quickgit.kde.org/?p=marble.git&a=commit&h=486f6181d6fef15c9b6c72504e3588be502bea80
  
  PR:		213995
  Reported by:	Kenneth Salerno <kennethsalerno@yahoo.com>
  Approved by:	rakuco (mentor)
  Obtained from:	https://quickgit.kde.org/?p=marble.git&a=commit&h=486f6181d6fef15c9b6c72504e3588be502bea80

Added:
  head/astro/marble/files/
  head/astro/marble/files/patch-git_486f618   (contents, props changed)

Added: head/astro/marble/files/patch-git_486f618
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/astro/marble/files/patch-git_486f618	Tue Nov  8 19:53:44 2016	(r425759)
@@ -0,0 +1,63 @@
+Backport of the the commit 486f618 to old marble.
+
+From 486f6181d6fef15c9b6c72504e3588be502bea80 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dennis=20Nienh=C3=BCser?= <nienhueser@kde.org>
+Date: Sun, 20 Mar 2016 17:43:25 +0100
+Subject: [PATCH] Use std::isnan from cmath
+
+--- src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp.orig	2014-10-23 21:53:08 UTC
++++ src/plugins/positionprovider/gpsd/GpsdPositionProviderPlugin.cpp
+@@ -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 @@ void GpsdPositionProviderPlugin::update(
+ {
+     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 = PositionProviderStatusUnavailable;
+     else {
+         m_status = PositionProviderStatusAvailable;
+@@ -88,29 +88,29 @@ void GpsdPositionProviderPlugin::update(
+
+         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 );
+         }

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611081953.uA8JrjTu071944>