diff --git a/ParaView-3.14.1-Source.tar.gz b/ParaView-3.14.1-Source.tar.gz deleted file mode 100644 index c5ff01c..0000000 --- a/ParaView-3.14.1-Source.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84499b2775b2159a6f9afed43e7e48ecde998d094a0afe5e2a97db04e359b6f1 -size 41471770 diff --git a/ParaView-3.98.0-src.tgz b/ParaView-3.98.0-src.tgz new file mode 100644 index 0000000..5a6a98a --- /dev/null +++ b/ParaView-3.98.0-src.tgz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:582ac0d87360a05c471164c718d95f718388edf8b9349cf544c09f8a87660d2a +size 42160789 diff --git a/paraview-SciberQuestToolKit-install-path.patch b/paraview-SciberQuestToolKit-install-path.patch new file mode 100644 index 0000000..c7cf75d --- /dev/null +++ b/paraview-SciberQuestToolKit-install-path.patch @@ -0,0 +1,13 @@ +Index: ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt +=================================================================== +--- ParaView-3.98.0-src.orig/Plugins/SciberQuestToolKit/CMakeLists.txt ++++ ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt +@@ -82,7 +82,7 @@ set (SQTK_VERSION "SQTK-${SQTK_RELEASE} + + # put the plugin inside the pv install + set(SQTK_LIB_INSTALL_PATH +- "${CMAKE_INSTALL_PREFIX}/lib/paraview-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR}" ++ "${PV_INSTALL_LIB_DIR}" + ) + #message(STATUS "SQTK will be installed at ${SQTK_LIB_INSTALL_PATH}") + diff --git a/paraview-boost-1.49-compat.patch b/paraview-boost-1.49-compat.patch deleted file mode 100644 index 5e2b006..0000000 --- a/paraview-boost-1.49-compat.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 const &e) { -- return e.underlying_desc.Id; -+ #if BOOST_VERSION == 104800 -+ return e.underlying_desc.Id; -+ #else -+ return e.underlying_descx.Id; -+ #endif - } - } - #endif diff --git a/paraview-no-return-in-nonvoid-function.patch b/paraview-no-return-in-nonvoid-function.patch new file mode 100644 index 0000000..1cb7888 --- /dev/null +++ b/paraview-no-return-in-nonvoid-function.patch @@ -0,0 +1,12 @@ +Index: ParaView-3.98.0-src/ParaViewCore/VTKExtensions/Rendering/vtkOrderedCompositeDistributor.cxx +=================================================================== +--- ParaView-3.98.0-src.orig/ParaViewCore/VTKExtensions/Rendering/vtkOrderedCompositeDistributor.cxx ++++ ParaView-3.98.0-src/ParaViewCore/VTKExtensions/Rendering/vtkOrderedCompositeDistributor.cxx +@@ -222,6 +222,7 @@ int vtkOrderedCompositeDistributor::Requ + output->ShallowCopy(input); + return 1; + } ++ return 0; + #ifdef PARAVIEW_USE_MPI + if (!this->PKdTree) + { diff --git a/paraview.changes b/paraview.changes index 4ca808e..822b6e7 100644 --- a/paraview.changes +++ b/paraview.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Jan 8 09:14:33 UTC 2013 - badshah400@gmail.com + +- Update to version 3.98.0: + + Too many changes to list, see + http://paraview.org/Bug/changelog_page.php?version_id=97 + + Fixes licensing issues (bnc#763208) +- Remove paraview-boost-1.49-compat.patch, incorporated upstream +- Add paraview-no-return-in-nonvoid-function.patch to fix non-void + function returning nothing +- Add paraview-SciberQuestToolKit-install-path.patch to fix + install path of SciberQuestToolKit plugin +- Turn off OSMESA bindings because these are no longer + recommended. + ------------------------------------------------------------------- Fri Oct 26 13:12:42 UTC 2012 - badshah400@gmail.com diff --git a/paraview.spec b/paraview.spec index d11182f..9ca0a53 100644 --- a/paraview.spec +++ b/paraview.spec @@ -15,25 +15,27 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%define major_ver 3.14 +%define major_ver 3.98 Name: paraview -Version: 3.14.1 +Version: 3.98.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}-Source.tar.gz +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-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 +# 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 +Patch3: paraview-no-return-in-nonvoid-function.patch BuildRequires: Mesa-devel BuildRequires: boost-devel -BuildRequires: cmake +BuildRequires: cmake >= 2.8.8 BuildRequires: desktop-file-utils BuildRequires: doxygen BuildRequires: gnuplot @@ -78,13 +80,14 @@ 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}-Source +%setup -q -n ParaView-%{version}-src %patch0 -p1 %patch1 -p1 +%patch3 -p1 # GCC 4.7 only available for openSUSE > 12.1 -%if 0%{?suse_version} > 1210 -%patch2 -p1 -%endif +#%if 0%{?suse_version} > 1210 +#%patch2 -p1 +#%endif %build export CC='gcc' @@ -115,7 +118,7 @@ export CXXFLAGS="%{optflags}" -DPARAVIEW_ENABLE_PYTHON:BOOL=OFF \\\ -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \\\ -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=OFF \\\ - -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \\\ + -DVTK_OPENGL_HAS_OSMESA:BOOL=OFF \\\ -DVTK_USE_INFOVIS:BOOL=OFF \\\ -DVTK_USE_N_WAY_ARRAYS:BOOL=ON \\\ -DVTK_USE_RPATH:BOOL=OFF \\\ @@ -127,7 +130,10 @@ export CXXFLAGS="%{optflags}" -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \\\ -DBUILD_DOCUMENTATION:BOOL=ON \\\ -DVTK_USE_BOOST:BOOL=ON \\\ - -DBUILD_EXAMPLES:BOOL=ON + -DBUILD_EXAMPLES:BOOL=ON \\\ + -DVTK_INSTALL_INCLUDE_DIR:PATH=include/%{name} \\\ + -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/%{name} \\\ + -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/%{name} mkdir temp_dir pushd temp_dir @@ -147,9 +153,6 @@ popd rm -rf temp_dir/ rm -rf /usr/src/packages/BUILD/ParaView-%{version}/temp_dir/Plugins/PointSprite/PointSpriteDemo -%clean -%{?buildroot:%__rm -rf %{buildroot}} - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -157,9 +160,10 @@ rm -rf /usr/src/packages/BUILD/ParaView-%{version}/temp_dir/Plugins/PointSprite/ %files %defattr(-,root,root) %doc License_v1.2.txt -%{_libdir}/paraview/ +%{_libdir}/%{name}/ %{_bindir}/* -%dir %{_includedir}/%{name}-%{major_ver} -%{_includedir}/%{name}-%{major_ver}/vtkhdf5/ +%{_datadir}/doc/%{name}-%{major_ver}/ +#%dir %{_includedir}/%{name}-%{major_ver} +#%{_includedir}/%{name}-%{major_ver}/vtkhdf5/ %changelog