From owner-svn-ports-head@freebsd.org Wed May 2 23:33:20 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7BF5FFB772F; Wed, 2 May 2018 23:33:20 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 3092A82A3C; Wed, 2 May 2018 23:33:20 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2AC6717B4E; Wed, 2 May 2018 23:33:20 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w42NXKoo061152; Wed, 2 May 2018 23:33:20 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w42NXKsl061151; Wed, 2 May 2018 23:33:20 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201805022333.w42NXKsl061151@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 2 May 2018 23:33:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468893 - head/math/saga/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/math/saga/files X-SVN-Commit-Revision: 468893 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 May 2018 23:33:20 -0000 Author: jbeich Date: Wed May 2 23:33:19 2018 New Revision: 468893 URL: https://svnweb.freebsd.org/changeset/ports/468893 Log: math/saga: unbreak build with wxWidgets 3.0.3 (try#2) 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}' to non-scalar type 'CSG_String' requested CSG_String FullPath = fn.GetFullPath().wc_str(); ~~~~~~~~~~~~~~~~~~~~~~~^~ PR: 223758 Submitted by: rozhuk.im@gmail.com Approved by: Rainer Hurling (maintainer) Added: head/math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp (contents, props changed) Added: head/math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/saga/files/patch-src_tools_io_io__grid__image_grid__to__kml.cpp Wed May 2 23:33:19 2018 (r468893) @@ -0,0 +1,16 @@ +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}' 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 +@@ -582,7 +582,7 @@ 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(fn.GetFullPath().wc_str()); + + if( !Data.Add(FullPath) || !Data.Get_Grid_System(0) || !Data.Get_Grid_System(0)->Get(0) ) + {