svn commit: r425760 - head/math/kmplot/files
Tobias C. Berner
tcberner at FreeBSD.org
Tue Nov 8 19:54:17 UTC 2016
Author: tcberner
Date: Tue Nov 8 19:54:15 2016
New Revision: 425760
URL: https://svnweb.freebsd.org/changeset/ports/425760
Log:
Fix build with newer gcc versions.
Add upstream patch [1] that uses
* isnan() -> std::isnan()
* isinf() -> std::isinf()
This fixes compilation with gcc5.
[1] https://quickgit.kde.org/?p=kmplot.git&a=commit&h=e903ca56ad26311fcaeb650acf96046c726fb809
PR: 213993
Reported by: Kenneth Salerno <kennethsalerno at yahoo.com>
Approved by: rakuco (mentor)
Obtained from: https://quickgit.kde.org/?p=kmplot.git&a=commit&h=e903ca56ad26311fcaeb650acf96046c726fb809
Added:
head/math/kmplot/files/
head/math/kmplot/files/patch-git_e903ca5 (contents, props changed)
Added: head/math/kmplot/files/patch-git_e903ca5
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/math/kmplot/files/patch-git_e903ca5 Tue Nov 8 19:54:15 2016 (r425760)
@@ -0,0 +1,49 @@
+Backport of the the commit e903ca5 to old kmplot.
+
+From e903ca56ad26311fcaeb650acf96046c726fb809 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid <aacid at kde.org>
+Date: Wed, 23 Mar 2016 20:56:55 +0100
+Subject: [PATCH] use std::isnan/isinf since we're including cmath
+
+--- kmplot/view.cpp.orig 2014-09-17 13:01:07 UTC
++++ kmplot/view.cpp
+@@ -477,7 +477,7 @@ QPointF View::toPixel( const QPointF & r
+ double x = pixel.x();
+ double y = pixel.y();
+
+- if ( isnan(x) )
++ if ( std::isnan(x) )
+ {
+ xclipflg = true;
+ x = pixelIfNaN.x();
+@@ -497,14 +497,14 @@ QPointF View::toPixel( const QPointF & r
+ }
+ else
+ {
+- if ( isinf(x) == -1 )
++ if ( std::isinf(x) == -1 )
+ x = 0;
+
+- else if ( isinf(x) == 1 )
++ else if ( std::isinf(x) == 1 )
+ x = m_clipRect.right();
+ }
+
+- if ( isnan(y) )
++ if ( std::isnan(y) )
+ {
+ yclipflg = true;
+ y = pixelIfNaN.y();
+@@ -524,10 +524,10 @@ QPointF View::toPixel( const QPointF & r
+ }
+ else
+ {
+- if ( isinf(y) == -1 )
++ if ( std::isinf(y) == -1 )
+ y = 0;
+
+- else if ( isinf(y) == 1 )
++ else if ( std::isinf(y) == 1 )
+ y = m_clipRect.bottom();
+ }
+
More information about the svn-ports-all
mailing list