From owner-svn-ports-all@freebsd.org Mon Jun 15 09:16:50 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2CA5E32CF6A; Mon, 15 Jun 2020 09:16:50 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49lm1G0T54z4L1n; Mon, 15 Jun 2020 09:16:50 +0000 (UTC) (envelope-from pkubaj@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 0A56D1B24E; Mon, 15 Jun 2020 09:16:50 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05F9GnNu099958; Mon, 15 Jun 2020 09:16:49 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05F9GnGX099957; Mon, 15 Jun 2020 09:16:49 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <202006150916.05F9GnGX099957@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Mon, 15 Jun 2020 09:16:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538865 - head/math/saga/files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: head/math/saga/files X-SVN-Commit-Revision: 538865 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Jun 2020 09:16:50 -0000 Author: pkubaj Date: Mon Jun 15 09:16:49 2020 New Revision: 538865 URL: https://svnweb.freebsd.org/changeset/ports/538865 Log: math/saga: fix build on GCC architectures Returning NULL as bool is not ok. --- globe_gores.lo --- globe_gores.cpp: In member function 'bool CGlobe_Gores::Add_Gore(int, int)': globe_gores.cpp:210:16: error: converting to 'bool' from 'std::nullptr_t' requires direct-initialization [-fpermissive] 210 | return( NULL ); PR: 246720 Approved by: rhurlin@gwdg.de (maintainer) Added: head/math/saga/files/patch-src_tools_projection_pj__proj4_globe__gores.cpp (contents, props changed) Added: head/math/saga/files/patch-src_tools_projection_pj__proj4_globe__gores.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/saga/files/patch-src_tools_projection_pj__proj4_globe__gores.cpp Mon Jun 15 09:16:49 2020 (r538865) @@ -0,0 +1,11 @@ +--- 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();