From owner-svn-ports-all@freebsd.org Sat Apr 16 21:30:24 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 374B3B1019F; Sat, 16 Apr 2016 21:30:24 +0000 (UTC) (envelope-from dim@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 mx1.freebsd.org (Postfix) with ESMTPS id 08F5B199F; Sat, 16 Apr 2016 21:30:23 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3GLUNAg037034; Sat, 16 Apr 2016 21:30:23 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3GLUNfw037033; Sat, 16 Apr 2016 21:30:23 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201604162130.u3GLUNfw037033@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 16 Apr 2016 21:30:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413481 - head/graphics/gource/files X-SVN-Group: ports-head 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.21 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: Sat, 16 Apr 2016 21:30:24 -0000 Author: dim (src committer) Date: Sat Apr 16 21:30:23 2016 New Revision: 413481 URL: https://svnweb.freebsd.org/changeset/ports/413481 Log: During the exp-run in bug 208158, it was found that graphics/gource gives errors with libc++ 3.8.0: src/dirnode.cpp:585:27: error: no matching function for call to 'max' this->parent_radius = std::max(1.0, sqrt(total_file_area) * gGourceDirPadding); ^~~~~~~~ This is because max() is being called with two arguments of different type (double and float). Fix this by using 0.0f instead (and casting the result of sqrt to float like two lines above, though this should strictly not be necessary). Approved by: demon (maintainer) PR: 208844 MFH: 2016Q2 Added: head/graphics/gource/files/ head/graphics/gource/files/patch-src_dirnode.cpp (contents, props changed) Added: head/graphics/gource/files/patch-src_dirnode.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gource/files/patch-src_dirnode.cpp Sat Apr 16 21:30:23 2016 (r413481) @@ -0,0 +1,11 @@ +--- src/dirnode.cpp.orig 2014-10-16 02:23:22 UTC ++++ src/dirnode.cpp +@@ -582,7 +582,7 @@ void RDirNode::calcRadius() { + //this->dir_radius_sqrt = sqrt(dir_radius); //dir_radius_sqrt is not used + + // this->parent_radius = std::max(1.0, parent_circ / PI); +- this->parent_radius = std::max(1.0, sqrt(total_file_area) * gGourceDirPadding); ++ this->parent_radius = std::max(1.0f, (float)sqrt(total_file_area) * gGourceDirPadding); + } + + float RDirNode::distanceToParent() const{