CMakeLists.txt

@@ -601,6 +601,56 @@ ENDIF(UNIX AND NOT QT_ANDROID)
 
 ENDIF (NOT WIN32 AND NOT APPLE)
 
+OPTION(OCPN_NEW_SERIAL "Use new serial communication implementation" ON)
+
+IF( NOT APPLE )
+    SET(OCPN_NEW_SERIAL "OFF")
+ENDIF( NOT APPLE )    
+
+IF(OCPN_NEW_SERIAL)
+  if(APPLE)
+    find_library(IOKIT_LIBRARY IOKit)
+    find_library(FOUNDATION_LIBRARY Foundation)
+  endif()
+
+  ## Sources
+  set(serial_SRCS
+    src/serial/src/serial.cc
+    src/serial/include/serial/serial.h
+    src/serial/include/serial/v8stdint.h
+  )
+  if(APPLE)
+    # If OSX
+    list(APPEND serial_SRCS src/serial/src/impl/unix.cc)
+    list(APPEND serial_SRCS src/serial/src/impl/list_ports/list_ports_osx.cc)
+  elseif(UNIX)
+    # If unix
+    list(APPEND serial_SRCS src/serial/src/impl/unix.cc)
+    list(APPEND serial_SRCS src/serial/src/impl/list_ports/list_ports_linux.cc)
+  else()
+    # If windows
+    list(APPEND serial_SRCS src/serial/src/impl/win.cc)
+    list(APPEND serial_SRCS src/serial/src/impl/list_ports/list_ports_win.cc)
+  endif()
+
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/serial/include)
+
+  ## Add serial library
+  add_library(SERIAL ${serial_SRCS})
+  if(APPLE)
+    target_link_libraries(SERIAL ${FOUNDATION_LIBRARY} ${IOKIT_LIBRARY})
+  elseif(UNIX)
+    target_link_libraries(SERIAL rt pthread)
+  else()
+    target_link_libraries(SERIAL setupapi)
+  endif()
+
+  set(EXTRA_LIBS ${EXTRA_LIBS} SERIAL)
+  add_definitions(-DocpnUSE_NEWSERIAL)
+
+  message(STATUS "Using new serial library...")
+ENDIF(OCPN_NEW_SERIAL)
+
 OPTION(OCPN_USE_CURL "Use Curl libraries" ON)
 
 IF(OCPN_USE_CURL)

VERSION.cmake

 SET(VERSION_MAJOR "4")
 SET(VERSION_MINOR "8")
-SET(VERSION_PATCH "6")
-SET(VERSION_DATE "2018-08-02")
+SET(VERSION_PATCH "8")
+SET(VERSION_DATE "2018-11-06")

debian/DRAFT

-This is still a draft blocked on the wxsvg dependency under review.

debian/README.Debian

@@ -11,7 +11,4 @@ with possible data located in /usr/share/opencpn/plugins/<plugin>
 Free NOAA nautical charts can be downloaded from:
   http://www.nauticalcharts.noaa.gov/mcd/Raster/
 
-
-
-
  -- Alec Leamas <leamas.alec@gmail.com>  Sun, 22 Jul 2018 14:26:36 +0200

debian/changelog

-opencpn (4.8.6~20180801.8d20a06+dfsg.1-1) unstable; urgency=medium
+opencpn (4.8.8+dfsg.1-1) unstable; urgency=medium
 
   * New upstream version
   * Fix ITP bugs. (closes: #907065, closes: #538067).

debian/compat

-9
+11

debian/control

@@ -3,9 +3,8 @@ Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Alec Leamas <leamas.alec@gmail.com>
 Section: misc
 Priority: optional
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 11),
  cmake,
- desktop-file-utils,
  libarchive-dev,
  libbz2-dev,
  libcurl4-gnutls-dev,
@@ -23,7 +22,7 @@ Build-Depends: debhelper (>= 9),
  libwxsvg-dev,
  portaudio19-dev
 Standards-Version: 4.3.0
