diff options
Diffstat (limited to 'geography/opencpn/patches')
| -rw-r--r-- | geography/opencpn/patches/patch-CMakeLists.txt | 39 | ||||
| -rw-r--r-- | geography/opencpn/patches/patch-plugins_grib_pi_src_GribUIDialog.cpp | 35 |
2 files changed, 16 insertions, 58 deletions
diff --git a/geography/opencpn/patches/patch-CMakeLists.txt b/geography/opencpn/patches/patch-CMakeLists.txt index 46c7c40ec14..a2c59099a3e 100644 --- a/geography/opencpn/patches/patch-CMakeLists.txt +++ b/geography/opencpn/patches/patch-CMakeLists.txt @@ -1,24 +1,16 @@ -$NetBSD: patch-CMakeLists.txt,v 1.4 2016/05/21 10:50:41 bouyer Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.5 2017/04/14 16:20:15 bouyer Exp $ ---- CMakeLists.txt.orig 2016-02-03 18:44:17.000000000 +0100 -+++ CMakeLists.txt 2016-05-21 12:06:28.121554591 +0200 -@@ -81,7 +81,6 @@ - # SET (PACKAGE_DEPS "wxGTK mesa-libGLU mesa-libGL gettext zlib bzip2 portaudio") - IF (CMAKE_SIZEOF_VOID_P MATCHES "8") - SET (ARCH "x86_64") -- SET (LIB_INSTALL_DIR "lib64") - ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8") - SET (ARCH "i386") - SET (LIB_INSTALL_DIR "lib") -@@ -92,7 +91,6 @@ - # SET (PACKAGE_DEPS "libwx_baseu-2_8-0-wxcontainer MesaGLw libbz2-1 portaudio") - IF (CMAKE_SIZEOF_VOID_P MATCHES "8") - SET (ARCH "x86_64") -- SET (LIB_INSTALL_DIR "lib64") - ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8") - SET (ARCH "i386") - SET (LIB_INSTALL_DIR "lib") -@@ -282,7 +280,7 @@ +--- CMakeLists.txt.orig 2017-04-02 05:17:09.000000000 +0200 ++++ CMakeLists.txt 2017-04-14 13:06:55.000000000 +0200 +@@ -99,7 +99,6 @@ + ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "arm*") + IF (CMAKE_SIZEOF_VOID_P MATCHES "8") + SET (ARCH "x86_64") +- SET (LIB_INSTALL_DIR "lib64") + ELSE (CMAKE_SIZEOF_VOID_P MATCHES "8") + SET (ARCH "i386") + SET (LIB_INSTALL_DIR "lib") +@@ -318,7 +317,7 @@ # Search for opengles, short of running a program to test the speed # of acceleration, I simply use gles on "native linux" arm systems @@ -27,17 +19,18 @@ $NetBSD: patch-CMakeLists.txt,v 1.4 2016/05/21 10:50:41 bouyer Exp $ find_path(OPENGLESv1_INCLUDE_DIR GLES/gl.h ) IF (OPENGLESv1_INCLUDE_DIR) MESSAGE (STATUS "Found OpenGLESv1") -@@ -1755,9 +1753,10 @@ +@@ -1861,10 +1860,10 @@ # Certain older Cmake FindGTK2 modules ( e.g. cmake-2.8.0-2) do not yield all of the required link libraries # So, add them manually. These declarations may be redundant in some architectures, but do no harm. -IF(UNIX) -TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} dl ) -ENDIF(UNIX) +- +IF(CMAKE_SYSTEM_NAME MATCHES ".*Linux") + TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} dl ) + SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--export-dynamic") +ENDIF(CMAKE_SYSTEM_NAME MATCHES ".*Linux") - IF(QT_LINUX) - TARGET_LINK_LIBRARIES( ${PACKAGE_NAME} Qt5Widgets Qt5OpenGL Qt5Gui Qt5Test Qt5Core ) + IF( UNIX AND NOT APPLE ) + FIND_PATH( LIBELF_INCLUDE_DIR NAMES libelf.h gelf.h PATH_SUFFIXES libelf ) diff --git a/geography/opencpn/patches/patch-plugins_grib_pi_src_GribUIDialog.cpp b/geography/opencpn/patches/patch-plugins_grib_pi_src_GribUIDialog.cpp deleted file mode 100644 index f1b5b7bd93a..00000000000 --- a/geography/opencpn/patches/patch-plugins_grib_pi_src_GribUIDialog.cpp +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-plugins_grib_pi_src_GribUIDialog.cpp,v 1.1 2016/06/16 15:52:56 bouyer Exp $ - -from https://github.com/OpenCPN/OpenCPN/pull/662 -fix grib plugin timeline request from crashing when no grib file is loaded - ---- plugins/grib_pi/src/GribUIDialog.cpp.orig -+++ plugins/grib_pi/src/GribUIDialog.cpp -@@ -1251,11 +1251,14 @@ wxDateTime GRIBUICtrlBar::TimelineTime() - int tl = (m_TimeLineHours == 0) ? 0 : m_sTimeline->GetValue(); - int stepmin = m_OverlaySettings.GetMinFromIndex(m_OverlaySettings.m_SlicesPerUpdate); - return MinTime() + wxTimeSpan( tl * stepmin / 60, (tl * stepmin) % 60 ); -- } else { -- ArrayOfGribRecordSets *rsa = m_bGRIBActiveFile->GetRecordSetArrayPtr(); -- int index = m_cRecordForecast->GetCurrentSelection() < 1 ? 0 : m_cRecordForecast->GetCurrentSelection(); -- return rsa->Item(index).m_Reference_Time; - } -+ -+ ArrayOfGribRecordSets *rsa = m_bGRIBActiveFile->GetRecordSetArrayPtr(); -+ int index = m_cRecordForecast->GetCurrentSelection() < 1 ? 0 : m_cRecordForecast->GetCurrentSelection(); -+ if(rsa && index<rsa->GetCount()) -+ return rsa->Item(index).m_Reference_Time; -+ -+ return wxDateTime::Now(); - } - - wxDateTime GRIBUICtrlBar::MinTime() -@@ -1265,7 +1268,7 @@ wxDateTime GRIBUICtrlBar::MinTime() - GribRecordSet &first = rsa->Item(0); - return first.m_Reference_Time; - } -- return wxDateTime(0.0); -+ return wxDateTime::Now(); - } - - GribTimelineRecordSet* GRIBUICtrlBar::GetTimeLineRecordSet(wxDateTime time) |