Date: Thu, 29 Jan 2015 21:52:23 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378131 - in head/science/paraview: . files Message-ID: <201501292152.t0TLqN48062692@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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<int>(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<int>(bitmap->width)); ++ bbox[2] = std::min(bbox[2], pen[1] + bitmapGlyph->top - 1 - static_cast<int>(bitmap->rows)); + bbox[3] = std::max(bbox[3], pen[1] + bitmapGlyph->top - 1); + } + else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501292152.t0TLqN48062692>