From owner-svn-ports-all@FreeBSD.ORG Thu Jan 29 21:52:24 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 041092C3; Thu, 29 Jan 2015 21:52:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 D8FC6E62; Thu, 29 Jan 2015 21:52:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t0TLqNin062694; Thu, 29 Jan 2015 21:52:23 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t0TLqN48062692; Thu, 29 Jan 2015 21:52:23 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <201501292152.t0TLqN48062692@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Thu, 29 Jan 2015 21:52:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378131 - in head/science/paraview: . 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.18-1 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: Thu, 29 Jan 2015 21:52:24 -0000 Author: thierry Date: Thu Jan 29 21:52:22 2015 New Revision: 378131 URL: https://svnweb.freebsd.org/changeset/ports/378131 QAT: https://qat.redports.org/buildarchive/r378131/ Log: Unbreak. Submitted by: Stas Timokhin (maintainer) Added: head/science/paraview/files/patch-VTK_Rendering_FreeType_vtkFreeTypeTools.cxx (contents, props changed) Modified: head/science/paraview/Makefile Modified: head/science/paraview/Makefile ============================================================================== --- head/science/paraview/Makefile Thu Jan 29 21:33:52 2015 (r378130) +++ head/science/paraview/Makefile Thu Jan 29 21:52:22 2015 (r378131) @@ -16,8 +16,6 @@ LICENSE_NAME= ParaView_License LICENSE_FILE= ${PATCH_WRKSRC}/License_v1.2.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BROKEN= Fails to build - BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:${PORTSDIR}/math/py-matplotlib LIB_DEPENDS= libhdf5.so:${PORTSDIR}/science/hdf5 \ libpng.so:${PORTSDIR}/graphics/png \ @@ -34,6 +32,8 @@ LIB_DEPENDS= libhdf5.so:${PORTSDIR}/scie RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \ ${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:${PORTSDIR}/math/py-matplotlib +CONFLICTS_BUILD= protobuf* + USE_QT4= qmake_build moc_build rcc_build uic_build \ linguist_build assistant_run qt3support \ dbus designer gui help-tools network script \ Added: head/science/paraview/files/patch-VTK_Rendering_FreeType_vtkFreeTypeTools.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/paraview/files/patch-VTK_Rendering_FreeType_vtkFreeTypeTools.cxx Thu Jan 29 21:52:22 2015 (r378131) @@ -0,0 +1,26 @@ +--- VTK/Rendering/FreeType/vtkFreeTypeTools.cxx.orig 2014-01-11 15:02:09.000000000 +0100 ++++ VTK/Rendering/FreeType/vtkFreeTypeTools.cxx 2015-01-29 21:09:32.000000000 +0100 +@@ -1186,8 +1186,10 @@ + if (bitmap) + { + metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent); +- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)), +- metaData.descent); ++// metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)), ++// metaData.descent); ++ metaData.descent = std::min(-(static_cast(bitmap->rows) - (bitmapGlyph->top - 1)), ++ metaData.descent); + } + ++heightString; + } +@@ -1951,8 +1953,8 @@ + if (bitmap) + { + bbox[0] = std::min(bbox[0], pen[0] + bitmapGlyph->left); +- bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + bitmap->width); +- bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - bitmap->rows); ++ bbox[1] = std::max(bbox[1], pen[0] + bitmapGlyph->left + static_cast(bitmap->width)); ++ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast(bitmap->rows)); + bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1); + } + else