Accepting request 112994 from home:badshah400:branches:science

Update to version 3.14.0; add patch to fix incompatibility with boost 1.49

OBS-URL: https://build.opensuse.org/request/show/112994
OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=5

ParaView-3.12.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a54537cbe5976d863f9106b75eeef91908bb9058f5f0626cebb4a311a6feb6cc
-size 29563405

ParaView-3.14.0-Source.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bba70e982c11a18f5519da99be44698014bea6c59fac29d268ac5f62e6471b99
+size 42748299

paraview-boost-1.49-compat.patch

@@ -0,0 +1,19 @@
+Upstream Vtk bug: http://www.vtk.org/Bug/view.php?id=12988
+
+Index: ParaView-3.14.0-Source/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx
+===================================================================
+--- ParaView-3.14.0-Source.orig/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx
++++ ParaView-3.14.0-Source/VTK/Infovis/vtkBoostBreadthFirstSearchTree.cxx
+@@ -53,7 +53,11 @@ namespace {
+     return e.Id;
+   }
+   vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) {
+-    return e.underlying_desc.Id;
++  #if BOOST_VERSION == 104800
++	  return e.underlying_desc.Id;
++  #else
++	  return e.underlying_descx.Id;
++  #endif
+   }
+ }
+ #endif

paraview.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sun Apr  8 16:58:18 UTC 2012 - badshah400@gmail.com
+
+- Update to version 3.14.0:
+  + Too many changes to list. See complete list at
+    http://www.paraview.org/Bug/changelog_page.php?version_id=94
+- Added paraview-boost-1.49-compat.patch to workaround vtk's
+  incompatibility with boost version 1.48 and higher; fixes build
+  on factory. 
+
 -------------------------------------------------------------------
 Sun Nov  6 05:59:45 UTC 2011 - badshah400@gmail.com
 

paraview.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,16 +15,20 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%define major_ver 3.14
+
 Name:           paraview
-Version:        3.12.0
+Version:        3.14.0
 Release:        1
 License:        BSD-3-Clause
 Summary:        Data analysis and visualization application
 Url:            http://www.paraview.org
 Group:          Productivity/Scientific/Physics
-Source0:        ParaView-%{version}.tar.bz2
+Source0:        ParaView-%{version}-Source.tar.gz
 # 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
-Patch2:         paraview-default-qtstyle.patch
+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
 BuildRequires:  Mesa-devel
 BuildRequires:  boost-devel
 BuildRequires:  cmake
@@ -41,9 +45,7 @@ BuildRequires:  libQtWebKit-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  openssl-devel
 BuildRequires:  python-devel
-%if 0%{?suse_version} > 1130
 BuildRequires:  qt4-assistant-adp-devel
-%endif
 BuildRequires:  readline-devel
 BuildRequires:  tk-devel
 BuildRequires:  wget
@@ -72,8 +74,9 @@ user interface written using a unique blend of Tcl/Tk and C++.
 NOTE: The version in this package has NOT been compiled with MPI support.
 
 %prep
-%setup -q -n ParaView-%{version}
+%setup -q -n ParaView-%{version}-Source
-%patch2 -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
 export CC='gcc'
@@ -105,7 +108,6 @@ export CXXFLAGS="%{optflags}"
         -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \\\
         -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=OFF \\\
         -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \\\
-        -DVTK_USE_BOOST:BOOL=ON \\\
         -DVTK_USE_INFOVIS:BOOL=OFF \\\
         -DVTK_USE_N_WAY_ARRAYS:BOOL=ON \\\
         -DVTK_USE_RPATH:BOOL=OFF \\\
@@ -116,6 +118,7 @@ export CXXFLAGS="%{optflags}"
         -DVTK_USE_SYSTEM_TIFF:BOOL=ON \\\
         -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \\\
         -DBUILD_DOCUMENTATION:BOOL=ON \\\
+        -DVTK_USE_BOOST:BOOL=ON \\\
         -DBUILD_EXAMPLES:BOOL=ON
 
 mkdir temp_dir
@@ -123,6 +126,7 @@ pushd temp_dir
 cmake .. \
         -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/paraview \
         %{paraview_cmake_options}
+
 make
 popd
 
@@ -147,6 +151,7 @@ rm -rf /usr/src/packages/BUILD/ParaView-%{version}/temp_dir/Plugins/PointSprite/
 %doc License_v1.2.txt
 %{_libdir}/paraview/
 %{_bindir}/*
-
+%dir %{_includedir}/%{name}-%{major_ver}
+%{_includedir}/%{name}-%{major_ver}/vtkhdf5/
 
 %changelog