Hello community, here is the log from the commit of package paraview for openSUSE:Factory checked in at 2015-01-07 09:38:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/paraview (Old) and /work/SRC/openSUSE:Factory/.paraview.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "paraview" Changes: -------- --- /work/SRC/openSUSE:Factory/paraview/paraview.changes 2014-10-02 14:14:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.paraview.new/paraview.changes 2015-01-07 09:38:44.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 5 12:50:29 UTC 2015 - [email protected] + +- Add paraview-freetype-2.5.4.patch: Fix build with FreeType 2.5.4 + API changes. + +------------------------------------------------------------------- New: ---- paraview-freetype-2.5.4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ paraview.spec ++++++ --- /var/tmp/diff_new_pack.aC6BJP/_old 2015-01-07 09:38:47.000000000 +0100 +++ /var/tmp/diff_new_pack.aC6BJP/_new 2015-01-07 09:38:47.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package paraview # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,8 @@ Patch1: paraview-desktop-entry-fix.patch # PATCH-FIX-UPSTREAM paraview-fix-file-contains-date-time.patch [email protected] -- Remove reference to __DATE__ and __TIME__ from source Patch2: paraview-fix-file-contains-date-time.patch +# PATCH-FIx-UPSTREAM paraview-freetype-2.5.4.patch [email protected] -- Fix build with FreeType 2.5.4+ +Patch3: paraview-freetype-2.5.4.patch BuildRequires: Mesa-devel BuildRequires: boost-devel BuildRequires: cmake >= 2.8.8 @@ -114,6 +116,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build # Prepare for gcc 4.9.0: work around gcc 4.9.0 regression ++++++ paraview-freetype-2.5.4.patch ++++++ Index: ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx =================================================================== --- ParaView-v4.2.0-source.orig/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx +++ ParaView-v4.2.0-source/VTK/Rendering/FreeType/vtkFreeTypeTools.cxx @@ -1183,7 +1183,7 @@ bool vtkFreeTypeTools::CalculateBounding 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; @@ -1950,8 +1950,8 @@ void vtkFreeTypeTools::GetLineMetrics(T 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
