From f03e72493c81e333943a41838d9ca48001d75966 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 8 Jan 2015 15:57:04 -0700 Subject: [PATCH] Add patch to fix compilation error Conflicts: vtk.spec --- vtk.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/vtk.spec b/vtk.spec index 9623786..2839927 100644 --- a/vtk.spec +++ b/vtk.spec @@ -27,6 +27,9 @@ Patch2: vtk-6.1.0-netcdf.patch # Fix compilation with mesa 10.4 # https://bugzilla.redhat.com/show_bug.cgi?id=1138466 Patch3: vtk-glext.patch +# Fix types for std::min/man +# http://www.vtk.org/Bug/view.php?id=15249 +Patch4: vtk-type.patch URL: http://vtk.org/ @@ -179,6 +182,7 @@ programming languages. %patch1 -p1 -b .install %patch2 -p1 -b .netcdf %patch3 -p1 -b .glext +%patch4 -p1 -b .type # Remove included thirdparty sources just to be sure # TODO - vtksqlite for x in autobahn vtkexpat vtkfreetype vtkgl2ps vtkhdf5 vtkjpeg vtklibxml2 vtknetcdf vtkoggtheora vtkpng vtktiff twisted vtkzlib zope @@ -458,6 +462,7 @@ cp -pr --parents Wrapping/*/README* _docs/ %changelog * Sun Dec 13 2015 Orion Poplawski - 6.1.0-5 - Add patch to fix compilation with mesa 10.4 (bug #1291099) +- Add patch to fix compilation error - Don't override Java memory settings on s390 (related to bug #1115920) - Increase java heap space for builds (bug #1115920) - Add requires on blas-devel and lapack-devel to vtk-devel (bug #1105004)