diff options
| author | bouyer <bouyer@pkgsrc.org> | 2018-07-03 15:14:15 +0000 |
|---|---|---|
| committer | bouyer <bouyer@pkgsrc.org> | 2018-07-03 15:14:15 +0000 |
| commit | 7072c1dc638345c3f2ff10753a0559ce917d2e3f (patch) | |
| tree | e14db15ff9734fb73f071cb49451c89f4869fd7a /geography/opencpn | |
| parent | 3ed19ff25abc40905961094a17d9dccf76104c61 (diff) | |
| download | pkgsrc-7072c1dc638345c3f2ff10753a0559ce917d2e3f.tar.gz | |
newer gcc (e.g. 8.0_RC2) requires <cmath> for std::isnan().
This is only a build fix so no revision bump
Diffstat (limited to 'geography/opencpn')
| -rw-r--r-- | geography/opencpn/distinfo | 4 | ||||
| -rw-r--r-- | geography/opencpn/patches/patch-plugins_wmm_pi_src_MagneticPlotMap.cpp | 20 |
2 files changed, 16 insertions, 8 deletions
diff --git a/geography/opencpn/distinfo b/geography/opencpn/distinfo index 8eb43462864..a4f2cdd2203 100644 --- a/geography/opencpn/distinfo +++ b/geography/opencpn/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2018/04/13 18:57:29 bouyer Exp $ +$NetBSD: distinfo,v 1.19 2018/07/03 15:14:15 bouyer Exp $ SHA1 (OpenCPN-4.8.2.zip) = 9547a99c0de739fb0f4953d37bb738ed651f5c62 RMD160 (OpenCPN-4.8.2.zip) = f217d07cc639292e657b0f89f96daa12cab2a355 @@ -12,7 +12,7 @@ SHA1 (patch-plugins_dashboard_pi_CMakeLists.txt) = 76a6198e58f81c129f15fa6671da1 SHA1 (patch-plugins_grib_pi_CMakeLists.txt) = 49f997c27aa4710721d36945a681854579112a49 SHA1 (patch-plugins_wmm_pi_CMakeLists.txt) = 88339a61dd4b78b823bbd34bd1b02863d150f046 SHA1 (patch-plugins_wmm_pi_cmake_PluginConfigure.cmake) = f1c91cfa744ed76d938bfb5bdb4116df9f45604a -SHA1 (patch-plugins_wmm_pi_src_MagneticPlotMap.cpp) = eb2f4c09913e849becf1e270b0219ffdf46bb922 +SHA1 (patch-plugins_wmm_pi_src_MagneticPlotMap.cpp) = 885f940777b38c8e59cc5d2e4fdbd1bf9a91578d SHA1 (patch-src_chart1.cpp) = ae7c1d8a59c9a275914a613205de71e2dca89dc6 SHA1 (patch-src_crashprint.cpp) = a96e8aa980eb3b19c3dce3343582511d608e6625 SHA1 (patch-src_glu_CMakeLists.txt) = d63494a41071097252ac9e2cb95db75041f30b62 diff --git a/geography/opencpn/patches/patch-plugins_wmm_pi_src_MagneticPlotMap.cpp b/geography/opencpn/patches/patch-plugins_wmm_pi_src_MagneticPlotMap.cpp index 9ef5349ec8c..0c12c9b4884 100644 --- a/geography/opencpn/patches/patch-plugins_wmm_pi_src_MagneticPlotMap.cpp +++ b/geography/opencpn/patches/patch-plugins_wmm_pi_src_MagneticPlotMap.cpp @@ -1,8 +1,16 @@ -$NetBSD: patch-plugins_wmm_pi_src_MagneticPlotMap.cpp,v 1.1 2018/04/09 18:44:50 bouyer Exp $ +$NetBSD: patch-plugins_wmm_pi_src_MagneticPlotMap.cpp,v 1.2 2018/07/03 15:14:15 bouyer Exp $ ---- plugins/wmm_pi/src/MagneticPlotMap.cpp.orig 2018-04-09 18:01:32.900360435 +0200 -+++ plugins/wmm_pi/src/MagneticPlotMap.cpp 2018-04-09 18:02:29.319040318 +0200 -@@ -230,7 +230,7 @@ +--- plugins/wmm_pi/src/MagneticPlotMap.cpp.orig 2018-02-07 12:08:26.000000000 +0100 ++++ plugins/wmm_pi/src/MagneticPlotMap.cpp 2018-07-02 12:16:38.589797991 +0200 +@@ -32,6 +32,7 @@ + #endif //precompiled headers + + #include <wx/progdlg.h> ++#include <cmath> + + #include "ocpn_plugin.h" + +@@ -230,7 +231,7 @@ else p = CalcParameter(lonval, rx); @@ -11,7 +19,7 @@ $NetBSD: patch-plugins_wmm_pi_src_MagneticPlotMap.cpp,v 1.1 2018/04/09 18:44:50 return true; if(m_type == DECLINATION && p-ry*m_Spacing < -180) /* way off, try other way around */ -@@ -290,7 +290,7 @@ +@@ -290,7 +291,7 @@ double p3 = CachedCalcParameter(lat2, lon1); double p4 = CachedCalcParameter(lat2, lon2); @@ -20,7 +28,7 @@ $NetBSD: patch-plugins_wmm_pi_src_MagneticPlotMap.cpp,v 1.1 2018/04/09 18:44:50 return; double ry1, ry2, ry3, ry4 = 0.0; -@@ -318,7 +318,7 @@ +@@ -318,7 +319,7 @@ ry1*=m_Spacing, ry2*=m_Spacing, ry3*=m_Spacing, ry4*=m_Spacing; /* determine which interpolations need line segments */ |