rpm/paraview
SHA256
1
0
Fork 0
forked from pool/paraview
Code Pull Requests Activity

Accepting request 481606 from home:mathletic:branches:science

Browse Source 
update to 5.3.0

OBS-URL: https://build.opensuse.org/request/show/481606
OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=49
This commit is contained in:
Atri Bhattacharya 2017-03-20 21:33:25 +00:00 committed by Git OBS Bridge
parent ef94ba280f
commit 322ed0efad
9 changed files with 56 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ParaView-v5.2.0.tar.gz
View File

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

3
ParaView-v5.3.0.tar.gz Normal file
View File

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

0
ParaViewGettingStarted-5.2.0.pdf → ParaViewGettingStarted-5.3.0.pdf
View File

0
ParaViewGuide-5.2.0.pdf → ParaViewGuide-5.3.0.pdf
View File

23
paraview-build-sciberquesttoolkit-with-opengl2.patch
View File

@ -1,23 +0,0 @@
Index: ParaView-v5.2.0/Plugins/SciberQuestToolKit/plugin.cmake
===================================================================
--- ParaView-v5.2.0.orig/Plugins/SciberQuestToolKit/plugin.cmake
+++ ParaView-v5.2.0/Plugins/SciberQuestToolKit/plugin.cmake
@@ -1,4 +1,4 @@
-if(VTK_RENDERING_BACKEND STREQUAL "OpenGL")
+if(VTK_RENDERING_BACKEND STREQUAL "OpenGL" OR VTK_RENDERING_BACKEND STREQUAL "OpenGL2")
pv_plugin(SciberQuestToolKit
DESCRIPTION
"SciberQuestToolKit - Domain specific visualization tools for magnetospheric sciences."
Index: ParaView-v5.2.0/Plugins/SciberQuestToolKit/SciberQuest/module.cmake
===================================================================
--- ParaView-v5.2.0.orig/Plugins/SciberQuestToolKit/SciberQuest/module.cmake
+++ ParaView-v5.2.0/Plugins/SciberQuestToolKit/SciberQuest/module.cmake
@@ -14,7 +14,7 @@ vtk_module(vtkSciberQuest
vtkPVCommon
vtkPVServerManagerApplication
vtkParallelCore
- vtkRenderingOpenGL
+ vtkRenderingOpenGL2
vtksys
TEST_LABELS
PARAVIEW

12
paraview-do-not-install-missing-vtk-doxygen-dir.patch Normal file
View File

@ -0,0 +1,12 @@
Index: ParaView-v5.3.0/VTK/Utilities/Doxygen/CMakeLists.txt
===================================================================
--- ParaView-v5.3.0.orig/VTK/Utilities/Doxygen/CMakeLists.txt
+++ ParaView-v5.3.0/VTK/Utilities/Doxygen/CMakeLists.txt
@@ -80,7 +80,4 @@
install(FILES doc_readme.txt
DESTINATION ${VTK_INSTALL_DOXYGEN_DIR}
COMPONENT Development)
- install(DIRECTORY ${VTK_BINARY_DIR}/Utilities/Doxygen/doc/html
- DESTINATION ${VTK_INSTALL_DOXYGEN_DIR}
- COMPONENT Development)
endif()

48
paraview-find-qhelpgenerator-qt5.patch
View File

@ -1,42 +1,22 @@
Index: ParaView-v5.2.0/CMake/ParaViewMacros.cmake
Index: ParaView-v5.3.0/CMake/ParaViewMacros.cmake
===================================================================
--- ParaView-v5.2.0.orig/CMake/ParaViewMacros.cmake
+++ ParaView-v5.2.0/CMake/ParaViewMacros.cmake
@@ -251,9 +251,16 @@ function (generate_htmls_from_xmls outpu
# file we use.
get_filename_component(first_xml "${first_xml}" NAME)
+ if (PARAVIEW_QT_VERSION STREQUAL "4")
+ set(qt_binary_dir_hints "${QT_BINARY_DIR}")
+ else() # Qt5
+ # Qt5's CMake config doesn't support QT_BINARY_DIR
+ set(qt_binary_dir_hints "${Qt5_DIR}/../../../bin")
+ endif()
+
find_program(QT_XMLPATTERNS_EXECUTABLE
- xmlpatterns
- HINTS "${QT_BINARY_DIR}"
+ NAMES xmlpatterns xmlpatterns-qt5
+ HINTS "${qt_binary_dir_hints}"
DOC "xmlpatterns used to generate html from Proxy documentation.")
mark_as_advanced(QT_XMLPATTERNS_EXECUTABLE)
@@ -339,9 +346,16 @@ function(build_help_project name)
message(FATAL_ERROR "No DESTINATION_DIRECTORY specified in build_help_project()")
--- ParaView-v5.3.0.orig/CMake/ParaViewMacros.cmake
+++ ParaView-v5.3.0/CMake/ParaViewMacros.cmake
@@ -259,7 +259,7 @@
endif()
find_program(QT_XMLPATTERNS_EXECUTABLE
- xmlpatterns
+ NAMES xmlpatterns xmlpatterns-qt5
HINTS "${qt_binary_dir_hints}"
DOC "xmlpatterns used to generate html from Proxy documentation.")
mark_as_advanced(QT_XMLPATTERNS_EXECUTABLE)
@@ -354,7 +354,7 @@
endif()
+ if (PARAVIEW_QT_VERSION STREQUAL "4")
+ set(qt_binary_dir_hints "${QT_BINARY_DIR}")
+ else() # Qt5
+ # Qt5's CMake config doesn't support QT_BINARY_DIR
+ set(qt_binary_dir_hints "${Qt5_DIR}/../../../bin")
+ endif()
+
find_program(QT_HELP_GENERATOR
- qhelpgenerator
- HINTS "${QT_BINARY_DIR}"
+ NAMES qhelpgenerator qhelpgenerator-qt5
+ HINTS "${qt_binary_dir_hints}"
HINTS "${qt_binary_dir_hints}"
DOC "qhelpgenerator used to compile Qt help project files")
mark_as_advanced(QT_HELP_GENERATOR)

21
paraview.changes
View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Mon Mar 20 15:42:39 UTC 2017 - foss@grueninger.de
- Update to version 5.3.0
* VTK-m Plugin for many-core systems
* Reader and Writer Improvements and Additions
* Fast approximate anti-aliasing (FXAA) is now on by default
* new StreamLinesRepresentation plugin
* Added LagrangianParticleTracker plugin
* Python Enhancements
* See a summary of changes at
https://blog.kitware.com/paraview-5-3-0-release-notes/
- drop package paraview-plugin-SciberQuestToolKit as SQTK is no longer
part of ParaView (see commit c2bc94c2efb66c4bb525383176688ddfd430ca26)
- drop paraview-build-sciberquesttoolkit-with-opengl2.patch as SQTK is
no longer build
- add paraview-do-not-install-missing-vtk-doxygen-dir.patch to remove
non-existing doxygen/doc/html folder from VTK.
- modified paraview-find-qhelpgenerator-qt5.patch to adapt to partial
inclusion of original patch to upstream
-------------------------------------------------------------------
Thu Dec 8 15:30:11 UTC 2016 - badshah400@gmail.com

48
paraview.spec
View File

@ -22,15 +22,16 @@
%define use_qt5 0
%endif
%define major_ver 5.2
%define major_ver 5.3
Name: paraview
Version: 5.2.0
Version: 5.3.0
Release: 0
Summary: Data analysis and visualization application
License: BSD-3-Clause
Group: Productivity/Scientific/Physics
Url: http://www.paraview.org
Source0: http://www.paraview.org/files/v%{major_ver}/ParaView-v%{version}.tar.gz
Source1: %{name}-rpmlintrc
Source2: http://www.paraview.org/files/v%{major_ver}/ParaViewGettingStarted-%{version}.pdf
Source3: http://www.paraview.org/files/v%{major_ver}/ParaViewGuide-%{version}.pdf
@ -41,12 +42,12 @@ Patch0: paraview-default-qtstyle.patch
Patch1: paraview-desktop-entry-fix.patch
# PATCH-FIX-UPSTREAM paraview-fix-file-contains-date-time.patch badshah400@gmail.com -- Remove reference to __DATE__ and __TIME__ from source
Patch2: paraview-fix-file-contains-date-time.patch
# PATCH-FIX-UPSTREAM paraview-do-not-install-missing-vtk-doxygen-dir.patch foss@grueninger.de -- Remove install of nonexistent doxygen/html dir
Patch3: paraview-do-not-install-missing-vtk-doxygen-dir.patch
# PATCH-FIX-UPSTREAM paraview-find-qhelpgenerator-qt5.patch badshah400@gmail.com -- Help find qhelpgenerator-qt5 instead of qhelpgenerator when Qt5 is used
Patch4: paraview-find-qhelpgenerator-qt5.patch
# PATCH-FIX-UPSTREAM paraview-pythonqt-build-fix.patch badshah400@gmail.com -- Fix build issues with PythonQtPlugin; patch taken from upstream.
Patch5: paraview-pythonqt-build-fix.patch
# PATCH-FIX-UPSTREAM paraview-build-sciberquesttoolkit-with-opengl2.patch badshah400@gmail.com -- Enable building of SciberQuestToolKit even when OpenGL2 is used as the default VTK rendering
Patch6: paraview-build-sciberquesttoolkit-with-opengl2.patch
BuildRequires: Mesa-devel
BuildRequires: boost-devel
BuildRequires: cmake >= 3.3
@ -117,40 +118,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.
# Split the SQTK plugin out into ints own package because it makes use of
# components with a different licence, viz., (L)GPL-3.0+ (bnc#804987).
%package -n %{name}-plugin-SciberQuestToolKit
Summary: The SciberQuestToolKit plugin for paraview
License: GPL-2.0+ or LGPL-3.0+
Group: Productivity/Scientific/Physics
Requires: paraview = %{version}-%{release}
%description -n %{name}-plugin-SciberQuestToolKit
ParaView is an application designed with the need to visualize large data
sets in mind. The goals of the ParaView project include the following:
* Develop an open-source, multi-platform visualization application.
* Support distributed computation models to process large data sets.
* Create an open, flexible, and intuitive user interface.
* Develop an extensible architecture based on open standards.
ParaView runs on distributed and shared memory parallel as well as single
processor systems and has been successfully tested on Windows, Linux and
various Unix workstations and clusters. Under the hood, ParaView uses the
Visualization Toolkit as the data processing and rendering engine and has a
user interface written using a unique blend of Tcl/Tk and C++.
This package provides the SciberQuestToolKit plugin for paraview.
%prep
%setup -q -n ParaView-v%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
# Prepare for gcc 4.9.0: work around gcc 4.9.0 regression
@ -245,15 +220,11 @@ install -Dm0644 %{S:4} %{buildroot}%{_datadir}/%{name}-%{major_ver}/doc/Tutorial
%icon_theme_cache_post
%desktop_database_post
%post -n %{name}-plugin-SciberQuestToolKit -p /sbin/ldconfig
%postun
/sbin/ldconfig
%icon_theme_cache_postun
%desktop_database_postun
%postun -n %{name}-plugin-SciberQuestToolKit -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc License_v1.2.txt
@ -266,12 +237,5 @@ install -Dm0644 %{S:4} %{buildroot}%{_datadir}/%{name}-%{major_ver}/doc/Tutorial
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/cmake/hdf5/
%exclude %{_libdir}/%{name}/libSciberQuestToolKit.so
%files -n %{name}-plugin-SciberQuestToolKit
%defattr(-,root,root)
%doc Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/COPYING.LGPL
%doc Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/COPYING.GPL
%{_libdir}/%{name}/libSciberQuestToolKit.so
%changelog