From owner-svn-ports-all@freebsd.org Sun Feb 18 08:19:34 2018 Return-Path: Delivered-To: svn-ports-all@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 45193F1EBC8; Sun, 18 Feb 2018 08:19:34 +0000 (UTC) (envelope-from tcberner@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 EC77F6AD9E; Sun, 18 Feb 2018 08:19:33 +0000 (UTC) (envelope-from tcberner@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 E76FC1156; Sun, 18 Feb 2018 08:19:33 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1I8JXGX096749; Sun, 18 Feb 2018 08:19:33 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1I8JX51096748; Sun, 18 Feb 2018 08:19:33 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201802180819.w1I8JX51096748@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sun, 18 Feb 2018 08:19:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r462204 - head/math/qwtplot3d-qt4/files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/math/qwtplot3d-qt4/files X-SVN-Commit-Revision: 462204 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.25 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: Sun, 18 Feb 2018 08:19:34 -0000 Author: tcberner Date: Sun Feb 18 08:19:33 2018 New Revision: 462204 URL: https://svnweb.freebsd.org/changeset/ports/462204 Log: math/qwtplot3d-qt4, fix build with clang6. Added: head/math/qwtplot3d-qt4/files/patch-src_qwt3d__lighting.cpp (contents, props changed) Added: head/math/qwtplot3d-qt4/files/patch-src_qwt3d__lighting.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/qwtplot3d-qt4/files/patch-src_qwt3d__lighting.cpp Sun Feb 18 08:19:33 2018 (r462204) @@ -0,0 +1,18 @@ +src/qwt3d_lighting.cpp:178:27: error: non-constant-expression cannot be narrowed from type 'double' to +'GLfloat' (aka 'float') in initializer list [-Wc++11-narrowing] + GLfloat lightPos[4] = { lights_[light].shift.x, lights_[light].shift.y, lights_[light].shift.z, 1.0}; + ^~~~~~~~~~~~~~~~~~~~~~ +src/qwt3d_lighting.cpp:178:27: note: insert an explicit cast to silence this issue + + +--- src/qwt3d_lighting.cpp.orig 2018-02-17 23:11:11 UTC ++++ src/qwt3d_lighting.cpp +@@ -175,7 +175,7 @@ void Plot3D::applyLight(unsigned light) + glRotatef( lights_[light].rot.x-90, 1.0, 0.0, 0.0 ); + glRotatef( lights_[light].rot.y , 0.0, 1.0, 0.0 ); + glRotatef( lights_[light].rot.z , 0.0, 0.0, 1.0 ); +- GLfloat lightPos[4] = { lights_[light].shift.x, lights_[light].shift.y, lights_[light].shift.z, 1.0}; ++ GLfloat lightPos[4] = { static_cast(lights_[light].shift.x), static_cast(lights_[light].shift.y), static_cast(lights_[light].shift.z), 1.0}; + GLenum le = lightEnum(light); + glLightfv(le, GL_POSITION, lightPos); + }