From abd87545d0c9e53f42171ed237e26ab79d9d9e13 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion(a)cora.nwra.com>
Date: Thu, 8 Jan 2015 16:02:27 -0700
Subject: Rebuild for hdf 1.8.14
- Add patch to fix compilation error
diff --git a/paraview.spec b/paraview.spec
index 7b70bb6..5a1a064 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -22,7 +22,7 @@
Name: paraview
Version: %{pv_majmin}.%{pv_patch}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Parallel visualization application
Group: Applications/Engineering
@@ -33,6 +33,8 @@ Source1: paraview_22x22.png
Source2: paraview.xml
#Patch to vtk (from vtk package) to use system libraries
Patch1: vtk-6.1.0-system.patch
+#
http://www.vtk.org/Bug/view.php?id=15249
+Patch2: vtk-type.patch
# Patch to vtk to use system netcdf library
Patch3: vtk-6.1.0-netcdf.patch
# Install missing headers
@@ -256,6 +258,7 @@ developing applications that use %{name}-mpich.
%prep
%setup -q -n ParaView-v%{version}%{rcver}-source
%patch1 -p0 -b .system
+%patch2 -p0 -b .type
%patch3 -p0 -b .netcdf
%patch5 -p1 -b .headers
%patch6 -p1 -b .topological-sort-cmake
@@ -510,6 +513,10 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &>
/dev/null || :
%changelog
+* Thu Jan 8 2015 Orion Poplawski <orion(a)cora.nwra.com> - 4.2.0-2
+- Rebuild for hdf 1.8.14
+- Add patch to fix compilation error
+
* Wed Oct 1 2014 Orion Poplawski <orion(a)cora.nwra.com> - 4.2.0-1
- Update to 4.2.0 final
diff --git a/vtk-type.patch b/vtk-type.patch
new file mode 100644
index 0000000..3c4140d
--- /dev/null
+++ b/vtk-type.patch
@@ -0,0 +1,23 @@
+diff -up VTK/Rendering/FreeType/vtkFreeTypeTools.cxx.type
VTK-6.1.0/Rendering/FreeType/vtkFreeTypeTools.cxx
+--- VTK/Rendering/FreeType/vtkFreeTypeTools.cxx.type 2014-01-22 08:55:41.000000000 -0700
++++ VTK/Rendering/FreeType/vtkFreeTypeTools.cxx 2015-01-08 15:00:40.492667074 -0700
+@@ -1186,7 +1186,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;
+@@ -1951,8 +1951,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
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/paraview.git/commit/?h=epel7&id=ab...