diff options
| author |   Matthias Maier <tamiko@gentoo.org> | 2014-12-31 12:36:59 +0000 |
|---|---|---|
| committer | Matthias Maier <tamiko@gentoo.org> | 2014-12-31 12:36:59 +0000 |
| commit | c8c22028fd062597d03e70aa03c9c4d40c6a2f71 (patch) | |
| tree | 1ba12122297e4f40703d9dbc2a80624ba8b4424d /sci-visualization/paraview | |
| parent | Enforce USE dependency for dev-libs/libdbusmenu-qt. (diff) | |
| download | gentoo-2-c8c22028fd062597d03e70aa03c9c4d40c6a2f71.tar.gz gentoo-2-c8c22028fd062597d03e70aa03c9c4d40c6a2f71.tar.bz2 gentoo-2-c8c22028fd062597d03e70aa03c9c4d40c6a2f71.zip | |
fix compilation with freetype-2.5.4, bug #533444
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key BD3A97A3)
Diffstat (limited to 'sci-visualization/paraview')
| -rw-r--r-- | sci-visualization/paraview/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-visualization/paraview/files/paraview-4.2.0-vtk-freetype.patch | 22 | ||||
| -rw-r--r-- | sci-visualization/paraview/paraview-4.2.0.ebuild | 5 |
3 files changed, 30 insertions, 3 deletions
diff --git a/sci-visualization/paraview/ChangeLog b/sci-visualization/paraview/ChangeLog index 6754ebd938f9..4925ed5895b7 100644 --- a/sci-visualization/paraview/ChangeLog +++ b/sci-visualization/paraview/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-visualization/paraview # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.84 2014/12/21 23:03:05 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/ChangeLog,v 1.85 2014/12/31 12:36:59 tamiko Exp $ + + 31 Dec 2014; Matthias Maier <tamiko@gentoo.org> + +files/paraview-4.2.0-vtk-freetype.patch, paraview-4.2.0.ebuild: + fix compilation with freetype-2.5.4, bug #533444 *paraview-4.2.0 (21 Dec 2014) diff --git a/sci-visualization/paraview/files/paraview-4.2.0-vtk-freetype.patch b/sci-visualization/paraview/files/paraview-4.2.0-vtk-freetype.patch new file mode 100644 index 000000000000..b7d3e409cde1 --- /dev/null +++ b/sci-visualization/paraview/files/paraview-4.2.0-vtk-freetype.patch @@ -0,0 +1,22 @@ +--- a/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx_orig 2014-12-23 09:25:35.000000000 +0100 ++++ b/ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx 2014-12-24 09:40:31.886953389 +0100 +@@ -1185,7 +1185,7 @@ + if (bitmap) + { + metaData.ascent = std::max(bitmapGlyph->top - 1, metaData.ascent); +- metaData.descent = std::min(-(bitmap->rows - (bitmapGlyph->top - 1)), ++ metaData.descent = std::min(-(static_cast<int>(bitmap->rows) - (bitmapGlyph->top - 1)), + metaData.descent); + } + ++heightString; +@@ -1952,8 +1952,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 diff --git a/sci-visualization/paraview/paraview-4.2.0.ebuild b/sci-visualization/paraview/paraview-4.2.0.ebuild index 148c7d4eb19c..b07e6c9d3270 100644 --- a/sci-visualization/paraview/paraview-4.2.0.ebuild +++ b/sci-visualization/paraview/paraview-4.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.2.0.ebuild,v 1.1 2014/12/21 23:03:05 tamiko Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/paraview/paraview-4.2.0.ebuild,v 1.2 2014/12/31 12:36:59 tamiko Exp $ EAPI=5 @@ -94,7 +94,8 @@ src_prepare() { "${FILESDIR}"/${P}-removesqlite.patch \ "${FILESDIR}"/${PN}-4.0.1-gcc-4.7.patch \ "${FILESDIR}"/${P}-Protobuf.patch \ - "${FILESDIR}"/${PN}-4.1.0-no-fatal-warnings.patch + "${FILESDIR}"/${PN}-4.1.0-no-fatal-warnings.patch \ + "${FILESDIR}"/${P}-vtk-freetype.patch # lib64 fixes sed -i \ |