rpm/paraview
SHA256
1
0
Fork 0
forked from pool/paraview
Code Pull Requests Activity

Accepting request 116110 from home:badshah400:branches:science

Browse Source 
Add patch to fix building with gcc 4.7 in factory.

OBS-URL: https://build.opensuse.org/request/show/116110
OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=6
This commit is contained in:
Ismail Dönmez 2012-05-01 09:40:14 +00:00 committed by Git OBS Bridge
parent b684bfc114
commit c16ef67e7b
3 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
paraview-gcc47.patch Normal file
View File

@ -0,0 +1,36 @@
Index: ParaView-3.14.0-Source/VTK/Rendering/vtkFreeTypeUtilities.cxx
===================================================================
--- ParaView-3.14.0-Source.orig/VTK/Rendering/vtkFreeTypeUtilities.cxx
+++ ParaView-3.14.0-Source/VTK/Rendering/vtkFreeTypeUtilities.cxx
@@ -31,6 +31,7 @@
#include "fonts/vtkEmbeddedFonts.h"
#include <sys/stat.h>
+#include <unistd.h>
#ifdef FTGL_USE_NAMESPACE
using namespace ftgl;
Index: ParaView-3.14.0-Source/VTK/Rendering/vtkFreeTypeTools.cxx
===================================================================
--- ParaView-3.14.0-Source.orig/VTK/Rendering/vtkFreeTypeTools.cxx
+++ ParaView-3.14.0-Source/VTK/Rendering/vtkFreeTypeTools.cxx
@@ -13,6 +13,7 @@
=========================================================================*/
+#include <unistd.h>
#include "vtkFreeTypeTools.h"
#include "vtkTextProperty.h"
Index: ParaView-3.14.0-Source/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx
===================================================================
--- ParaView-3.14.0-Source.orig/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx
+++ ParaView-3.14.0-Source/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx
@@ -21,6 +21,7 @@
//files around for inspection. Otherwise it deletes the temporary files it
//creates and returns success.
+#include <unistd.h>
#include "vtkXdmfWriter.h"
#include "vtkCellData.h"

6
paraview.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Apr 28 13:56:56 UTC 2012 - badshah400@gmail.com
- Added paraview-gcc47.patch to fix build failures with gcc >= 4.7:
this fixes building on openSUSE > 12.1.
-------------------------------------------------------------------
Sun Apr 8 16:58:18 UTC 2012 - badshah400@gmail.com

6
paraview.spec
View File

@ -29,6 +29,8 @@ Source0: ParaView-%{version}-Source.tar.gz
Patch0: paraview-default-qtstyle.patch
# PATCH-FIX-UPSTREAM paraview-boost-1.49-compat.patch badshah400@gmail.com -- Fix incompatibility of paraview with boost 1.49
Patch1: paraview-boost-1.49-compat.patch
# PATCH-FIX-UPSTREAM paraview-gcc47.patch badshah400@gmail.com -- Fix build failures with gcc 4.7
Patch2: paraview-gcc47.patch
BuildRequires: Mesa-devel
BuildRequires: boost-devel
BuildRequires: cmake
@ -77,6 +79,10 @@ NOTE: The version in this package has NOT been compiled with MPI support.
%setup -q -n ParaView-%{version}-Source
%patch0 -p1
%patch1 -p1
# GCC 4.7 only available for openSUSE > 12.1
%if 0%{?suse_version} > 1210
%patch2 -p1
%endif
%build
export CC='gcc'