Attachment 217572 Details for Bug 248949 – Patch to update SAGA GIS from 7.6.3 to 7.7.0

[patch] Patch to update SAGA GIS from 7.6.3 to 7.7.0

patch-saga_7.6.3-7.7.0.diff (text/plain), 7.97 KB, created by Rainer Hurling on 2020-08-27 11:03:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2020-08-27 11:03:17 UTC

Size: 7.97 KB

patch

obsolete

>diff -urN saga.orig/Makefile saga/Makefile
>--- saga.orig/Makefile	2020-07-17 17:35:12.090157000 +0200
>+++ saga/Makefile	2020-08-25 20:44:59.549057000 +0200
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/math/saga/Makefile 542423 2020-07-17 10:12:25Z martymac $
> 
> PORTNAME=	saga
>-PORTVERSION=	7.6.3
>-PORTREVISION=	2
>+PORTVERSION=	7.7.0
> CATEGORIES=	math
> MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}
> 
>@@ -119,7 +118,6 @@
> # toolchains dir was moved in r2805 (and followups r2810,r2811,r2820)
> 	(cd ${WRKSRC}/src/accessories && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
> 	${RM} -R ${STAGEDIR}${DATADIR}/CMakeLists.txt
>-	${RM} -R ${STAGEDIR}${DATADIR}/accessories/toolchains
> 	${RM} -R ${STAGEDIR}${DATADIR}/templates/template4saga-tools/my_tool_library/Makefile.bak
> 	${INSTALL_DATA} ${WRKSRC}/src/saga_core/saga_gui/res/saga.desktop \
> 		${STAGEDIR}${PREFIX}/share/applications/
>diff -urN saga.orig/distinfo saga/distinfo
>--- saga.orig/distinfo	2020-05-13 18:37:05.802107000 +0200
>+++ saga/distinfo	2020-08-25 19:00:28.896178000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1589116009
>-SHA256 (saga-7.6.3.tar.gz) = 8b791ca26e3e2ab923e6661b60fd5f57f5707ada7315028f4fed2591bcf03838
>-SIZE (saga-7.6.3.tar.gz) = 5034062
>+TIMESTAMP = 1598374828
>+SHA256 (saga-7.7.0.tar.gz) = f327cf8502cb4850e921985b8c3d6aa97adb7c1c612b7b935657547619cdbbda
>+SIZE (saga-7.7.0.tar.gz) = 5083931
>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	2020-01-05 16:32:40.597046000 +0100
>+++ saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp	2020-08-27 12:47:51.725667000 +0200
>@@ -1,6 +1,6 @@
>---- src/saga_core/saga_gui/dlg_about.cpp.orig	2018-11-22 07:53:06 UTC
>+--- src/saga_core/saga_gui/dlg_about.cpp.orig	2020-08-25 19:21:15 UTC
> +++ src/saga_core/saga_gui/dlg_about.cpp
>-@@ -188,6 +188,7 @@ wxString CDLG_About::_Get_Version(void)
>+@@ -177,6 +177,7 @@ wxString CDLG_About::_Get_Version(void)
>  	s	+= "http://www.saga-gis.org\n";
>  	s	+= "\n";
>  	s	+= "Version: " + wxString(SAGA_VERSION) + "\n";
>@@ -8,12 +8,73 @@
>  
>  #ifdef _SAGA_MSW
>  	#ifdef _WIN64
>-@@ -263,7 +264,47 @@ wxString CDLG_About::_Get_Version(void)
>+@@ -254,13 +255,107 @@ wxString CDLG_About::_Get_Version(void)
>+ 		#elif	defined(__PGI)
>+ 			"Portland PGCC/PGCPP"
>+ 		#elif	defined(__clang__)
>+-			"Clang/LLVM"
>++			#if   (__clang_major__ == 11 && __clang_minor__ == 0 && __clang_patchlevel__ == 1)
>++				"Clang/LLVM 11.0.1"
>++			#elif (__clang_major__ == 11 && __clang_minor__ == 0 && __clang_patchlevel__ == 0)
>++				"Clang/LLVM 11.0.0"
>++			#elif (__clang_major__ == 10 && __clang_minor__ == 0 && __clang_patchlevel__ == 1)
>++				"Clang/LLVM 10.0.1"
>++			#elif (__clang_major__ == 10 && __clang_minor__ == 0 && __clang_patchlevel__ == 0)
>++				"Clang/LLVM 10.0.0"
>++			#elif (__clang_major__ == 9 && __clang_minor__ == 0 && __clang_patchlevel__ == 1)
>++				"Clang/LLVM 9.0.1"
>++			#elif (__clang_major__ == 9 && __clang_minor__ == 0 && __clang_patchlevel__ == 0)
>++				"Clang/LLVM 9.0.0"
>++			#elif (__clang_major__ == 8 && __clang_minor__ == 0 && __clang_patchlevel__ == 1)
>++				"Clang/LLVM 8.0.1"
>++			#elif (__clang_major__ == 8 && __clang_minor__ == 0 && __clang_patchlevel__ == 0)
>++				"Clang/LLVM 8.0.0"
>++			#elif (__clang_major__ == 7 && __clang_minor__ == 0 && __clang_patchlevel__ == 1)
>++				"Clang/LLVM 7.0.1"
>++			#elif (__clang_major__ == 7 && __clang_minor__ == 0 && __clang_patchlevel__ == 0)
>++				"Clang/LLVM 7.0.0"
>++			#elif (__clang_major__ == 6 && __clang_minor__ == 0 && __clang_patchlevel__ == 1)
>++				"Clang/LLVM 6.0.1"
>++			#elif (__clang_major__ == 6 && __clang_minor__ == 0 && __clang_patchlevel__ == 0)
>++				"Clang/LLVM 6.0.0"
>++			#else
>++				"Clang/LLVM"
>++			#endif
>+ 		#elif	defined(__MINGW32__)
>+ 			"MinGW"
>  		#elif	defined(__GNUWIN32__)
>  			"Gnu-Win32 compiler"
>  		#elif	defined(__GNUG__)
> -			"Gnu C++"
>-+			#if   wxCHECK_GCC_VERSION(6,4)
>++			#if   wxCHECK_GCC_VERSION(9,4)
>++				"Gnu C++ 9.4"
>++			#elif wxCHECK_GCC_VERSION(9,3)
>++				"Gnu C++ 9.3"
>++			#elif wxCHECK_GCC_VERSION(9,2)
>++				"Gnu C++ 9.2"
>++			#elif wxCHECK_GCC_VERSION(9,1)
>++				"Gnu C++ 9.1"
>++			#elif wxCHECK_GCC_VERSION(9,0)
>++				"Gnu C++ 9.0"
>++			#elif wxCHECK_GCC_VERSION(8,3)
>++				"Gnu C++ 8.3"
>++			#elif wxCHECK_GCC_VERSION(8,2)
>++				"Gnu C++ 8.2"
>++			#elif wxCHECK_GCC_VERSION(8,1)
>++				"Gnu C++ 8.1"
>++			#elif wxCHECK_GCC_VERSION(8,0)
>++				"Gnu C++ 8.0"
>++			#elif wxCHECK_GCC_VERSION(7,4)
>++				"Gnu C++ 7.4"
>++			#elif wxCHECK_GCC_VERSION(7,3)
>++				"Gnu C++ 7.3"
>++			#elif wxCHECK_GCC_VERSION(7,2)
>++				"Gnu C++ 7.2"
>++			#elif wxCHECK_GCC_VERSION(7,1)
>++				"Gnu C++ 7.1"
>++			#elif wxCHECK_GCC_VERSION(7,0)
>++				"Gnu C++ 7.0"
>++			#elif wxCHECK_GCC_VERSION(6,4)
> +				"Gnu C++ 6.4"
> +			#elif wxCHECK_GCC_VERSION(6,3)
> +				"Gnu C++ 6.3"
>diff -urN saga.orig/files/patch-src_tools_imagery_imagery__opencv_opencv.h saga/files/patch-src_tools_imagery_imagery__opencv_opencv.h
>--- saga.orig/files/patch-src_tools_imagery_imagery__opencv_opencv.h	2020-01-05 16:32:40.644875000 +0100
>+++ saga/files/patch-src_tools_imagery_imagery__opencv_opencv.h	1970-01-01 01:00:00.000000000 +0100
>@@ -1,12 +0,0 @@
>---- src/tools/imagery/imagery_opencv/opencv.h.orig	2018-11-22 07:53:06 UTC
>-+++ src/tools/imagery/imagery_opencv/opencv.h
>-@@ -73,7 +73,8 @@
>- 
>- //---------------------------------------------------------
>- #include <opencv/cv.h>
>--
>-+#include <opencv2/core/core_c.h>
>-+#include <opencv2/imgproc/imgproc_c.h>
>- 
>- ///////////////////////////////////////////////////////////
>- //														 //
>diff -urN saga.orig/files/patch-src_tools_projection_pj__proj4_globe__gores.cpp saga/files/patch-src_tools_projection_pj__proj4_globe__gores.cpp
>--- saga.orig/files/patch-src_tools_projection_pj__proj4_globe__gores.cpp	2020-06-15 17:15:13.680651000 +0200
>+++ saga/files/patch-src_tools_projection_pj__proj4_globe__gores.cpp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,11 +0,0 @@
>---- src/tools/projection/pj_proj4/globe_gores.cpp.orig	2020-05-24 11:21:37 UTC
>-+++ src/tools/projection/pj_proj4/globe_gores.cpp
>-@@ -207,7 +207,7 @@ bool CGlobe_Gores::Add_Gore(int iGore, int nGores)
>- 
>- 		SG_Get_Tool_Library_Manager().Delete_Tool(pTool);
>- 
>--		return( NULL );
>-+		return( false );
>- 	}
>- 
>- 	CSG_Grid	*pGore	= pTool->Get_Parameter("GRID")->asGrid();
>diff -urN saga.orig/pkg-plist saga/pkg-plist
>--- saga.orig/pkg-plist	2020-04-02 19:02:41.878392000 +0200
>+++ saga/pkg-plist	2020-08-25 20:48:22.082302000 +0200
>@@ -86,6 +86,7 @@
> lib/saga/libshapes_polygons.so
> lib/saga/libshapes_tools.so
> lib/saga/libshapes_transect.so
>+lib/saga/libsim_air_flow.so
> lib/saga/libsim_cellular_automata.so
> lib/saga/libsim_ecosystems_hugget.so
> lib/saga/libsim_erosion.so
>@@ -182,9 +183,11 @@
> %%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool.h
> %%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library.cbp
> %%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library.layout
>+%%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library.vcxproj
>+%%DATADIR%%/templates/template4saga-tools/my_tool_library/my_tool_library.vcxproj.filters
> %%DATADIR%%/templates/template4saga-tools/my_tools.vc14.sln
> %%DATADIR%%/templates/template4saga-tools/readme.txt
>-%%DATADIR%%/toolchains/climate.xml
>+%%DATADIR%%/toolchains/climate_tools.xml
> %%DATADIR%%/toolchains/cluster_terrain.xml
> %%DATADIR%%/toolchains/gc_filter_gaussian.xml
> %%DATADIR%%/toolchains/gc_filter_laplacian.xml
>@@ -192,10 +195,12 @@
> %%DATADIR%%/toolchains/gc_filter_simple.xml
> %%DATADIR%%/toolchains/gc_longitudinal_range.xml
> %%DATADIR%%/toolchains/gc_tools.xml
>+%%DATADIR%%/toolchains/grid_and_polygon_to_table.xml
> %%DATADIR%%/toolchains/grid_filter.xml
> %%DATADIR%%/toolchains/grid_list_simple_filter.xml
> %%DATADIR%%/toolchains/grid_notch_filter.xml
> %%DATADIR%%/toolchains/grid_statistics_for_directions.xml
>+%%DATADIR%%/toolchains/grid_tools_bulk_no-data_change.xml
> %%DATADIR%%/toolchains/gridding.xml
> %%DATADIR%%/toolchains/group_files.xml
> %%DATADIR%%/toolchains/imagery.xml

Flags:

rhurlin: maintainer-approval+

Actions: View | Diff

Attachments on bug 248949: 217572