Accepting request 148559 from home:badshah400:branches:science

Remove paraview-gcc47.patch; patch incorporated upstream

OBS-URL: https://build.opensuse.org/request/show/148559
OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=10
This commit is contained in:
2013-01-15 13:40:26 +00:00
committed by Git OBS Bridge
parent c8e6e4e486
commit 231c87d044
3 changed files with 5 additions and 38 deletions

View File

@@ -1,36 +0,0 @@
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"

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jan 15 13:32:39 UTC 2013 - badshah400@gmail.com
- Remove paraview-gcc47.patch; patch incorporated upstream.
-------------------------------------------------------------------
Tue Jan 8 09:14:33 UTC 2013 - badshah400@gmail.com

View File

@@ -27,8 +27,6 @@ Group: Productivity/Scientific/Physics
Source0: ParaView-%{version}-src.tgz
# PATCH-FIX-UPSTREAM paraview-default-qtstyle.patch badshah400@gmail.com -- Make paraview inherit default qt gui look and feel, instead of using the Plastique theme
Patch0: paraview-default-qtstyle.patch
# PATCH-FIX-UPSTREAM paraview-gcc47.patch badshah400@gmail.com -- Fix build failures with gcc 4.7
# Patch2: paraview-gcc47.patch
# PATCH-FIX-UPSTREAM paraview-SciberQuestToolKit-install-path.patch badshah400@gmail.com -- Fix install path of SciberQuestToolkit plugin
Patch1: paraview-SciberQuestToolKit-install-path.patch
# PATCH-FIX-UPSTREAM paraview-no-return-in-nonvoid-function.patch badshah400@gmail.com -- Fix a non-void function that returns no value