pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/geography newer gcc (e.g. 8.0_RC2) requires <cmath> fo...
details: https://anonhg.NetBSD.org/pkgsrc/rev/cda23b9a32c5
branches: trunk
changeset: 382418:cda23b9a32c5
user: bouyer <bouyer%pkgsrc.org@localhost>
date: Tue Jul 03 15:14:15 2018 +0000
description:
newer gcc (e.g. 8.0_RC2) requires <cmath> for std::isnan().
This is only a build fix so no revision bump
diffstat:
geography/opencpn-plugin-watchdog/distinfo | 6 +-
geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp | 89 +++++++--
geography/opencpn-plugin-watchdog/patches/patch-src_watchdog_pi.cpp | 16 +-
geography/opencpn/distinfo | 4 +-
geography/opencpn/patches/patch-plugins_wmm_pi_src_MagneticPlotMap.cpp | 20 +-
5 files changed, 102 insertions(+), 33 deletions(-)
diffs (296 lines):
diff -r 8dbed7aa7558 -r cda23b9a32c5 geography/opencpn-plugin-watchdog/distinfo
--- a/geography/opencpn-plugin-watchdog/distinfo Tue Jul 03 14:37:37 2018 +0000
+++ b/geography/opencpn-plugin-watchdog/distinfo Tue Jul 03 15:14:15 2018 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.9 2018/04/19 09:59:28 bouyer Exp $
+$NetBSD: distinfo,v 1.10 2018/07/03 15:14:15 bouyer Exp $
SHA1 (watchdog_pi-20180405-4e79fdba96ccd1a17b81166e6956571bf734597d.tar.gz) = e96b4390349488a41d8ca74203a3316512be84cb
RMD160 (watchdog_pi-20180405-4e79fdba96ccd1a17b81166e6956571bf734597d.tar.gz) = 033f0c65129a811b01ce24655c9bc4ec4435f3d8
SHA512 (watchdog_pi-20180405-4e79fdba96ccd1a17b81166e6956571bf734597d.tar.gz) =
9398cc2663d5acee13022105a98a76eb1b2dc3cf67e7d49bb0554161488125276b181e9e5392654dea23413e167b95b0acfd4600d1f4ed1c72b678e622873c89
Size (watchdog_pi-20180405-4e79fdba96ccd1a17b81166e6956571bf734597d.tar.gz) = 485682 bytes
SHA1 (patch-cmake_PluginConfigure.cmake) = bc2d6409f95cffee145173280c33f9e7fe439864
-SHA1 (patch-src_Alarm.cpp) = 5cbe32ca31ad1ec8407683358e0a5c44ea062e06
-SHA1 (patch-src_watchdog_pi.cpp) = bcae586e09820f80ea34d5c497476b0883742b5b
+SHA1 (patch-src_Alarm.cpp) = 3eab8a83a2304c9378b1e21bfc367e41833b3973
+SHA1 (patch-src_watchdog_pi.cpp) = 8d8077490aa7a121fae82931ae0c8de89f82fbaf
SHA1 (patch-src_wddc.cpp) = 3c43974da65dfe9a18a77f4b84595a4ab602cfd9
diff -r 8dbed7aa7558 -r cda23b9a32c5 geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp
--- a/geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp Tue Jul 03 14:37:37 2018 +0000
+++ b/geography/opencpn-plugin-watchdog/patches/patch-src_Alarm.cpp Tue Jul 03 15:14:15 2018 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-src_Alarm.cpp,v 1.1 2018/04/09 14:18:26 bouyer Exp $
+$NetBSD: patch-src_Alarm.cpp,v 1.2 2018/07/03 15:14:16 bouyer Exp $
---- src/Alarm.cpp.orig 2018-04-09 14:38:56.349739590 +0200
-+++ src/Alarm.cpp 2018-04-09 14:39:24.526834514 +0200
-@@ -81,7 +81,7 @@
+--- src/Alarm.cpp.orig 2018-03-04 15:24:36.000000000 +0100
++++ src/Alarm.cpp 2018-07-02 12:13:29.929855122 +0200
+@@ -27,6 +27,7 @@
+ #include <map>
+
+ #include <wx/wx.h>
++#include <cmath>
+ #include "wx28compat.h"
+ #include "wddc.h"
+
+@@ -81,7 +82,7 @@
bool Test() {
PlugIn_Position_Fix_Ex lastfix = g_watchdog_pi->LastFix();
@@ -11,7 +19,16 @@
return m_bNoData;
double lat1 = lastfix.Lat, lon1 = lastfix.Lon, lat2, lon2;
-@@ -188,7 +188,7 @@
+@@ -96,7 +97,7 @@
+ while(count < 10 && dist1 > 1e-6) {
+ PositionBearingDistanceMercator_Plugin
+ (lastfix.Lat, lastfix.Lon, lastfix.Cog, dist + dist1, &lat2, &lon2);
+- if(!wxIsNaN(lat2) && PlugIn_GSHHS_CrossesLand(lat1, lon1, lat2, lon2)) {
++ if(!std::isnan(lat2) && PlugIn_GSHHS_CrossesLand(lat1, lon1, lat2, lon2)) {
+ if(dist1 < 1) {
+ m_LandFallTime = wxTimeSpan::Seconds(3600.0 * (dist + dist1) / lastfix.Sog);
+ m_crossinglat1 = lat1, m_crossinglon1 = lon1;
+@@ -188,7 +189,7 @@
void Render(wdDC &dc, PlugIn_ViewPort &vp) {
PlugIn_Position_Fix_Ex lastfix = g_watchdog_pi->LastFix();
@@ -20,7 +37,7 @@
return;
wxPoint r1, r2, r3, r4;
-@@ -350,7 +350,7 @@
+@@ -350,7 +351,7 @@
bool Test() {
PlugIn_Position_Fix_Ex lastfix = g_watchdog_pi->LastFix();
@@ -29,7 +46,43 @@
return m_bNoData;
double lat, lon;
-@@ -1701,7 +1701,7 @@
+@@ -389,7 +390,7 @@
+
+ switch(m_Mode) {
+ case TIME: {
+- if(wxIsNaN(lastfix.Lat) || wxIsNaN(lastfix.Lon) ||wxIsNaN(lastfix.Cog) || wxIsNaN(lastfix.Sog)) break;
++ if(std::isnan(lastfix.Lat) || std::isnan(lastfix.Lon) ||std::isnan(lastfix.Cog) || std::isnan(lastfix.Sog)) break;
+ if(ODVersionNewerThan( 1, 1, 1)) {
+ dist = lastfix.Sog * ( m_TimeMinutes / 60 );
+ PositionBearingDistanceMercator_Plugin(lastfix.Lat, lastfix.Lon, lastfix.Cog, dist, &lat, &lon);
+@@ -589,7 +590,7 @@
+ break;
+ }
+ case DISTANCE: {
+- if(wxIsNaN(lastfix.Lat) || wxIsNaN(lastfix.Lon)) break;
++ if(std::isnan(lastfix.Lat) || std::isnan(lastfix.Lon)) break;
+ // check OD version to see which lookup to use
+ if( ODVersionNewerThan( 1, 1, 1)) {
+ BoundaryCrossingList.clear();
+@@ -817,7 +818,7 @@
+ break;
+ }
+ case ANCHOR: {
+- if(wxIsNaN(lastfix.Lat) || wxIsNaN(lastfix.Lon)) break;
++ if(std::isnan(lastfix.Lat) || std::isnan(lastfix.Lon)) break;
+ if(m_BoundaryName == wxEmptyString)
+ m_BoundaryName = g_BoundaryName;
+ if(m_BoundaryDescription == wxEmptyString)
+@@ -850,7 +851,7 @@
+ break;
+ }
+ case GUARD: {
+- if(wxIsNaN(g_AISTarget.m_dLat) || wxIsNaN(g_AISTarget.m_dLat)) break;
++ if(std::isnan(g_AISTarget.m_dLat) || std::isnan(g_AISTarget.m_dLat)) break;
+ wxJSONValue jMsg;
+ wxJSONWriter writer;
+ wxString MsgString;
+@@ -1701,7 +1702,7 @@
}
bool Test() {
@@ -38,7 +91,7 @@
return m_bNoData;
return Distance() > m_Radius;
}
-@@ -1718,7 +1718,7 @@
+@@ -1718,7 +1719,7 @@
double anchordist = Distance();
wxString s;
@@ -47,7 +100,7 @@
s = _T("N/A");
else {
wxString fmt(_T("%.0f "));
-@@ -1782,7 +1782,7 @@
+@@ -1782,7 +1783,7 @@
private:
double Distance() {
@@ -56,7 +109,7 @@
return NAN;
PlugIn_Position_Fix_Ex lastfix = g_watchdog_pi->LastFix();
-@@ -1820,7 +1820,7 @@
+@@ -1820,7 +1821,7 @@
bool Test() {
double error = CourseError();
@@ -65,7 +118,7 @@
return m_bNoData;
return error > m_Tolerance;
-@@ -1829,7 +1829,7 @@
+@@ -1829,7 +1830,7 @@
wxString GetStatus() {
double courseerror = CourseError();
wxString s;
@@ -74,7 +127,7 @@
s = _T("N/A");
else {
wxString fmt(_T("%.0f "));
-@@ -1850,7 +1850,7 @@
+@@ -1850,7 +1851,7 @@
double lat1 = lastfix.Lat, lon1 = lastfix.Lon, lat2, lon2, lat3, lon3;
double dist = lastfix.Sog;
@@ -83,7 +136,7 @@
return;
PositionBearingDistanceMercator_Plugin(lat1, lon1, m_Course+m_Tolerance,
-@@ -1949,7 +1949,7 @@
+@@ -1949,7 +1950,7 @@
wxString GetStatus() {
wxString s;
@@ -92,7 +145,7 @@
s = _T("N/A");
else {
wxString fmt(_T("%.1f"));
-@@ -1983,7 +1983,7 @@
+@@ -1983,7 +1984,7 @@
bool Test() {
double knots = Knots();
@@ -101,7 +154,7 @@
return m_bNoData;
if(m_Mode == UNDERSPEED)
-@@ -2038,7 +2038,7 @@
+@@ -2038,7 +2039,7 @@
{
Alarm::OnTimer( tEvent );
double sog = g_watchdog_pi->LastFix().Sog;
@@ -110,7 +163,7 @@
m_SOGqueue.push_front(sog) ;
return;
}
-@@ -2101,7 +2101,7 @@
+@@ -2101,7 +2102,7 @@
val = 360 - val;
}
@@ -119,7 +172,7 @@
s = _T("N/A");
else {
wxString fmt(_T("%.1f"));
-@@ -2300,7 +2300,7 @@
+@@ -2300,7 +2301,7 @@
s += _T(" ");
double val = Value();
@@ -128,7 +181,7 @@
s += _T("N/A");
else {
wxString fmt(_T("%.2f"));
-@@ -2439,7 +2439,7 @@
+@@ -2439,7 +2440,7 @@
value = nmea.Mtw.Temperature;
break;
}
diff -r 8dbed7aa7558 -r cda23b9a32c5 geography/opencpn-plugin-watchdog/patches/patch-src_watchdog_pi.cpp
--- a/geography/opencpn-plugin-watchdog/patches/patch-src_watchdog_pi.cpp Tue Jul 03 14:37:37 2018 +0000
+++ b/geography/opencpn-plugin-watchdog/patches/patch-src_watchdog_pi.cpp Tue Jul 03 15:14:15 2018 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-src_watchdog_pi.cpp,v 1.1 2018/04/09 14:18:26 bouyer Exp $
+$NetBSD: patch-src_watchdog_pi.cpp,v 1.2 2018/07/03 15:14:16 bouyer Exp $
---- src/watchdog_pi.cpp.orig 2018-04-09 14:24:25.426153922 +0200
-+++ src/watchdog_pi.cpp 2018-04-09 14:25:01.452945740 +0200
-@@ -345,14 +345,14 @@
+--- src/watchdog_pi.cpp.orig 2018-03-04 15:24:36.000000000 +0100
++++ src/watchdog_pi.cpp 2018-07-02 12:05:36.112240381 +0200
+@@ -26,6 +26,7 @@
+
+ #include <wx/wx.h>
+ #include <wx/stdpaths.h>
++#include <cmath>
+
+ #include "wxJSON/jsonreader.h"
+ #include "wxJSON/jsonwriter.h"
+@@ -345,14 +346,14 @@
{
/* calculate course and speed over ground from gps */
double dt = m_lastfix.FixTime - m_lasttimerfix.FixTime;
diff -r 8dbed7aa7558 -r cda23b9a32c5 geography/opencpn/distinfo
--- a/geography/opencpn/distinfo Tue Jul 03 14:37:37 2018 +0000
+++ b/geography/opencpn/distinfo Tue Jul 03 15:14:15 2018 +0000
@@ -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_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 -r 8dbed7aa7558 -r cda23b9a32c5 geography/opencpn/patches/patch-plugins_wmm_pi_src_MagneticPlotMap.cpp
--- a/geography/opencpn/patches/patch-plugins_wmm_pi_src_MagneticPlotMap.cpp Tue Jul 03 14:37:37 2018 +0000
+++ b/geography/opencpn/patches/patch-plugins_wmm_pi_src_MagneticPlotMap.cpp Tue Jul 03 15:14:15 2018 +0000
@@ -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 @@
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 @@
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 */
Home |
Main Index |
Thread Index |
Old Index