From 999d0e506c76f1efcd7f19e12493c042f27f80b8 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Feb 03 2016 15:55:30 +0000 Subject: Add paraview-gcc6.patch --- diff --git a/paraview-gcc6.patch b/paraview-gcc6.patch new file mode 100644 index 0000000..5ecb2d3 --- /dev/null +++ b/paraview-gcc6.patch @@ -0,0 +1,19 @@ +diff -up ParaView-v5.0.0-source/Plugins/PointSprite/Qvis/VolumeAttributes.cpp.gcc6 ParaView-v5.0.0-source/Plugins/PointSprite/Qvis/VolumeAttributes.cpp +--- ParaView-v5.0.0-source/Plugins/PointSprite/Qvis/VolumeAttributes.cpp.gcc6 2016-01-08 13:21:35.000000000 -0700 ++++ ParaView-v5.0.0-source/Plugins/PointSprite/Qvis/VolumeAttributes.cpp 2016-02-02 13:50:54.518025709 -0700 +@@ -35,6 +35,7 @@ + * + *****************************************************************************/ + ++#include + #include + #include + #include +@@ -1825,7 +1826,6 @@ VolumeAttributes::SetDefaultColorControl + // Made the method const. + // + // **************************************************************************** +-#include + void + VolumeAttributes::GetGaussianOpacities(unsigned char *alphas) const + { diff --git a/paraview.spec b/paraview.spec index 9ffdb05..4de5ff1 100644 --- a/paraview.spec +++ b/paraview.spec @@ -40,6 +40,8 @@ Source2: paraview.xml # Fix Version in desktop file # http://www.paraview.org/Bug/view.php?id=12508 Patch0: paraview-desktop.patch +# https://gitlab.kitware.com/paraview/paraview/merge_requests/605 +Patch1: paraview-gcc6.patch # Unbundle eigen # https://bugzilla.redhat.com/show_bug.cgi?id=1251289 Patch2: paraview-eigen.patch @@ -316,6 +318,7 @@ developing applications that use %{name}-mpich. %prep %setup -q -n ParaView-v%{version}%{rcver}-source %patch0 -p1 -b .desktop +%patch1 -p1 -b .gcc6 %patch2 -p1 -b .eigen %patch3 -p1 -b .jsoncpp %patch5 -p1 -b .headers @@ -567,7 +570,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : * Mon Feb 1 2016 Orion Poplawski - 5.0.0-1 - Update to 5.0.0 final - Drop non_x86 patch, fixed upstream -- Add vtk-gcc6 patch to support gcc6 +- Add vtk-gcc6, paraview-gcc6 patches to support gcc6 * Fri Jan 22 2016 Orion Poplawski - 5.0.0-0.6.RC3 - Rebuild for netcdf 4.4.0