Attachment 164459 Details for Bug 205491 – patch to version 2.2.3

[patch] patch to version 2.2.3

patch-saga_2.2.2_1-2.2.3.diff (text/plain), 8.76 KB, created by Rainer Hurling on 2015-12-21 16:07:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2015-12-21 16:07:31 UTC

Size: 8.76 KB

patch

obsolete

>diff -urN saga.orig/Makefile saga/Makefile
>--- saga.orig/Makefile	2015-12-16 15:38:09.795007000 +0100
>+++ saga/Makefile	2015-12-21 12:27:11.019538000 +0100
>@@ -2,10 +2,10 @@
> # $FreeBSD: head/math/saga/Makefile 402226 2015-11-22 11:33:58Z girgen $
> 
> PORTNAME=	saga
>-PORTVERSION=	2.2.2
>-PORTREVISION=	1
>+PORTVERSION=	2.2.3
> CATEGORIES=	math
> MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]*$//}/SAGA%20${PORTVERSION}
>+DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
> MAINTAINER=	rhurlin@gwdg.de
> COMMENT=	System for Automated Geoscientific Analyses
>@@ -72,6 +72,7 @@
> 		${WRKSRC}/src/modules/garden/garden_webservices/Makefile.am \
> 		${WRKSRC}/src/modules/io/io_grid_image/Makefile.am \
> 		${WRKSRC}/src/modules/io/io_shapes/Makefile.am \
>+		${WRKSRC}/src/modules/io/io_virtual/Makefile.am \
> 		${WRKSRC}/src/modules/pointcloud/pointcloud_tools/Makefile.am \
> 		${WRKSRC}/src/modules/pointcloud/pointcloud_viewer/Makefile.am \
> 		${WRKSRC}/src/modules/tin/tin_viewer/Makefile.am \
>@@ -82,7 +83,7 @@
> 		${WRKSRC}/src/modules/imagery/imagery_opencv/Makefile.am
> 	@${REINPLACE_CMD} -e 's|\[cv\]|\[opencv_core\]|' \
> 		${WRKSRC}/configure.ac
>-	@${REINPLACE_CMD} -e 's|wxString(SAGA_VERSION) + "\\n"|wxString(SAGA_VERSION) + " (SVN r2652)" + "\\n"|' \
>+	@${REINPLACE_CMD} -e 's|wxString(SAGA_VERSION) + "\\n"|wxString(SAGA_VERSION) + " (SVN r2737)" + "\\n"|' \
> 		${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp
> .if ${ARCH} == "powerpc"
> 	@${REINPLACE_CMD} -e 's|typedef unsigned long	DWORD;|typedef unsigned int	DWORD;|' \
>diff -urN saga.orig/distinfo saga/distinfo
>--- saga.orig/distinfo	2015-12-16 15:38:09.794746000 +0100
>+++ saga/distinfo	2015-12-18 07:11:59.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (saga-2.2.2.tar.gz) = 031cd70b7ec248f32f955a9316aefc7f7ab283c5129c49aa4bd748717d20357e
>-SIZE (saga-2.2.2.tar.gz) = 4034027
>+SHA256 (saga_2.2.3.tar.gz) = f26591c097c8766df9db266bf50e1b38a5bebe0119b44a9b70ae793d0d8bade3
>+SIZE (saga_2.2.3.tar.gz) = 4075266
>diff -urN saga.orig/files/patch-src__modules__imagery__imagery_opencv__opencv.h saga/files/patch-src__modules__imagery__imagery_opencv__opencv.h
>--- saga.orig/files/patch-src__modules__imagery__imagery_opencv__opencv.h	1970-01-01 01:00:00.000000000 +0100
>+++ saga/files/patch-src__modules__imagery__imagery_opencv__opencv.h	2015-12-21 10:39:15.851192000 +0100
>@@ -0,0 +1,12 @@
>+--- src/modules/imagery/imagery_opencv/opencv.h.orig	2015-12-21 09:38:29 UTC
>++++ src/modules/imagery/imagery_opencv/opencv.h
>+@@ -74,7 +74,8 @@
>+ 
>+ //---------------------------------------------------------
>+ #include <opencv/cv.h>
>+-
>++#include <opencv2/core/core_c.h>
>++#include <opencv2/imgproc/imgproc_c.h>
>+ 
>+ ///////////////////////////////////////////////////////////
>+ //														 //
>diff -urN saga.orig/files/patch-src_modules_imagery_imagery__opencv_opencv.h saga/files/patch-src_modules_imagery_imagery__opencv_opencv.h
>--- saga.orig/files/patch-src_modules_imagery_imagery__opencv_opencv.h	2015-12-16 15:38:09.795793000 +0100
>+++ saga/files/patch-src_modules_imagery_imagery__opencv_opencv.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,12 +0,0 @@
>---- src/modules/imagery/imagery_opencv/opencv.h.orig	2015-02-26 07:51:59 UTC
>-+++ src/modules/imagery/imagery_opencv/opencv.h
>-@@ -74,7 +74,8 @@
>- 
>- //---------------------------------------------------------
>- #include <opencv/cv.h>
>--
>-+#include <opencv2/core/core_c.h>
>-+#include <opencv2/imgproc/imgproc_c.h>
>- 
>- ///////////////////////////////////////////////////////////
>- //														 //
>diff -urN saga.orig/files/patch-src_saga__core_saga__api_table.cpp saga/files/patch-src_saga__core_saga__api_table.cpp
>--- saga.orig/files/patch-src_saga__core_saga__api_table.cpp	1970-01-01 01:00:00.000000000 +0100
>+++ saga/files/patch-src_saga__core_saga__api_table.cpp	2015-12-21 10:39:15.854500000 +0100
>@@ -0,0 +1,11 @@
>+--- src/saga_core/saga_api/table.cpp.orig	2015-12-21 09:38:29 UTC
>++++ src/saga_core/saga_api/table.cpp
>+@@ -175,7 +175,7 @@ bool CSG_Table::Create(const CSG_String 
>+ 	SG_UI_Msg_Add(CSG_String::Format("%s: %s...", _TL("Load table"), File_Name.c_str()), true);
>+ 
>+ 	//-----------------------------------------------------
>+-	bool	bResult	= File_Name.BeforeFirst(':').Cmp("PGSQL") && SG_File_Exists(File_Name) && Load(File_Name, (int)Format, NULL);
>++	bool	bResult	= File_Name.BeforeFirst(':').Cmp("PGSQL") && SG_File_Exists(File_Name) && Load(File_Name, (int)Format, '\0');
>+ 
>+ 	if( bResult )
>+ 	{
>diff -urN saga.orig/files/patch-src_saga__core_saga__api_table__io.cpp saga/files/patch-src_saga__core_saga__api_table__io.cpp
>--- saga.orig/files/patch-src_saga__core_saga__api_table__io.cpp	1970-01-01 01:00:00.000000000 +0100
>+++ saga/files/patch-src_saga__core_saga__api_table__io.cpp	2015-12-21 10:39:15.856827000 +0100
>@@ -0,0 +1,11 @@
>+--- src/saga_core/saga_api/table_io.cpp.orig	2015-12-21 09:38:29 UTC
>++++ src/saga_core/saga_api/table_io.cpp
>+@@ -118,7 +118,7 @@ bool CSG_Table::Load(const CSG_String &F
>+ //---------------------------------------------------------
>+ bool CSG_Table::Save(const CSG_String &File_Name, int Format)
>+ {
>+-	return( Save(File_Name, Format, NULL) );
>++	return( Save(File_Name, Format, '\0') );
>+ }
>+ 
>+ //---------------------------------------------------------
>diff -urN saga.orig/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp
>--- saga.orig/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp	2015-12-16 15:38:09.795580000 +0100
>+++ saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp	2015-12-21 10:39:15.860170000 +0100
>@@ -1,4 +1,4 @@
>---- src/saga_core/saga_cmd/saga_cmd.cpp.orig	2015-02-26 07:51:10 UTC
>+--- src/saga_core/saga_cmd/saga_cmd.cpp.orig	2015-12-21 09:38:29 UTC
> +++ src/saga_core/saga_cmd/saga_cmd.cpp
> @@ -65,6 +65,7 @@
>  
>diff -urN saga.orig/files/patch-src_saga__core_saga__gui_dlg__about.cpp saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp
>--- saga.orig/files/patch-src_saga__core_saga__gui_dlg__about.cpp	2015-12-16 15:38:09.795388000 +0100
>+++ saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp	2015-12-21 10:39:15.863460000 +0100
>@@ -1,4 +1,4 @@
>---- src/saga_core/saga_gui/dlg_about.cpp.orig	2015-04-30 11:42:32 UTC
>+--- src/saga_core/saga_gui/dlg_about.cpp.orig	2015-12-21 09:38:29 UTC
> +++ src/saga_core/saga_gui/dlg_about.cpp
> @@ -65,6 +65,7 @@
>  #include <saga_api/clipper.hpp>
>@@ -8,12 +8,23 @@
>  
>  #include "helper.h"
>  
>-@@ -246,7 +247,19 @@ wxString CDLG_About::_Get_Version(void)
>+@@ -188,7 +189,7 @@ wxString CDLG_About::_Get_Version(void)
>+ 	s	+= "System for Automated Geoscientific Analyses\n";
>+ 	s	+= "http://www.saga-gis.org\n";
>+ 	s	+= "\n";
>+-	s	+= "Version: " + wxString(SAGA_VERSION) + "\n";
>++	s	+= "Version: " + wxString(SAGA_VERSION) + " (SVN r2737)" + "\n";
>+ 
>+ #ifdef _SAGA_MSW
>+ 	#ifdef _WIN64
>+@@ -264,7 +265,21 @@ wxString CDLG_About::_Get_Version(void)
>  		#elif	defined(__GNUWIN32__)
>  			"Gnu-Win32 compiler"
>  		#elif	defined(__GNUG__)
> -			"Gnu C++"
>-+			#if   wxCHECK_GCC_VERSION(5,0)
>++			#if   wxCHECK_GCC_VERSION(5,1)
>++				"Gnu C++ 5.1"
>++			#elif   wxCHECK_GCC_VERSION(5,0)
> +				"Gnu C++ 5.0"
> +			#elif wxCHECK_GCC_VERSION(4,9)
> +				"Gnu C++ 4.9"
>@@ -26,6 +37,6 @@
> +			#else
> +				"Gnu C++"
> +			#endif
>- 		#elif	defined(__MWERKS__)
>- 			"CodeWarrior MetroWerks compiler"
>- 		#elif	defined(__SUNCC__)
>+ 		#elif	defined(__VISUALC__)	// The value of this macro corresponds to the compiler version: 1020 for 4.2 (the first supported version), 1100 for 5.0, 1200 for 6.0 and so on
>+ 			#if   __VISUALC__ == 1020
>+ 				"Microsoft Visual C++ 4.2"
>diff -urN saga.orig/pkg-plist saga/pkg-plist
>--- saga.orig/pkg-plist	2015-12-16 15:38:10.287532000 +0100
>+++ saga/pkg-plist	2015-12-21 11:13:09.870315000 +0100
>@@ -91,6 +91,7 @@
> lib/saga/libsim_fire_spreading.so
> lib/saga/libsim_hydrology.so
> lib/saga/libsim_ihacres.so
>+lib/saga/libsim_qm_of_esp.so
> lib/saga/libsim_rivflow.so
> lib/saga/libstatistics_grid.so
> lib/saga/libstatistics_kriging.so
>@@ -123,6 +124,11 @@
> %%DATADIR%%/saga_prj.dic
> %%DATADIR%%/saga_prj.srs
> %%DATADIR%%/saga_tip.txt
>+%%DATADIR%%/scripting/helper/make_arcsaga_toolboxes.bat
>+%%DATADIR%%/scripting/helper/make_saga_release.bat
>+%%DATADIR%%/scripting/helper/make_saga_snapshot.bat
>+%%DATADIR%%/scripting/helper/make_tools_interface.bat
>+%%DATADIR%%/scripting/helper/make_translation_files.bat
> %%DATADIR%%/scripting/python/examples/00_grid_create_dummy.py
> %%DATADIR%%/scripting/python/examples/01_grid_asc_to_saga.py
> %%DATADIR%%/scripting/python/examples/02_grid_morphometry.py
>@@ -134,6 +140,7 @@
> %%DATADIR%%/scripting/python/helpers/saga_cmd_param_interface/environment.py
> %%DATADIR%%/scripting/python/helpers/saga_cmd_param_interface/param_interface.py
> %%DATADIR%%/scripting/python/helpers/saga_cmd_param_interface/tools.py
>+%%DATADIR%%/scripting/python/saga_python_api.txt
> %%DATADIR%%/scripting/python/test_data/test.mgrd
> %%DATADIR%%/scripting/python/test_data/test.sdat
> %%DATADIR%%/scripting/python/test_data/test.sgrd

Flags:

rhurlin: maintainer-approval+

Actions: View | Diff

Attachments on bug 205491: 164459