Attachment 220956 Details for Bug 252168 – SVN diff

[patch] SVN diff

opecpn.diff (text/plain), 12.67 KB, created by ml on 2020-12-26 18:15:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: ml

Created: 2020-12-26 18:15:05 UTC

Size: 12.67 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 559302)
>+++ Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	opencpn
>-PORTVERSION=	5.2.0
>+PORTVERSION=	5.2.4
> DISTVERSIONPREFIX=	v
> CATEGORIES=	astro geography
> 
>@@ -25,32 +25,33 @@
> GH_PROJECT=	OpenCPN
> USE_GL=		gl
> USE_GNOME=	cairo gdkpixbuf2 gtk30 pango
>+USE_WX=		3.0+
>+WX_PREMK=	yes
>+WX_CONF_ARGS=	absolute
>+USE_XORG=	ice sm x11 xext
> INSTALLS_ICONS=	yes
> USE_LDCONFIG=	${PREFIX}/lib/opencpn
>-USE_WX=		3.0+
>-USE_XORG=	ice sm x11 xext
> 
> CMAKE_ARGS=	-DOCPN_BUNDLE_GSHHS=CRUDE
>-CMAKE_ON=	OCPN_BUNDLE_TCDATA OCPN_FORCE_GTK3
>+CMAKE_ON=	OCPN_BUNDLE_TCDATA OCPN_FORCE_GTK3 # OCPN_USE_CRASHREPORT
> CMAKE_OFF=	OCPN_USE_NEWSERIAL
>+CFLAGS+=	-fPIC
>+CXXFLAGS+=	-fPIC
>+LDFLAGS+=	-Wl,-E 		# plugins
>+LDFLAGS+=	-Wl,--as-needed # ICE, SM, Xext
> 
> OPTIONS_DEFINE=	DOCS
>+OPTIONS_SUB=	yes
> DOCS_CMAKE_ON=	-DOCPN_BUNDLE_DOCS:STRING="ON"
> DOCS_CMAKE_OFF=	-DOCPN_BUNDLE_DOCS:STRING="OFF"
> 
>-.include <bsd.port.options.mk>
>-
>-.if ${ARCH} == powerpc64
>-CMAKE_ARGS+=	-DHAVE_MSSE=OFF -DHAVE_MSSE2=OFF -DHAVE_MSSE3=OFF -DHAVE_MAVX2=OFF -DHAVE_MFPU_NEON=OFF
>-.endif
>-
> .include <bsd.port.pre.mk>
> 
> post-patch:
> 	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' \
>-		${WRKSRC}/libs/gdal/src/cpl_csv.cpp \
>-		${WRKSRC}/libs/gdal/src/cpl_findfile.cpp \
> 		${WRKSRC}/data/doc/help_en_US.html
>+	@${REINPLACE_CMD} -e 's,wx-config,${WX_CONFIG},' \
>+		${WRKSRC}/CMakeLists.txt
> .if ${ARCH} != amd64 && ${ARCH} != i386
> 	@${REINPLACE_CMD} -e '/-msse/d' -e '/-mssse3/d' \
> 		-e '/-mavx2/d' ${WRKSRC}/CMakeLists.txt
>Index: distinfo
>===================================================================
>--- distinfo	(revision 559302)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1599147212
>-SHA256 (OpenCPN-OpenCPN-v5.2.0_GH0.tar.gz) = f6ec38989bc38f5a7f63234c5e0230adeb73f5626b4e3d3dfa680f0c240badc7
>-SIZE (OpenCPN-OpenCPN-v5.2.0_GH0.tar.gz) = 78313969
>+TIMESTAMP = 1605894801
>+SHA256 (OpenCPN-OpenCPN-v5.2.4_GH0.tar.gz) = 8b25a6bb8d52abac0f8c004a1c8297ce3fba0798dedd973b87344d18273db660
>+SIZE (OpenCPN-OpenCPN-v5.2.4_GH0.tar.gz) = 81226481
>Index: files/patch-CMakeLists.txt
>===================================================================
>--- files/patch-CMakeLists.txt	(revision 559302)
>+++ files/patch-CMakeLists.txt	(working copy)
>@@ -1,8 +1,17 @@
>---- CMakeLists.txt.orig	2020-07-15 18:02:29 UTC
>+--- CMakeLists.txt.orig	2020-10-22 23:20:06 UTC
> +++ CMakeLists.txt
>-@@ -2221,7 +2221,7 @@ if (NOT APPLE)
>-       FILES ${CMAKE_BINARY_DIR}/opencpn.appdata.xml
>+@@ -801,7 +801,7 @@ if (GTK3_FOUND)
>+     }
>+   ]=])
>+   set (TRY_COMPILE
>+-    "echo '${_VERSPROG}' > wx-32.c; cc $(wx-config --cflags) wx-32.c; ./a.out")
>++    "echo '${_VERSPROG}' > wx-32.c; cc $(/usr/local/bin/wxgtk3u-3.0-config --cflags) wx-32.c; ./a.out")
>+   execute_process(
>+     COMMAND "/bin/sh" "-c" "${TRY_COMPILE}"
>+     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
>+@@ -2230,7 +2230,7 @@ if (NOT APPLE)
>        DESTINATION ${PREFIX_DATA}/metainfo
>+       RENAME opencpn.appdata.xml
>      )
> -    install(FILES opencpn.1 DESTINATION ${PREFIX_DATA}/man/man1)
> +    install(FILES opencpn.1 DESTINATION ${PREFIX_DATA}/../man/man1)
>Index: files/patch-cmake_TargetSetup.cmake
>===================================================================
>--- files/patch-cmake_TargetSetup.cmake	(revision 559302)
>+++ files/patch-cmake_TargetSetup.cmake	(working copy)
>@@ -1,8 +1,8 @@
>---- cmake/TargetSetup.cmake.orig	2020-07-15 18:02:29 UTC
>+--- cmake/TargetSetup.cmake.orig	2020-10-22 23:20:06 UTC
> +++ cmake/TargetSetup.cmake
>-@@ -26,14 +26,10 @@ elseif (APPLE)
>-     execute_process(COMMAND "sw_vers" "-productVersion"
>-                     OUTPUT_VARIABLE PKG_TARGET_VERSION)
>+@@ -39,14 +39,14 @@ elseif(_wx_selected_config MATCHES "androideabi-qt")
>+      endif(ANDROID_ARCH MATCHES "arm64")
>+         
>  elseif (UNIX)
> -    find_program(LSB_RELEASE NAMES lsb_release)
> -    if (NOT LSB_RELEASE)
>@@ -10,11 +10,15 @@
> -                "Cannot find the lsb_release program, please install.")
> -    endif ()
> -    execute_process(COMMAND ${LSB_RELEASE} "-is"
>-+    find_program(LSB_RELEASE NAMES uname)
>-+    execute_process(COMMAND ${LSB_RELEASE} "-s"
>++#    find_program(LSB_RELEASE NAMES lsb_release)
>++#    if (NOT LSB_RELEASE)
>++#        message(FATAL_ERROR
>++#                "Cannot find the lsb_release program, please install.")
>++#    endif ()
>++    execute_process(COMMAND uname "-i"
>                      OUTPUT_VARIABLE PKG_TARGET)
> -    execute_process(COMMAND ${LSB_RELEASE} "-rs"
>-+    execute_process(COMMAND ${LSB_RELEASE} "-r"
>++    execute_process(COMMAND uname "-r"
>                      OUTPUT_VARIABLE PKG_TARGET_VERSION)
>  else ()
>      set(PKG_TARGET "unknown")
>Index: files/patch-libs_wxcurl_include_wx_curl_thread.h
>===================================================================
>--- files/patch-libs_wxcurl_include_wx_curl_thread.h	(nonexistent)
>+++ files/patch-libs_wxcurl_include_wx_curl_thread.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- libs/wxcurl/include/wx/curl/thread.h.orig	2020-10-22 23:20:06 UTC
>++++ libs/wxcurl/include/wx/curl/thread.h
>+@@ -43,7 +43,7 @@ enum wxCurlThreadError
>+ };
>+ 
>+ //! The stack size for wxCurl threads.
>+-#define wxCURL_THREAD_STACK_SIZE            2048
>++#define wxCURL_THREAD_STACK_SIZE            1024
>+ 
>+ 
>+ // ----------------------------------------------------------------------------
>
>Property changes on: files/patch-libs_wxcurl_include_wx_curl_thread.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_PluginPaths.cpp
>===================================================================
>--- files/patch-src_PluginPaths.cpp	(nonexistent)
>+++ files/patch-src_PluginPaths.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/PluginPaths.cpp.orig	2020-10-22 23:20:06 UTC
>++++ src/PluginPaths.cpp
>+@@ -214,7 +214,7 @@ PluginPaths::PluginPaths()
>+     else if (g_Platform->isFlatpacked()) {
>+         initFlatpackPaths();
>+     }
>+-    else if (osSystemId & wxOS_UNIX_LINUX) {
>++    else if (osSystemId & wxOS_UNIX_LINUX || osSystemId & wxOS_UNIX_FREEBSD) {
>+ #ifdef __OCPN__ANDROID__
>+         initAndroidPaths();
>+ #else
>
>Property changes on: files/patch-src_PluginPaths.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_chart1.cpp
>===================================================================
>--- files/patch-src_chart1.cpp	(revision 559302)
>+++ files/patch-src_chart1.cpp	(working copy)
>@@ -1,6 +1,6 @@
> --- src/chart1.cpp.orig	2020-07-15 18:02:29 UTC
> +++ src/chart1.cpp
>-@@ -8226,7 +8226,7 @@ void MyFrame::MouseEvent( wxMouseEvent& event )
>+@@ -8244,7 +8244,7 @@ void MyFrame::MouseEvent( wxMouseEvent& event )
>  #endif
>  
>  #ifdef __WXGTK__
>@@ -9,7 +9,13 @@
>  #endif
>  
>  #if defined(__linux__)
>-@@ -10370,6 +10370,8 @@ extern "C" int wait(int *);                     // POS
>+@@ -10382,10 +10382,14 @@
>+ #if defined(__UNIX__) && !defined(__OCPN__ANDROID__) && !defined(__WXOSX__)
>+ extern "C" int wait(int *);                     // POSIX wait() for process
>+ 
>++#include <sys/param.h>
>+ #include <termios.h>
>++#include <fcntl.h>
>  #include <sys/ioctl.h>
>  #ifdef __linux__
>  #include <linux/serial.h>
>@@ -18,15 +24,27 @@
>  #endif
>  
>  #endif
>-@@ -10445,17 +10447,25 @@ int isTTYreal(const char *dev)
>+@@ -10452,7 +10456,8 @@
>+ 
>+ int isTTYreal(const char *dev)
>+ {
>+-#ifdef __NetBSD__
>++#ifdef __FreeBSD__
>++ 	            wxLogMessage( _T("FreeBSD") );
>+     if (strncmp("/dev/tty0", dev, 9) == 0)
>  	return 1;
>+     if (strncmp("/dev/ttyU", dev, 9) == 0)
>+@@ -10460,24 +10465,32 @@
>+     if (strcmp("/dev/gps", dev) == 0)
>+ 	return 1;
>      return 0;
>- #else /* !NetBSD */
>-+#ifdef __linux__
>+-#else /* !NetBSD */
>++#else
>++#ifdef __FreeBSD__
>++    struct termios termAttr;
>++#else
>      struct serial_struct serinfo;
>-+#else
>-+    struct termios termattr;
>-+#endif
>++#endif    
>      int ret = 0;
>  
>      int fd = open(dev, O_RDWR | O_NONBLOCK | O_NOCTTY);
>@@ -33,33 +51,61 @@
>  
>      // device name is pointing to a real device
>      if(fd >= 0) {
>-+#ifdef __linux__
>++#ifdef __FreeBSD__
>++        if (tcgetattr(fd, &termAttr) == 0) {
>++#else
>          if (ioctl(fd, TIOCGSERIAL, &serinfo)==0) {
>              // If device type is no PORT_UNKNOWN we accept the port
>              if (serinfo.type != PORT_UNKNOWN)
>--                ret = 1;
>-+#else
>-+        if (tcgetattr(fd, &termattr) == 0) {
> +#endif
>-+	      ret = 1;
>+                 ret = 1;
>          }
>          close (fd);
>      }
>-@@ -10505,10 +10515,17 @@ wxArrayString *EnumerateSerialPorts( void )
>  
>+     return ret;
>+-#endif /* !NetBSD */
>++#endif
>+ }
>+ 
>+ 
>+@@ -10521,10 +10534,17 @@
>+ 
>      //Initialize the pattern table
>      if( devPatern[0] == NULL ) {
>-+#ifdef __linux__
>++#ifdef __FreeBSD__
>++        paternAdd ( "ttyU" );
>++        paternAdd ( "ttyu" );
>++        paternAdd ( "ttyd" );
>++        paternAdd ( "gps" );
>++#else
>          paternAdd ( "ttyUSB" );
>          paternAdd ( "ttyACM" );
>          paternAdd ( "ttyGPS" );
>          paternAdd ( "refcom" );
>-+#else
>-+        paternAdd ( "ttyU" );
>-+        paternAdd ( "ttyu" );
>-+        paternAdd ( "ttyd" );
>-+        paternAdd ( "gps" );
> +#endif
>      }
>  
>   //  Looking for user privilege openable devices in /dev
>+@@ -11019,6 +11039,12 @@
>+     if(!result1.size())
>+         wxExecute(_T("stat -c %G /dev/ttyACM0"), result1);
>+ 
>++    if(!result1.size())
>++        wxExecute(_T("stat -f %g /dev/ttyu0"), result1);
>++
>++    if(!result1.size())
>++        wxExecute(_T("stat -f %g /dev/ttyU0"), result1);
>++
>+     wxString msg1 = _("OpenCPN requires access to serial ports to use serial NMEA data.\n");
>+     if(!result1.size()) {
>+         wxString msg = msg1 + _("No Serial Ports can be found on this system.\n\
>+@@ -11032,7 +11058,7 @@
>+     wxString user = wxGetUserId(), group = result1[0];
>+ 
>+     wxArrayString result2;
>+-    wxExecute(_T("groups ") + user, result2);
>++    wxExecute(_T("id -G ") + user, result2);
>+ 
>+     if(result2.size()) {
>+         wxString user_groups = result2[0];
>Index: files/patch-src_glChartCanvas.cpp
>===================================================================
>--- files/patch-src_glChartCanvas.cpp	(nonexistent)
>+++ files/patch-src_glChartCanvas.cpp	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/glChartCanvas.cpp.orig	2020-10-22 23:20:06 UTC
>++++ src/glChartCanvas.cpp
>+@@ -57,7 +57,7 @@ class OCPNStopWatch (private)
>+ 
>+ #if defined(__OCPN__ANDROID__)
>+ #include "androidUTIL.h"
>+-#elif defined(__WXQT__)
>++#else
>+ #include <GL/glx.h>
>+ #endif
>+ 
>
>Property changes on: files/patch-src_glChartCanvas.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 559302)
>+++ pkg-plist	(working copy)
>@@ -4,7 +4,6 @@
> lib/opencpn/libgrib_pi.so
> lib/opencpn/libwmm_pi.so
> man/man1/opencpn.1.gz
>-share/metainfo/opencpn.appdata.xml
> share/applications/opencpn.desktop
> %%PORTDOCS%%%%DOCSDIR%%/changelog
> %%PORTDOCS%%%%DOCSDIR%%/copyright
>@@ -171,6 +170,7 @@
> share/locale/zh_TW/LC_MESSAGES/opencpn-grib_pi.mo
> share/locale/zh_TW/LC_MESSAGES/opencpn-wmm_pi.mo
> share/locale/zh_TW/LC_MESSAGES/opencpn.mo
>+share/metainfo/opencpn.appdata.xml
> %%DATADIR%%/COPYING.gplv2
> %%DATADIR%%/COPYING.gplv3
> %%DATADIR%%/COPYING.lgplv2
>@@ -179,8 +179,6 @@
> %%DATADIR%%/LICENSING
> %%DATADIR%%/LINUX_DEVICES.md
> %%DATADIR%%/authors.html
>-%%DATADIR%%/license.txt
>-%%DATADIR%%/ocpn-plugins.xml
> %%PORTDOCS%%%%DATADIR%%/doc/50info/MBT1.jpg
> %%PORTDOCS%%%%DATADIR%%/doc/50info/bridge1.jpg
> %%PORTDOCS%%%%DATADIR%%/doc/50info/bridge2.jpg
>@@ -1178,6 +1176,8 @@
> %%DATADIR%%/gshhs/wdb_borders_c.b
> %%DATADIR%%/gshhs/wdb_rivers_c.b
> %%DATADIR%%/license.html
>+%%DATADIR%%/license.txt
>+%%DATADIR%%/ocpn-plugins.xml
> %%DATADIR%%/opencpn.png
> %%DATADIR%%/plugins/chartdldr_pi/data/button_down.png
> %%DATADIR%%/plugins/chartdldr_pi/data/button_right.png
>@@ -1698,6 +1698,7 @@
> %%DATADIR%%/uidata/traditional/mob.svg
> %%DATADIR%%/uidata/traditional/mob_btn.svg
> %%DATADIR%%/uidata/traditional/mob_btn_rollover.svg
>+%%DATADIR%%/uidata/traditional/packageBox.svg
> %%DATADIR%%/uidata/traditional/pencil.svg
> %%DATADIR%%/uidata/traditional/print.svg
> %%DATADIR%%/uidata/traditional/print_rollover.svg

Actions: View | Diff

Attachments on bug 252168: 220956 | 221023 | 221025