OpenCPN: update to 5.0.0.

srcpkgs/OpenCPN/patches/musl.patch

@@ -1,15 +1,25 @@
---- CMakeLists.txt	2018-11-07 04:14:41.000000000 +0100
+--- src/chart1.cpp	2019-03-23 02:25:59.000000000 +0100
-+++ -	2018-11-26 08:12:38.571296363 +0100
++++ -	2019-03-29 07:24:46.107362311 +0100
-@@ -1253,8 +1253,10 @@
+@@ -8002,7 +8002,7 @@
-     )
+             }
+         }
+     }
+-    
++#ifdef __GLIBC__
+            struct mallinfo mi;
  
- IF(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID)
+            mi = mallinfo();
--  SET(HDRS ${HDRS} include/crashprint.h )
+@@ -8018,11 +8018,11 @@
--  SET(SRCS ${SRCS} src/crashprint.cpp)
+            //printf("Total free space (fordblks):           %d\n", mi.fordblks);
-+  IF(OCPN_USE_CRASHREPORT)
+            //printf("Topmost releasable block (keepcost):   %d\n", mi.keepcost);
-+    SET(HDRS ${HDRS} include/crashprint.h )
-+    SET(SRCS ${SRCS} src/crashprint.cpp)
-+  ENDIF(OCPN_USE_CRASHREPORT)
- ENDIF(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID)
  
- IF(QT_ANDROID)
+-           printf("\n");
+            
+            if(mem_used)
+                *mem_used = mi.uordblks / 1024;
+-
++#endif
++           printf("\n");
+            //printf("mem_used (Mb):  %d\n", *mem_used / 1024);
+ 	   return true;
+ #endif /* linux */

srcpkgs/OpenCPN/patches/wxWidgets-cmake.patch

@@ -0,0 +1,79 @@
+diff --git CMakeLists.txt CMakeLists.txt
+index fcec1191a..8df2a9e21 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -408,9 +408,9 @@ IF((_wx_selected_config MATCHES "qt-armv7"))
+ ENDIF()
+
+ IF((_wx_selected_config MATCHES "qt-armv7"))
+-  SET(wxWidgets_USE_LIBS base core xml html adv aui)
++  SET(wxWidgets_FIND_COMPONENTS base core xml html adv aui)
+ ELSE()
+-  SET(wxWidgets_USE_LIBS net xml html adv aui core base webview)
++  SET(wxWidgets_FIND_COMPONENTS net xml html adv aui core base webview)
+ ENDIF()
+
+ OPTION (USE_GL "Enable OpenGL support" ON)
+@@ -436,7 +436,7 @@ IF (ARCH MATCHES "arm*" AND (NOT QT_ANDROID) AND CMAKE_SYSTEM_NAME MATCHES ".*Li
+     SET(OPENGLES_FOUND "YES")
+     SET(OPENGL_FOUND "YES")
+
+-    SET(wxWidgets_USE_LIBS ${wxWidgets_USE_LIBS} gl )
++    SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_FIND_COMPONENTS} gl )
+     add_subdirectory(src/glshim)
+
+     SET(OPENGL_LIBRARIES "GL_static" "EGL" "X11" "drm"  )
+@@ -455,7 +455,7 @@ IF(QT_ANDROID)
+   SET(OPENGLES_FOUND "YES")
+   SET(OPENGL_FOUND "YES")
+
+-  SET(wxWidgets_USE_LIBS ${wxWidgets_USE_LIBS} gl )
++  SET(wxWidgets_FIND_COMPONENTS ${wxWidgets_FIND_COMPONENTS} gl )
+   add_subdirectory(src/glshim)
+ ENDIF(QT_ANDROID)
+
+@@ -468,7 +468,7 @@ IF ((NOT OPENGLES_FOUND) AND (NOT QT_ANDROID))
+   ENDIF(USE_GL)
+
+   IF(OPENGL_FOUND)
+-    SET(wxWidgets_USE_LIBS gl ${wxWidgets_USE_LIBS} )
++    SET(wxWidgets_FIND_COMPONENTS gl ${wxWidgets_FIND_COMPONENTS} )
+     INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
+
+     MESSAGE (STATUS "Found OpenGL...." )
+@@ -529,14 +529,14 @@ IF(NOT QT_ANDROID)
+   ENDIF(MSVC)
+
+   IF(WIN32 OR APPLE OR QT_ANDROID)
+-    FIND_PACKAGE(wxWidgets)
++    FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_FIND_COMPONENTS})
+     if (wxWidgets_FOUND)
+       message(STATUS "Found wxWidgets webview add-on")
+       add_definitions(-DOCPN_USE_WEBVIEW)
+     else ()
+-      list(REMOVE_ITEM wxWidgets_USE_LIBS webview)
++      list(REMOVE_ITEM wxWidgets_FIND_COMPONENTS webview)
+       message(STATUS "Could not find wxWidgets webview add-on")
+-      FIND_PACKAGE(wxWidgets REQUIRED)
++      FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS ${wxWidgets_FIND_COMPONENTS})
+     endif ()
+     IF(MSYS)
+       # this is to convert msys to windows paths, and handle the missing /usr
+@@ -1053,14 +1053,14 @@ IF(NOT WIN32 AND NOT APPLE AND NOT QT_ANDROID)
+     set(wxWidgets_CONFIG_OPTIONS ${wxWidgets_CONFIG_OPTIONS} --toolkit=gtk3)
+     MESSAGE(STATUS "Building against GTK3...")
+   ENDIF(GTK2_FOUND)
+-  FIND_PACKAGE(wxWidgets)
++  FIND_PACKAGE(wxWidgets COMPONENTS ${wxWidgets_FIND_COMPONENTS})
+   if (wxWidgets_FOUND)
+     message(STATUS "Found wxWidgets webview add-on")
+     add_definitions(-DOCPN_USE_WEBVIEW)
+   else ()
+-    list(REMOVE_ITEM wxWidgets_USE_LIBS webview)
++    list(REMOVE_ITEM wxWidgets_FIND_COMPONENTS webview)
+     message(STATUS "Could not find wxWidgets webview add-on")
+-    FIND_PACKAGE(wxWidgets REQUIRED)
++    FIND_PACKAGE(wxWidgets REQUIRED COMPONENTS ${wxWidgets_FIND_COMPONENTS})
+   endif ()
+   MESSAGE (STATUS "Found wxWidgets..." )
+   MESSAGE (STATUS " wxWidgets Include: ${wxWidgets_INCLUDE_DIRS}")

srcpkgs/OpenCPN/template

@@ -1,6 +1,6 @@
 # Template file for 'OpenCPN'
 pkgname=OpenCPN
-version=4.8.8
+version=5.0.0
 revision=1
 build_style=cmake
 configure_args="-DBUNDLE_GSHHS=NONE -DBUNDLE_TCDATA=ON
@@ -18,7 +18,7 @@ maintainer="John <johnz@posteo.net>"
 license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.0-or-later, MIT, wxWidgets, JasPer-2.0, BSD-3-Clause"
 homepage="https://opencpn.org/"
 distfiles="https://github.com/OpenCPN/OpenCPN/archive/v${version}.tar.gz"
-checksum=095097748ec45fcb9e9595ee86493ab629fad1a363eb5ec9b2ff82f0512fe875
+checksum=e58755fd9781c1a0f2da1244b75358c8d03d8f79ec2aa9633e5f6b5af98978b4
 
 build_options="lzma libarchive exif crashreport"
 build_options_default="lzma libarchive exif"