-Homepage: http://opencpn.org
+Homepage: https://opencpn.org
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/opencpn
 Vcs-Git: https://salsa.debian.org/debian-gis-team/opencpn.git
 
@@ -50,7 +49,7 @@ Description: Open Source Chartplotter and Marine GPS Navigation Software
 
 Package: opencpn-data
 Architecture: all
-Depends: opencpn (>= ${source:Version}), ${misc:Depends}
+Depends: ${misc:Depends}
 Description: Open Source Chartplotter and Marine GPS Navigation Software (data)
  Chart Plotter and Navigational software program for use underway
  or as a planning tool. Developed by a team of active sailors using real
@@ -64,6 +63,6 @@ Description: Open Source Chartplotter and Marine GPS Navigation Software (data)
 
 Package: opencpn-plugins
 Architecture: all
-Depends: ${misc:Depends}, opencpn (>= 4.8.6~20180801.8d20a06+dfsg.1)
+Depends: opencpn (>= 4.8.6~20180801.8d20a06+dfsg.1), ${misc:Depends}
 Description: Open Source Chartplotter and Marine GPS Navigation Software (transition)
  This package is a transitional, empty package.

debian/copyright

 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: OpenCPN
 Upstream-Contact: Dave S. Register <bdbcat@yahoo.com>
-Source: http://www.opencpn.org
+Source: https://github.com/OpenCPN/OpenCPN.git
 Files-Excluded: .*
  buildosx*
  buildandroid*
@@ -11,6 +11,7 @@ Files-Excluded: .*
  plugins/chartdldr_pi/src/tinyxml*
  plugins/chartdldr_pi/src/unarr*
  plugins/grib_pi/src/bzip2*
+ src/serial*
  src/texcmp/lz4*
  src/tinyxml*
  src/wxsvg* 
@@ -32,11 +33,11 @@ Copyright: 2000-2018 The OpenCPN Authors
            2016,       Sean D'Epagnier
            2004,2006,  Robert Lipe, robertlipe@usa.net
            2004-2006,  Robert Lipe, robertlipe@usa.net
-  2005-2006, Robert Lipe, robertlipe@usa.net
+           2005-2006, .Robert Lipe, robertlipe@usa.net
            2006,       Robert Lipe, robertlipe@usa.net
            2007        Transmitterdan
            2016        Transmitterdan
-  2008, - Jacques Zaninetti - http:www.zygrib.org
+           2008,       Jacques Zaninetti - http:www.zygrib.org
            2010,       Anders Lund <anders@alweb.dk>
            2006-2013,  Brainspark B.V.
            2006-2014,  Brainspark B.V.
@@ -58,11 +59,11 @@ Copyright: 2013 Ryan Hileman
            2012-2013, Wladimir J. van der Laan
            1998-1999, Precision Insight, Inc., Cedar Park, Texas.
            2007-2008, Red Hat, Inc.
-  IBM Corporation 2004
+           2004       IBM Corporation
            2008-2009, 2011, Attractive Chaos <attractor@live.co.uk>
            2009,      VMware, Inc.
-License: Expat
 Comment: https://github.com/lunixbochs/glshim/blob/unstable/LICENSE
