diff options
-rw-r--r-- | geography/opencpn/distinfo | 4 | ||||
-rw-r--r-- | geography/opencpn/patches/patch-src_printtable.cpp | 24 | ||||
-rw-r--r-- | geography/opencpn/patches/patch-src_routeprintout.cpp | 24 |
3 files changed, 51 insertions, 1 deletions
diff --git a/geography/opencpn/distinfo b/geography/opencpn/distinfo index 4a5570829d7..bd3caf86f52 100644 --- a/geography/opencpn/distinfo +++ b/geography/opencpn/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.14 2017/09/12 17:31:20 bouyer Exp $ +$NetBSD: distinfo,v 1.15 2017/09/25 22:31:25 joerg Exp $ SHA1 (OpenCPN-4.8.0-a13bc435462ae6c029660f1caa458dca79c927ec.zip) = 33ecc34915951c270fd758ec00a69574bc44ea25 RMD160 (OpenCPN-4.8.0-a13bc435462ae6c029660f1caa458dca79c927ec.zip) = 084ad8ace3336954402a17b7610c3e2807a270a1 @@ -18,4 +18,6 @@ SHA1 (patch-src_crashprint.cpp) = a96e8aa980eb3b19c3dce3343582511d608e6625 SHA1 (patch-src_glu_CMakeLists.txt) = d63494a41071097252ac9e2cb95db75041f30b62 SHA1 (patch-src_mipmap_mipmap.c) = 3bdb2c37e7a6d89fc6a531af6e0396a1ff385aeb SHA1 (patch-src_ocpndc.cpp) = cd425bec24050176a08e7ec8280bf853fd10c756 +SHA1 (patch-src_printtable.cpp) = 52ed0f09610d56e9acc5ec9b8e4cbdc7ad55d043 +SHA1 (patch-src_routeprintout.cpp) = c0f960b76b1b7a8acb7e5faca5f656a5c259f02c SHA1 (patch-src_tcmgr.cpp) = 3fb4edf3368f3f3907f231ebcabd8e5061699040 diff --git a/geography/opencpn/patches/patch-src_printtable.cpp b/geography/opencpn/patches/patch-src_printtable.cpp new file mode 100644 index 00000000000..a9d70a3e89f --- /dev/null +++ b/geography/opencpn/patches/patch-src_printtable.cpp @@ -0,0 +1,24 @@ +$NetBSD: patch-src_printtable.cpp,v 1.3 2017/09/25 22:31:25 joerg Exp $ + +Repeat after me: I don't know what 3rd party headers are doing, so I +won't inflict my namespace decisions on them. + +--- src/printtable.cpp.orig 2017-09-25 20:13:02.634455468 +0000 ++++ src/printtable.cpp +@@ -28,7 +28,6 @@ + #include <sstream> + #include <vector> + #include <algorithm> +-using namespace std; + + #include "wx/wxprec.h" + +@@ -74,6 +73,8 @@ using namespace std; + + #include "printtable.h" + ++using namespace std; ++ + void PrintCell::Init( const wxString& _content, wxDC* _dc, int _width, int _cellpadding, bool _bold_font ) + { + bold_font = _bold_font; diff --git a/geography/opencpn/patches/patch-src_routeprintout.cpp b/geography/opencpn/patches/patch-src_routeprintout.cpp new file mode 100644 index 00000000000..d61eb218fae --- /dev/null +++ b/geography/opencpn/patches/patch-src_routeprintout.cpp @@ -0,0 +1,24 @@ +$NetBSD: patch-src_routeprintout.cpp,v 1.3 2017/09/25 22:31:25 joerg Exp $ + +Repeat after me: I don't know what 3rd party headers are doing, so I +won't inflict my namespace decisions on them. + +--- src/routeprintout.cpp.orig 2017-09-25 20:10:38.997900156 +0000 ++++ src/routeprintout.cpp +@@ -24,7 +24,6 @@ + **************************************************************************/ + + #include <iostream> +-using namespace std; + + #include "wx/wxprec.h" + +@@ -79,6 +78,8 @@ using namespace std; + #define PRINT_WP_DISTANCE 3 + #define PRINT_WP_DESCRIPTION 4 + ++using namespace std; ++ + // Global print data, to remember settings during the session + extern wxPrintData* g_printData; + // Global page setup data |