gis/opencpn: Updated for version 5.0.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 113 insertions, 0 deletions

diff --git a/gis/opencpn/patches/cmake_build_fix.patch b/gis/opencpn/patches/cmake_build_fix.patch
new file mode 100644
index 0000000000..aca98fe9f0
--- /dev/null
+++ b/gis/opencpn/patches/cmake_build_fix.patch
@@ -0,0 +1,79 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fcec1191a..8df2a9e21 100644
+--- a/CMakeLists.txt
++++ b/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}")
diff --git a/gis/opencpn/patches/honor_mandir.patch b/gis/opencpn/patches/honor_mandir.patch
new file mode 100644
index 0000000000..8a92dd86c8
--- /dev/null
+++ b/gis/opencpn/patches/honor_mandir.patch
@@ -0,0 +1,20 @@
+diff -up OpenCPN-5.0.0/CMakeLists.txt.orig OpenCPN-5.0.0/CMakeLists.txt
+--- OpenCPN-5.0.0/CMakeLists.txt.orig	2019-04-03 13:49:21.423885285 -0500
++++ OpenCPN-5.0.0/CMakeLists.txt	2019-04-03 13:51:19.789880135 -0500
+@@ -91,6 +91,7 @@ SET(CMAKE_MODULE_PATH
+   ${CMAKE_SOURCE_DIR}/cmake
+ )
+ 
++SET(MAN_PATH "man/man1")
+ 
+ set (CMAKE_CXX_STANDARD 11)
+ message(STATUS "Setting C++11 standard via cmake standard mechanism")
+@@ -2422,7 +2423,7 @@ IF(NOT APPLE)
+     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 )
+     INSTALL(FILES data/opencpn.appdata.xml DESTINATION ${PREFIX_DATA}/appdata PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ )
+-    INSTALL(FILES opencpn.1 DESTINATION ${PREFIX_DATA}/man/man1 PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ )
++    INSTALL(FILES opencpn.1 DESTINATION ${MAN_PATH} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ )
+   ENDIF(UNIX)
+ 
+ ENDIF(NOT APPLE)
diff --git a/gis/opencpn/patches/opencpn-4.4.0-multilib-strict.patch b/gis/opencpn/patches/opencpn-4.4.0-multilib-strict.patch
new file mode 100644
index 0000000000..877e7beb8c
--- /dev/null
+++ b/gis/opencpn/patches/opencpn-4.4.0-multilib-strict.patch
@@ -0,0 +1,14 @@
+diff -up OpenCPN-4.4.0/CMakeLists.txt.orig OpenCPN-4.4.0/CMakeLists.txt
+--- OpenCPN-4.4.0/CMakeLists.txt.orig	2016-10-22 03:24:56.824710722 -0500
++++ OpenCPN-4.4.0/CMakeLists.txt	2016-10-22 03:28:10.592724737 -0500
+@@ -101,6 +101,9 @@ IF (NOT WIN32)
+   IF (EXISTS /etc/gentoo-release)
+     SET (LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
+   ENDIF (EXISTS /etc/gentoo-release)
++  IF (EXISTS /etc/slackware-version)
++    SET (LIB_INSTALL_DIR "lib${LIB_SUFFIX}")
++  ENDIF (EXISTS /etc/slackware-version)
+   IF(APPLE)
+     IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
+ #      IF (CMAKE_OSX_64)
+