+License: Expat
 
 Files: src/glshim/include/GL/glu.h src/glu/*
 Copyright: 1991-2000, Silicon Graphics, Inc.
@@ -263,7 +264,6 @@ Copyright: 2006, Matthias Kretz, <kretz@kde.org>
            2011, Michael Jansen, <kde@michael-jansen.biz>
 License: BSD-CMAKE
 
-
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify  
  it under the terms of the GNU General Public License as published by 
@@ -274,7 +274,6 @@ License: GPL-2+
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
-
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -285,7 +284,6 @@ License: GPL-3+
  License version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
 
-
 License: LGPL-2+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Library General Public
@@ -296,7 +294,6 @@ License: LGPL-2+
  License version 2 can be found in the file
  `/usr/share/common-licenses/LGPL-2'.
 
-
 License: wxWidgets
  wxWindows Library License, Version 3.1
  Copyright (c) 1998-2005 Julian Smart, Robert Roebling et al
@@ -345,7 +342,6 @@ License: wxWidgets
  you must delete the exception notice from such code and/or adjust the licensing '
  conditions notice accordingly.
 
-
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the "Software"),
@@ -365,7 +361,6 @@ License: Expat
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
 
-
 License: SGI-B-1.1
  License Applicability. Except to the extent portions of this file are
  made subject to an alternative license as permitted in the SGI Free
@@ -394,7 +389,6 @@ License: SGI-B-1.1
  not been independently verified as being compliant with the OpenGL(R)
  version 1.2.1 Specification.
 
-
 License: SGI-B-2.0
  SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
  Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved
@@ -424,7 +418,6 @@ License: SGI-B-2.0
  other dealings in this Software without prior written authorization from
  Silicon Graphics, Inc.
 
-
 License: Jasper
  Jasper License Version 2.0
  All rights reserved
@@ -472,7 +465,6 @@ License: Jasper
  RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
  EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
 
-
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
@@ -494,7 +486,6 @@ License: BSD-2-clause
  OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-
 License: BSD-3-clause
  Redistribution and use in source and binary forms are permitted
  provided that the above copyright notice and this paragraph are
@@ -509,7 +500,6 @@ License: BSD-3-clause
  WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 
-
 License: BSD-CMAKE
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -534,7 +524,6 @@ License: BSD-CMAKE
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE
 
-
 License: MIT-KHRONOS
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and/or associated documentation files (the

debian/opencpn.lintian-overrides

 # False positives: -DFORTIFY_SOURCE=2 is actually applied compiling these.
-opencpn binary : hardening-no-fortify-functions usr/lib/opencpn/libchartdldr_pi.so
-opencpn binary : hardening-no-fortify-functions usr/lib/opencpn/libdashboard_pi.so
+hardening-no-fortify-functions usr/lib/opencpn/libchartdldr_pi.so
+hardening-no-fortify-functions usr/lib/opencpn/libdashboard_pi.so
 
 # Other spelling errors: needs to be handled upstream, see 
 # https://github.com/OpenCPN/OpenCPN/issues/1141
-opencpn binary: spelling-error-in-binary usr/bin/opencpn *
-opencpn binary: spelling-error-in-binary usr/lib/opencpn/libgrib_pi.so *
+spelling-error-in-binary usr/bin/opencpn *
 
 # exit calls: Needs to be fixed upstream: 
 # https://github.com/OpenCPN/OpenCPN/issues/1140
-opencpn binary: shlib-calls-exit usr/lib/opencpn/libgrib_pi.so
-
+shlib-calls-exit usr/lib/opencpn/libgrib_pi.so

debian/patches/0001-Build-Add-the-USE_BUNDLED_DOCS-cmake-configuration.patch

@@ -14,7 +14,7 @@ cmake will use the system libraries if available.
  1 file changed, 6 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a100068..ba81181 100644
+index 0412340..70a24e5 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -201,6 +201,12 @@ ELSE(APPLE OR WIN32)

debian/patches/0002-Build-Use-external-wxsvg-library-if-available.patch

@@ -9,7 +9,7 @@ Applied-Upstream: 5.0.0
  1 file changed, 18 insertions(+), 7 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ba81181..e7fbf65 100644
+index 70a24e5..8a30753 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -207,6 +207,7 @@ ELSE(UNIX)
@@ -20,7 +20,7 @@ index ba81181..e7fbf65 100644
  IF(APPLE OR WIN32)
    IF(NOT BUNDLE_DOCS)
      SET (BUNDLE_DOCS "ON")
-@@ -871,13 +872,23 @@ IF(OCPN_USE_SVG)
+@@ -921,13 +922,23 @@ IF(OCPN_USE_SVG)
          )
          ADD_DEFINITIONS(-DwxsvgUSE_EXIF) 
      endif()

debian/patches/0003-Build-Use-system-lz4-libs-if-available.patch

@@ -9,10 +9,10 @@ Applied-Upstream: 5.0.0
  1 file changed, 15 insertions(+), 6 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e7fbf65..c26fe24 100644
+index 8a30753..7b990ab 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1449,10 +1449,7 @@ SET(EXTRA_LIBS ${EXTRA_LIBS} SYMBOLS)
+@@ -1499,10 +1499,7 @@ SET(EXTRA_LIBS ${EXTRA_LIBS} SYMBOLS)
  
  # Compile texcompression support library
  IF (OPENGL_FOUND)
@@ -23,7 +23,7 @@ index e7fbf65..c26fe24 100644
      src/texcmp/squish/alpha.cpp
      src/texcmp/squish/clusterfit.cpp
      src/texcmp/squish/colourblock.cpp
-@@ -1464,10 +1461,22 @@ IF (OPENGL_FOUND)
+@@ -1514,10 +1511,22 @@ IF (OPENGL_FOUND)
      src/texcmp/squish/singlecolourfitfast.cpp
      src/texcmp/squish/twocolourfitfast.cpp
      src/texcmp/squish/squish.cpp

debian/patches/0005-Build-Streamline-some-diagnostics-print-cmake-versio.patch

@@ -15,7 +15,7 @@ consistently.
  2 files changed, 17 insertions(+), 16 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c26fe24..1117a72 100644
+index 7b990ab..7f4d13f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -40,6 +40,7 @@ ENDIF (COMMAND cmake_policy)
@@ -26,7 +26,7 @@ index c26fe24..1117a72 100644
  
  IF(APPLE)
    SET(PACKAGE_NAME OpenCPN)
-@@ -624,8 +625,8 @@ IF(NOT QT_ANDROID)
+@@ -674,8 +675,8 @@ IF(NOT QT_ANDROID)
          FIND_PACKAGE(CURL REQUIRED)
          INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIR})
      ELSE(OCPN_USE_EXTERN_CURL)
@@ -37,7 +37,7 @@ index c26fe24..1117a72 100644
      ENDIF(OCPN_USE_EXTERN_CURL)
      SET(SRC_WXCURL
          src/wxcurl/base.cpp
-@@ -1263,13 +1264,13 @@ ENDIF(OPENGL_FOUND)
+@@ -1313,13 +1314,13 @@ ENDIF(OPENGL_FOUND)
  
  
  IF(TINYXML_FOUND)

debian/patches/0006-CMakelists-Fix-FTBS-on-Debian-sid-likely-other-gtk3-.patch

@@ -17,7 +17,7 @@ APPLE or QT_ANDROID comes to mind.
  1 file changed, 13 insertions(+), 7 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1117a72..cfebf6a 100644
+index 7f4d13f..46effb1 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -440,14 +440,16 @@ set (WXWIDGETS_FORCE_VERSION CACHE VERSION "Force usage of a specific wxWidgets
@@ -43,7 +43,7 @@ index 1117a72..cfebf6a 100644
  MESSAGE (STATUS "Found wxWidgets..." )
      MESSAGE (STATUS " wxWidgets Includ: ${wxWidgets_INCLUDE_DIRS}")
      MESSAGE (STATUS " wxWidgets Libraries: ${wxWidgets_LIBRARIES}")
-@@ -902,6 +904,7 @@ IF(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID)
+@@ -952,6 +954,7 @@ IF(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID)
    ENDIF(NOT OCPN_FORCE_GTK3)
  
    IF(GTK2_FOUND)
@@ -51,7 +51,7 @@ index 1117a72..cfebf6a 100644
      INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS})
      SET(GTK_LIBRARIES ${GTK2_LIBRARIES})
      MESSAGE(STATUS "Building against GTK2...")
-@@ -909,9 +912,12 @@ IF(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID)
+@@ -959,9 +962,12 @@ IF(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID)
      FIND_PACKAGE(GTK3)
      INCLUDE_DIRECTORIES(${GTK3_INCLUDE_DIRS})
      SET(GTK_LIBRARIES ${GTK3_LIBRARIES})

debian/patches/0007-Unix-Add-a-simple-manpage.patch

@@ -17,10 +17,10 @@ Also, Debian requires a manpage.
  create mode 100644 opencpn.1
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cfebf6a..6e896a4 100644
+index 46effb1..ca76ccd 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -2040,6 +2040,8 @@ IF(UNIX)
+@@ -2090,6 +2090,8 @@ IF(UNIX)
    INSTALL(FILES data/opencpn.png DESTINATION ${PREFIX_DATA}/icons/hicolor/48x48/apps PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
    INSTALL(FILES src/bitmaps/other_svg_src/opencpn.svg DESTINATION ${PREFIX_DATA}/icons/hicolor/scalable/apps PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
    INSTALL(FILES data/opencpn.desktop DESTINATION ${PREFIX_DATA}/applications PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ )

debian/patches/0011-build-System-wxsvg-detection-bugfix.patch

@@ -8,10 +8,10 @@ Bug: https://github.com/OpenCPN/OpenCPN/pull/1155
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0b9b5cd..fe7df11 100644
+index 141d5e8..3069207 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -877,11 +877,11 @@ IF(OCPN_USE_SVG)
+@@ -927,11 +927,11 @@ IF(OCPN_USE_SVG)
      endif()
  
      PKG_SEARCH_MODULE(WXSVG libwxsvg wxsvg)
@@ -25,7 +25,7 @@ index 0b9b5cd..fe7df11 100644
        message (STATUS "Building with bundled wxsvg includes")
        ADD_LIBRARY(WXSVG ${SRC_WXSVG})
        TARGET_LINK_LIBRARIES(WXSVG ${SVG_LIBS})
-@@ -891,7 +891,7 @@ IF(OCPN_USE_SVG)
+@@ -941,7 +941,7 @@ IF(OCPN_USE_SVG)
        INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src/wxsvg/src)
        set_property(TARGET WXSVG PROPERTY COMPILE_FLAGS "${OBJ_VISIBILITY}")
        SET(EXTRA_LIBS ${EXTRA_LIBS} WXSVG)

debian/patches/0012-Linux-plugin-loading-Support-multiple-plugin-directo.patch

@@ -58,7 +58,7 @@ index 20459dd..ab7ba9a 100644
          
          
 diff --git a/src/pluginmanager.cpp b/src/pluginmanager.cpp
-index 389b4ba..2a14eb4 100644
+index c68544d..d21ee86 100644
 --- a/src/pluginmanager.cpp
 +++ b/src/pluginmanager.cpp
 @@ -131,6 +131,9 @@ extern bool             g_bopengl;

debian/patches/0013-Linux-plugin-loading-Support-shell-expansions-clarif.patchA

@@ -14,7 +14,7 @@ used verbatim.
  1 file changed, 13 insertions(+), 1 deletion(-)
 
 diff --git a/src/pluginmanager.cpp b/src/pluginmanager.cpp
-index 2a14eb4..45e07df 100644
+index d21ee86..772e665 100644
 --- a/src/pluginmanager.cpp
 +++ b/src/pluginmanager.cpp
 @@ -24,6 +24,9 @@

debian/patches/0014-Linux-plugin-loading-Support-data-dirs-in-different-.patch

@@ -63,7 +63,7 @@ index 715569e..9dfea60 100644
 +
 + #endif //_PLUGIN_H_
 diff --git a/src/pluginmanager.cpp b/src/pluginmanager.cpp
-index 45e07df..a846eda 100644
+index 772e665..7ddf81b 100644
 --- a/src/pluginmanager.cpp
 +++ b/src/pluginmanager.cpp
 @@ -134,6 +134,9 @@ extern bool             g_bopengl;