Attachment 193043 Details for Bug 227901 – patch to update math/saga to 6.3.0, with corrected wxgtk30 failures

[patch] patch to update math/saga to 6.3.0, with corrected wxgtk30 failures

patch-saga_6.1.0-6.3.0_3.diff (text/plain), 17.66 KB, created by Rainer Hurling on 2018-05-04 14:59:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rainer Hurling

Created: 2018-05-04 14:59:03 UTC

Size: 17.66 KB

patch

obsolete

>diff -urN saga.orig/Makefile saga/Makefile
>--- saga.orig/Makefile	2018-03-10 18:59:01.040312000 +0100
>+++ saga/Makefile	2018-05-02 18:38:41.372297000 +0200
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/math/saga/Makefile 464084 2018-03-10 17:46:04Z gerald $
> 
> PORTNAME=	saga
>-PORTVERSION=	6.1.0
>-PORTREVISION=	3
>+PORTVERSION=	6.3.0
> CATEGORIES=	math
> MASTER_SITES=	SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION}
> 
>@@ -13,12 +12,13 @@
> LICENSE=	GPLv2 LGPL21
> LICENSE_COMB=	multi
> 
>-BUILD_DEPENDS=	swig3.0:devel/swig30
>+BUILD_DEPENDS=	clang50:devel/llvm50 \
>+		swig3.0:devel/swig30
> LIB_DEPENDS=	libfftw3.so:math/fftw3 \
> 		libgdal.so:graphics/gdal \
> 		libhpdf.so:print/libharu \
> 		libjasper.so:graphics/jasper \
>-		liblas.so:devel/liblas12 \
>+		liblas12.so:devel/liblas12 \
> 		libodbc.so:databases/unixODBC \
> 		libopencv_core.so:graphics/opencv-core \
> 		libopencv_ml.so:graphics/opencv \
>@@ -28,10 +28,9 @@
> 		libtiff.so:graphics/tiff
> RUN_DEPENDS:=	${BUILD_DEPENDS}
> 
>-USES=		autoreconf compiler:gcc-c++11-lib desktop-file-utils dos2unix \
>+USES=		autoreconf compiler:c++11-lib desktop-file-utils dos2unix \
> 		iconv:wchar_t libtool localbase pkgconfig python:2.7
> USE_LDCONFIG=	yes
>-USE_CXXSTD=	c++11
> USE_WX=		3.0+
> CONFIGURE_ARGS=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
> 		--enable-python --with-system-svm
>@@ -39,19 +38,27 @@
> GNU_CONFIGURE=	yes
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
>+CPP=		clang-cpp50
>+CC=		clang50
>+CXX=		clang++50
> INSTALLS_ICONS=	yes
> DOS2UNIX_GLOB=	*.cpp *.h
> PLIST_SUB=	PORTVERSION=${PORTVERSION}
> 
> OPTIONS_DEFINE=	PGSQL OPENMP VIGRA
>-OPTIONS_DEFAULT=	PGSQL OPENMP VIGRA
>+OPTIONS_DEFAULT=	PGSQL VIGRA
>+OPTIONS_DEFAULT_amd64=	OPENMP
>+OPTIONS_DEFAULT_i386=	OPENMP
> NO_OPTIONS_SORT=	yes
> OPTIONS_SUB=	yes
>-OPENMP_DESC=	Enable Multiprocessing
>+OPENMP_DESC=	Enable Multiprocessing (only amd64 and i386)
> VIGRA_DESC=	Enable 'Vision with Generic Algorithms' Library
> 
>+## TODO: OPENMP_?= Only for archs amd64 and i386
> OPENMP_CONFIGURE_ENABLE=	openmp
>-OPENMP_LDFLAGS=		-pthread
>+OPENMP_LIB_DEPEND=	libomp.so:devel/openmp
>+OPENMP_LDFLAGS=		-L${LOCALBASE}/lib -lm -pthread
>+#OPENMP_EXTRA_PATCHES=	${PATCHDIR}/
> PGSQL_CONFIGURE_OFF=	--with-postgresql=no
> PGSQL_CONFIGURE_ON=	--with-postgresql=${LOCALBASE}/bin/pg_config
> PGSQL_USES=		pgsql
>@@ -90,6 +97,9 @@
> .endif
> 	@${REINPLACE_CMD} -e 's|PORTVERSION|${PORTVERSION}|' \
> 		${WRKSRC}/src/saga_core/saga_gui/dlg_about.cpp
>+
>+post-patch-OPENMP-on:
>+	@${REINPLACE_CMD} -e 's|-lgomp|-lomp|' ${WRKSRC}/configure.ac
> 
> post-configure:
> 	@${REINPLACE_CMD} -e 's|cd $$(pkgdatadir);|cd ${STAGEDIR}${DATADIR};|g' \
>diff -urN saga.orig/distinfo saga/distinfo
>--- saga.orig/distinfo	2017-11-22 18:22:57.518943000 +0100
>+++ saga/distinfo	2018-04-23 09:29:49.000000000 +0200
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1511371377
>-SHA256 (saga-6.1.0.tar.gz) = da5767d339c3a2cd9d5905a66251e44b8be7325aa10b673db7ea55a8d4bffe6e
>-SIZE (saga-6.1.0.tar.gz) = 4574237
>+TIMESTAMP = 1524468589
>+SHA256 (saga-6.3.0.tar.gz) = bb4b99406e3a25cdaa12559904ce3272c449acb542bc0883b2755ce6508dd243
>+SIZE (saga-6.3.0.tar.gz) = 4583450
>diff -urN saga.orig/files/patch-configure saga/files/patch-configure
>--- saga.orig/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
>+++ saga/files/patch-configure	2018-04-23 09:47:32.000000000 +0200
>@@ -0,0 +1,19 @@
>+--- configure.orig	2017-12-21 10:57:30 UTC
>++++ configure
>+@@ -16235,13 +16235,13 @@ if test "x$ac_cv_lib_fftw3_fftw_execute" = xyes; then 
>+   FFTWFOUND=1
>+ fi
>+ 
>+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LAS_GetVersion in -llas" >&5
>+-$as_echo_n "checking for LAS_GetVersion in -llas... " >&6; }
>++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LAS_GetVersion in -llas12" >&5
>++$as_echo_n "checking for LAS_GetVersion in -llas12... " >&6; }
>+ if ${ac_cv_lib_las_LAS_GetVersion+:} false; then :
>+   $as_echo_n "(cached) " >&6
>+ else
>+   ac_check_lib_save_LIBS=$LIBS
>+-LIBS="-llas  $LIBS"
>++LIBS="-llas12  $LIBS"
>+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
>+ /* end confdefs.h.  */
>+ 
>diff -urN saga.orig/files/patch-configure.ac saga/files/patch-configure.ac
>--- saga.orig/files/patch-configure.ac	2017-01-24 17:04:32.176831000 +0100
>+++ saga/files/patch-configure.ac	2018-04-23 09:45:31.000000000 +0200
>@@ -1,6 +1,13 @@
>---- configure.ac.orig	2016-08-23 13:23:41 UTC
>+--- configure.ac.orig	2018-04-23 07:44:48 UTC
> +++ configure.ac
>-@@ -26,7 +26,7 @@ AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOU
>+@@ -20,13 +20,13 @@ AC_PROG_LIBTOOL
>+ AC_CHECK_LIB([opencv_core], [cvGetRows], CVFOUND=1,,)
>+ AC_CHECK_LIB([geotrans], [Set_Mercator_Coordinates])
>+ AC_CHECK_LIB([fftw3],[fftw_execute],FFTWFOUND=1,)
>+-AC_CHECK_LIB([las], [LAS_GetVersion], LASFOUND=1,,)
>++AC_CHECK_LIB([las12], [LAS_GetVersion], LASFOUND=1,,)
>+ AC_CHECK_LIB(hpdf, HPDF_Pages_New, HARUFOUND=1,,)
>+ AC_CHECK_LIB([odbc], [SQLFetch], ODBCFOUND=1,[ODBC $libodbc$ library not found])
>  AC_CHECK_LIB([proj], [pj_is_latlong], PROJFOUND=1,,)
>  AC_CHECK_LIB([vigraimpex], [VIGRA_RGBE_ReadPixels_Raw],VIGRAFOUND=1,)
>  AC_CHECK_LIB([gomp], [omp_get_num_threads], GOMPFOUND=1,,)
>@@ -9,4 +16,3 @@
>  PKG_CHECK_MODULES([DXFLIB], [dxflib], [LIBDXFFOUND=1],[LIBDXFFOUND=0])
>  PKG_CHECK_MODULES([HDF5],[hdf5],LIBHDF5FOUND=1,LIBHDF5FOUND=0)
>  
>-
>diff -urN saga.orig/files/patch-git_6e14443b30ce saga/files/patch-git_6e14443b30ce
>--- saga.orig/files/patch-git_6e14443b30ce	2018-01-21 07:58:06.410100000 +0100
>+++ saga/files/patch-git_6e14443b30ce	1970-01-01 01:00:00.000000000 +0100
>@@ -1,66 +0,0 @@
>-commit 6e14443b30ce2c8e284617840bc49e249c63afc1
>-Author: oconrad <conrad@geowiss.uni-hamburg.de>
>-Date:   Fri Dec 8 10:16:47 2017 +0100
>-
>-    saga_gui, loading tool description from file: wxgtk issue reported in [saga-gis-developer] SAGA GIS on FreeBSD: fails to build with wxgtk30 - 3.0.3.1
>----
>- saga-gis/src/saga_core/saga_gui/wksp_tool.cpp | 25 ++++++++-----------------
>- saga-gis/src/saga_core/saga_gui/wksp_tool.h   |  2 --
>- 2 files changed, 8 insertions(+), 19 deletions(-)
>-
>---- src/saga_core/saga_gui/wksp_tool.cpp.orig	2017-09-01 15:57:36 UTC
>-+++ src/saga_core/saga_gui/wksp_tool.cpp
>-@@ -135,34 +135,25 @@ wxString CWKSP_Tool::Get_Name(void)
>- }
>- 
>- //---------------------------------------------------------
>--wxString CWKSP_Tool::Get_File_Name(void)
>--{
>--	return( m_pTool->Get_File_Name().c_str() );
>--}
>--
>--//---------------------------------------------------------
>- wxString CWKSP_Tool::Get_Description(void)
>- {
>- 	//-----------------------------------------------------
>--	if( !Get_File_Name().IsEmpty() )
>-+	if( !m_pTool->Get_File_Name().is_Empty() )
>- 	{
>-+		CSG_String	Lib_Name	= SG_File_Get_Name(m_pTool->Get_File_Name(), false);
>-+		CSG_String	File_Path	= SG_File_Make_Path(SG_File_Get_Path(m_pTool->Get_File_Name()), Lib_Name, "");
>-+
>-+		File_Path	= SG_File_Make_Path(File_Path, CSG_String::Format("%s_%02d", Lib_Name.c_str(), Get_Index()));
>-+
>- 		CSG_String	Description;
>- 		CSG_File	Stream;
>- 
>--		wxFileName	FileName(Get_File_Name());
>--		FileName.AppendDir	(FileName.GetName());
>--		FileName.SetName	(wxString::Format("%s_%02d", FileName.GetName().c_str(), Get_Index()));
>--
>--		FileName.SetExt		("html");
>--
>--		if( Stream.Open(FileName.GetFullPath().wc_str(), SG_FILE_R) && Stream.Read(Description, Stream.Length()) )
>-+		if( SG_File_Set_Extension(File_Path, "html") && Stream.Open(File_Path, SG_FILE_R) && Stream.Read(Description, Stream.Length()) )
>- 		{
>- 			return( Description.c_str() );
>- 		}
>- 
>--		FileName.SetExt		("htm");
>--
>--		if( Stream.Open(FileName.GetFullPath().wc_str(), SG_FILE_R) && Stream.Read(Description, Stream.Length()) )
>-+		if( SG_File_Set_Extension(File_Path, "htm" ) && Stream.Open(File_Path, SG_FILE_R) && Stream.Read(Description, Stream.Length()) )
>- 		{
>- 			return( Description.c_str() );
>- 		}
>---- src/saga_core/saga_gui/wksp_tool.h.orig	2017-05-24 13:15:53 UTC
>-+++ src/saga_core/saga_gui/wksp_tool.h
>-@@ -103,8 +103,6 @@ class CWKSP_Tool : public CWKSP_Base_Item (public)
>- 	void							Set_Menu_ID			(int Menu_ID);
>- 	int								Get_Menu_ID			(void)			{	return( m_Menu_ID );	}
>- 
>--	wxString						Get_File_Name		(void);
>--
>- 	bool							is_Interactive		(void);
>- 	bool							is_Executing		(void);
>- 
>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	2017-01-24 17:04:32.190552000 +0100
>+++ saga/files/patch-src_saga__core_saga__cmd_saga__cmd.cpp	2018-05-01 11:11:28.123562000 +0200
>@@ -1,14 +1,14 @@
>---- src/saga_core/saga_cmd/saga_cmd.cpp.orig	2016-06-29 05:55:46 UTC
>+--- src/saga_core/saga_cmd/saga_cmd.cpp.orig	2018-05-01 09:07:11 UTC
> +++ src/saga_core/saga_cmd/saga_cmd.cpp
>-@@ -65,6 +65,7 @@
>+@@ -64,6 +64,7 @@
>  
>  #include <wx/app.h>
>  #include <wx/utils.h>
> +#include <clocale>
>  
>+ #include "config.h"
>  #include "callback.h"
>- 
>-@@ -164,7 +165,7 @@ _except(1)
>+@@ -168,7 +169,7 @@ _except(1)
>  //---------------------------------------------------------
>  bool		Run(int argc, char *argv[])
>  {
>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	2016-07-12 06:35:46.672564000 +0200
>+++ saga/files/patch-src_saga__core_saga__gui_dlg__about.cpp	2018-05-01 11:19:19.255338000 +0200
>@@ -1,6 +1,6 @@
>---- src/saga_core/saga_gui/dlg_about.cpp.orig	2016-06-29 05:55:46 UTC
>+--- src/saga_core/saga_gui/dlg_about.cpp.orig	2018-05-01 09:07:11 UTC
> +++ src/saga_core/saga_gui/dlg_about.cpp
>-@@ -189,6 +189,7 @@ wxString CDLG_About::_Get_Version(void)
>+@@ -188,6 +188,7 @@ wxString CDLG_About::_Get_Version(void)
>  	s	+= "http://www.saga-gis.org\n";
>  	s	+= "\n";
>  	s	+= "Version: " + wxString(SAGA_VERSION) + "\n";
>@@ -8,7 +8,7 @@
>  
>  #ifdef _SAGA_MSW
>  	#ifdef _WIN64
>-@@ -264,7 +265,25 @@ wxString CDLG_About::_Get_Version(void)
>+@@ -263,7 +264,25 @@ wxString CDLG_About::_Get_Version(void)
>  		#elif	defined(__GNUWIN32__)
>  			"Gnu-Win32 compiler"
>  		#elif	defined(__GNUG__)
>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	2017-01-24 17:04:32.184624000 +0100
>+++ saga/files/patch-src_tools_imagery_imagery__opencv_opencv.h	2018-05-01 11:11:28.129707000 +0200
>@@ -1,6 +1,6 @@
>---- src/tools/imagery/imagery_opencv/opencv.h.orig	2016-06-29 05:55:46 UTC
>+--- src/tools/imagery/imagery_opencv/opencv.h.orig	2018-05-01 09:07:11 UTC
> +++ src/tools/imagery/imagery_opencv/opencv.h
>-@@ -74,7 +74,8 @@
>+@@ -73,7 +73,8 @@
>  
>  //---------------------------------------------------------
>  #include <opencv/cv.h>
>diff -urN saga.orig/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp
>--- saga.orig/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp	2017-12-12 19:27:29.795805000 +0100
>+++ saga/files/patch-src_tools_imagery_imagery__svm_MLB__Interface.cpp	2018-05-01 11:11:28.132858000 +0200
>@@ -1,6 +1,6 @@
>---- src/tools/imagery/imagery_svm/MLB_Interface.cpp.orig	2017-01-29 14:18:09 UTC
>+--- src/tools/imagery/imagery_svm/MLB_Interface.cpp.orig	2018-05-01 09:07:10 UTC
> +++ src/tools/imagery/imagery_svm/MLB_Interface.cpp
>-@@ -62,7 +62,7 @@
>+@@ -61,7 +61,7 @@
>  #include "MLB_Interface.h"
>  
>  #if defined(SYSTEM_SVM)
>diff -urN saga.orig/files/patch-src_tools_imagery_imagery__svm_svm__grids.h saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h
>--- saga.orig/files/patch-src_tools_imagery_imagery__svm_svm__grids.h	2017-12-12 19:27:29.796027000 +0100
>+++ saga/files/patch-src_tools_imagery_imagery__svm_svm__grids.h	2018-05-01 11:11:28.136050000 +0200
>@@ -1,6 +1,6 @@
>---- src/tools/imagery/imagery_svm/svm_grids.h.orig	2017-01-29 14:18:09 UTC
>+--- src/tools/imagery/imagery_svm/svm_grids.h.orig	2018-05-01 09:07:11 UTC
> +++ src/tools/imagery/imagery_svm/svm_grids.h
>-@@ -73,7 +73,7 @@
>+@@ -72,7 +72,7 @@
>  #include "MLB_Interface.h"
>  
>  #if defined(SYSTEM_SVM)
>diff -urN saga.orig/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp
>--- saga.orig/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp	2018-05-03 17:24:25.403046000 +0200
>+++ saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp	2018-05-04 10:52:59.000000000 +0200
>@@ -1,16 +1,25 @@
>-grid_to_kml.cpp: In member function 'bool CGrid_from_KML::Load_Overlay(const wchar_t*, const CSG_MetaData&)':
>-grid_to_kml.cpp:585:49: error: conversion from 'const wxScopedWCharBuffer {aka const wxScopedCharTypeBuffer<wchar_t>}' to non-scalar type 'CSG_String' requested
>-  CSG_String   FullPath = fn.GetFullPath().wc_str();
>-                          ~~~~~~~~~~~~~~~~~~~~~~~^~
>-
>---- src/tools/io/io_grid_image/grid_to_kml.cpp.orig	2017-06-21 13:50:57 UTC
>+--- src/tools/io/io_grid_image/grid_to_kml.cpp.orig	2018-05-03 05:29:35 UTC
> +++ src/tools/io/io_grid_image/grid_to_kml.cpp
>-@@ -582,7 +582,7 @@ bool CGrid_from_KML::Load_Overlay(const SG_Char *Dir, 
>+@@ -504,7 +504,7 @@ bool CGrid_from_KML::On_Execute(void)
>+ 
>+ 	if( !KML.Load(&File) )
>+ 	{
>+-		Error_Fmt("%s [%s]", _TL("failed to load file"), File.wc_str());
>++		Error_Fmt("%s [%s]", _TL("failed to load file"), File.wx_str());
>+ 
>+ 		return( false );
>  	}
>+@@ -582,11 +582,11 @@ bool CGrid_from_KML::Load_Overlay(const SG_Char *Dir, 
>+ 	}
>  
>  	CSG_Data_Manager	Data;
> -	CSG_String			FullPath = fn.GetFullPath().wc_str();
>-+	CSG_String		FullPath = static_cast<const wchar_t*>(fn.GetFullPath().wc_str());
>++	CSG_String			FullPath = fn.GetFullPath().wx_str();
>  
>  	if( !Data.Add(FullPath) || !Data.Get_Grid_System(0) || !Data.Get_Grid_System(0)->Get(0) )
>  	{
>+-		Error_Fmt("%s: %s", _TL("failed to load KML ground overlay icon"), fn.GetFullPath().wc_str());
>++		Error_Fmt("%s: %s", _TL("failed to load KML ground overlay icon"), fn.GetFullPath().wx_str());
>+ 	}
>+ 
>+ 	//-----------------------------------------------------
>diff -urN saga.orig/files/patch-src_tools_io_io__shapes__las_Makefile.am saga/files/patch-src_tools_io_io__shapes__las_Makefile.am
>--- saga.orig/files/patch-src_tools_io_io__shapes__las_Makefile.am	1970-01-01 01:00:00.000000000 +0100
>+++ saga/files/patch-src_tools_io_io__shapes__las_Makefile.am	2018-05-01 11:11:28.142241000 +0200
>@@ -0,0 +1,11 @@
>+--- src/tools/io/io_shapes_las/Makefile.am.orig	2016-11-17 08:03:02 UTC
>++++ src/tools/io/io_shapes_las/Makefile.am
>+@@ -6,7 +6,7 @@ DBGFLAGS = -g -DDEBUG
>+ endif
>+ 
>+ if HAVE_LLAS
>+-DEP_LIBS           = -llas
>++DEP_LIBS           = -llas12
>+ DEF_SAGA           = -D_SAGA_LINUX -D_TYPEDEF_BYTE -D_TYPEDEF_WORD -D_SAGA_UNICODE
>+ CXX_INCS           = -I$(top_srcdir)/src/saga_core
>+ AM_CXXFLAGS        = -fPIC $(CXX_INCS) $(DEF_SAGA) $(DBGFLAGS) $(GOMPFLAGS)
>diff -urN saga.orig/files/patch-src_tools_io_io__shapes__las_las__export.cpp saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp
>--- saga.orig/files/patch-src_tools_io_io__shapes__las_las__export.cpp	1970-01-01 01:00:00.000000000 +0100
>+++ saga/files/patch-src_tools_io_io__shapes__las_las__export.cpp	2018-05-01 11:11:28.145365000 +0200
>@@ -0,0 +1,15 @@
>+--- src/tools/io/io_shapes_las/las_export.cpp.orig	2018-05-01 09:07:10 UTC
>++++ src/tools/io/io_shapes_las/las_export.cpp
>+@@ -61,9 +61,9 @@
>+ //---------------------------------------------------------
>+ #include "las_export.h"
>+ 
>+-#include <liblas/laspoint.hpp>
>+-#include <liblas/laswriter.hpp>
>+-#include <liblas/capi/las_version.h>
>++#include <liblas12/laspoint.hpp>
>++#include <liblas12/laswriter.hpp>
>++#include <liblas12/capi/las_version.h>
>+ #include <fstream>
>+ #include <iostream>
>+ #include <cstddef>
>diff -urN saga.orig/files/patch-src_tools_io_io__shapes__las_las__import.cpp saga/files/patch-src_tools_io_io__shapes__las_las__import.cpp
>--- saga.orig/files/patch-src_tools_io_io__shapes__las_las__import.cpp	1970-01-01 01:00:00.000000000 +0100
>+++ saga/files/patch-src_tools_io_io__shapes__las_las__import.cpp	2018-05-01 11:11:28.148488000 +0200
>@@ -0,0 +1,15 @@
>+--- src/tools/io/io_shapes_las/las_import.cpp.orig	2018-05-01 09:07:10 UTC
>++++ src/tools/io/io_shapes_las/las_import.cpp
>+@@ -60,9 +60,9 @@
>+ //---------------------------------------------------------
>+ #include "las_import.h"
>+ 
>+-#include <liblas/laspoint.hpp>
>+-#include <liblas/lasreader.hpp>
>+-#include <liblas/capi/las_version.h>
>++#include <liblas12/laspoint.hpp>
>++#include <liblas12/lasreader.hpp>
>++#include <liblas12/capi/las_version.h>
>+ #include <fstream>
>+ #include <iostream>
>+ 
>diff -urN saga.orig/files/patch-src_tools_io_io__shapes__las_las__info.h saga/files/patch-src_tools_io_io__shapes__las_las__info.h
>--- saga.orig/files/patch-src_tools_io_io__shapes__las_las__info.h	1970-01-01 01:00:00.000000000 +0100
>+++ saga/files/patch-src_tools_io_io__shapes__las_las__info.h	2018-05-01 11:11:28.151505000 +0200
>@@ -0,0 +1,15 @@
>+--- src/tools/io/io_shapes_las/las_info.h.orig	2018-05-01 09:07:11 UTC
>++++ src/tools/io/io_shapes_las/las_info.h
>+@@ -76,9 +76,9 @@
>+ //---------------------------------------------------------
>+ #include "MLB_Interface.h"
>+ 
>+-#include <liblas/laspoint.hpp>
>+-#include <liblas/lasreader.hpp>
>+-#include <liblas/capi/las_version.h>
>++#include <liblas12/laspoint.hpp>
>++#include <liblas12/lasreader.hpp>
>++#include <liblas12/capi/las_version.h>
>+ #include <fstream>
>+ #include <iostream>
>+ 
>diff -urN saga.orig/pkg-plist saga/pkg-plist
>--- saga.orig/pkg-plist	2017-11-22 19:23:16.536574000 +0100
>+++ saga/pkg-plist	2018-04-23 11:50:09.000000000 +0200
>@@ -184,7 +184,10 @@
> %%DATADIR%%/saga_tip.txt
> %%DATADIR%%/toolchains/climate.xml
> %%DATADIR%%/toolchains/cluster_terrain.xml
>-%%DATADIR%%/toolchains/gc_simple_filter.xml
>+%%DATADIR%%/toolchains/gc_filter_gaussian.xml
>+%%DATADIR%%/toolchains/gc_filter_laplacian.xml
>+%%DATADIR%%/toolchains/gc_filter_rank.xml
>+%%DATADIR%%/toolchains/gc_filter_simple.xml
> %%DATADIR%%/toolchains/gc_tools.xml
> %%DATADIR%%/toolchains/grid_filter.xml
> %%DATADIR%%/toolchains/grid_list_simple_filter.xml

Flags:

rhurlin: maintainer-approval+

Actions: View | Diff

Attachments on bug 227901: 192970 | 193003 | 193043 | 193234 | 194306