CVS commit: pkgsrc/geography/opencpn

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Mon Sep 25 22:31:25 UTC 2017

Modified Files:
        pkgsrc/geography/opencpn: distinfo
Added Files:
        pkgsrc/geography/opencpn/patches: patch-src_printtable.cpp
            patch-src_routeprintout.cpp

Log Message:
Reduce namespace pollution.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/geography/opencpn/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/geography/opencpn/patches/patch-src_printtable.cpp \
    pkgsrc/geography/opencpn/patches/patch-src_routeprintout.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/opencpn/distinfo
diff -u pkgsrc/geography/opencpn/distinfo:1.14 pkgsrc/geography/opencpn/distinfo:1.15
--- pkgsrc/geography/opencpn/distinfo:1.14      Tue Sep 12 17:31:20 2017
+++ pkgsrc/geography/opencpn/distinfo   Mon Sep 25 22:31:25 2017
@@ -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) = a96e8a
 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

Added files:

Index: pkgsrc/geography/opencpn/patches/patch-src_printtable.cpp
diff -u /dev/null pkgsrc/geography/opencpn/patches/patch-src_printtable.cpp:1.3
--- /dev/null   Mon Sep 25 22:31:25 2017
+++ pkgsrc/geography/opencpn/patches/patch-src_printtable.cpp   Mon Sep 25 22:31:25 2017
@@ -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;
Index: pkgsrc/geography/opencpn/patches/patch-src_routeprintout.cpp
diff -u /dev/null pkgsrc/geography/opencpn/patches/patch-src_routeprintout.cpp:1.3
--- /dev/null   Mon Sep 25 22:31:25 2017
+++ pkgsrc/geography/opencpn/patches/patch-src_routeprintout.cpp        Mon Sep 25 22:31:25 2017
@@ -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