From owner-svn-ports-head@freebsd.org Wed Jun 20 09:27:55 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 108AC100DBDA; Wed, 20 Jun 2018 09:27:55 +0000 (UTC) (envelope-from adridg@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 0072B72C33; Wed, 20 Jun 2018 09:27:52 +0000 (UTC) (envelope-from adridg@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 21F182066E; Wed, 20 Jun 2018 09:27:52 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5K9Rp8Y009101; Wed, 20 Jun 2018 09:27:51 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5K9Rp9Q009100; Wed, 20 Jun 2018 09:27:51 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201806200927.w5K9Rp9Q009100@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Wed, 20 Jun 2018 09:27:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472860 - head/math/vtk6/files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: head/math/vtk6/files X-SVN-Commit-Revision: 472860 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.26 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, 20 Jun 2018 09:27:55 -0000 Author: adridg Date: Wed Jun 20 09:27:51 2018 New Revision: 472860 URL: https://svnweb.freebsd.org/changeset/ports/472860 Log: Fix build of math/vtk6 with Clang6 on -CURRENT. The definition of NULL has changed in C++, and conversions have gotten stricter, so using NULL where you mean 0 (or false) is no longer an option. Detected by fallout from updating CMake 3.12. No PORTREVISION bump because everywhere where it compiled previously sees no change, and where it didn't compile before it does now with the same result. Reported by: tcberner Added: head/math/vtk6/files/patch-Rendering_OpenGL_vtkXOpenGLRenderWindow.cxx (contents, props changed) Added: head/math/vtk6/files/patch-Rendering_OpenGL_vtkXOpenGLRenderWindow.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/vtk6/files/patch-Rendering_OpenGL_vtkXOpenGLRenderWindow.cxx Wed Jun 20 09:27:51 2018 (r472860) @@ -0,0 +1,40 @@ +--- Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx.orig 2015-03-03 20:37:14 UTC ++++ Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx +@@ -386,7 +386,7 @@ XVisualInfo *vtkXOpenGLRenderWindow::Get + + vtkXOpenGLRenderWindow::vtkXOpenGLRenderWindow() + { +- this->ParentId = static_cast(NULL); ++ this->ParentId = static_cast(0); + this->ScreenSize[0] = 0; + this->ScreenSize[1] = 0; + this->OwnDisplay = 0; +@@ -394,8 +394,8 @@ vtkXOpenGLRenderWindow::vtkXOpenGLRender + this->ForceMakeCurrent = 0; + this->UsingHardware = 0; + this->DisplayId = static_cast(NULL); +- this->WindowId = static_cast(NULL); +- this->NextWindowId = static_cast(NULL); ++ this->WindowId = static_cast(0); ++ this->NextWindowId = static_cast(0); + this->ColorMap = static_cast(0); + this->OwnWindow = 0; + +@@ -776,7 +776,7 @@ void vtkXOpenGLRenderWindow::DestroyWind + if (this->OwnWindow && this->DisplayId && this->WindowId) + { + XDestroyWindow(this->DisplayId,this->WindowId); +- this->WindowId = static_cast(NULL); ++ this->WindowId = static_cast(0); + } + + // if we create the display, we'll delete it +@@ -1168,7 +1168,7 @@ void vtkXOpenGLRenderWindow::WindowRemap + + // set the default windowid + this->WindowId = this->NextWindowId; +- this->NextWindowId = static_cast(NULL); ++ this->NextWindowId = static_cast(0); + + // set everything up again + this->Initialize();