[paraview] Update gcc47 patch, put in upstream bug url

Orion Poplawski orion at fedoraproject.org
Fri Jan 27 17:59:48 UTC 2012


commit c3f3e23bcafa568937edf1460f96f6ae8b11ecf4
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Jan 27 10:59:47 2012 -0700

    Update gcc47 patch, put in upstream bug url

 paraview-gcc47.patch |   12 ++++++++++++
 paraview.spec        |    1 +
 2 files changed, 13 insertions(+), 0 deletions(-)
---
diff --git a/paraview-gcc47.patch b/paraview-gcc47.patch
index 36f7756..10347f7 100644
--- a/paraview-gcc47.patch
+++ b/paraview-gcc47.patch
@@ -1,3 +1,15 @@
+diff -up ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h.gcc47 ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h
+--- ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h.gcc47	2011-11-08 13:56:22.000000000 -0700
++++ ParaView-3.12.0/Qt/Core/pqServerManagerSelectionModel.h	2012-01-27 10:59:08.433123095 -0700
+@@ -72,7 +72,7 @@ public:
+     Clear          = QItemSelectionModel::Clear,
+     Select         = QItemSelectionModel::Select,
+     Deselect       = QItemSelectionModel::Deselect, 
+-    ClearAndSelect = Clear | Select
++    ClearAndSelect = QItemSelectionModel::Clear | QItemSelectionModel::Select
+   };
+   Q_DECLARE_FLAGS(SelectionFlags, SelectionFlag)
+ 
 diff -up ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx.gcc47 ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx
 --- ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx.gcc47	2011-11-08 13:56:29.000000000 -0700
 +++ ParaView-3.12.0/Utilities/Xdmf2/vtk/Testing/Cxx/XdmfTestVTKIO.cxx	2012-01-27 09:30:00.088542888 -0700
diff --git a/paraview.spec b/paraview.spec
index 7f81425..097b0bd 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -28,6 +28,7 @@ Patch1:         paraview-3.8.0-include.patch
 #Reported upstream: http://paraview.org/Bug/view.php?id=12772
 Patch2:         paraview-3.12.0-boost-1.48.0-bfs.patch
 #Patch to build with gcc 4.7
+#Reported upstream: http://paraview.org/Bug/view.php?id=12881
 Patch3:         paraview-gcc47.patch
 #Reported upstream: http://public.kitware.com/mantis/view.php?id=7023
 Patch7:         paraview-3.2.2-hdf5.patch


More information about the scm-commits mailing list