pool/paraview
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 220744 from home:badshah400:branches:science

Browse Source 
Update to version 4.1.0

OBS-URL: https://build.opensuse.org/request/show/220744
OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=21
This commit is contained in:
Ismail Dönmez 2014-02-04 09:39:54 +00:00 committed by Git OBS Bridge
parent 30221fcbc6
commit cf0a95a819
9 changed files with 87 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ParaView-v4.0.1-source.tgz
View File

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

3
ParaView-v4.1.0-source.tar.gz Normal file
View File

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

33
paraview-SciberQuestToolKit-install-path.patch
View File

@ -1,13 +1,26 @@
Index: ParaView-3.98.0-src/Plugins/SciberQuestToolKit/CMakeLists.txt
Index: ParaView-v4.1.0/Plugins/SciberQuestToolKit/ParaViewPlugin/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}
--- ParaView-v4.1.0.orig/Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt
+++ ParaView-v4.1.0/Plugins/SciberQuestToolKit/ParaViewPlugin/CMakeLists.txt
@@ -102,7 +102,7 @@ if(PARAVIEW_BUILD_QT_GUI)
LINK_PRIVATE pqComponents)
endif()
# 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}")
-install(TARGETS SciberQuestToolKit DESTINATION lib/paraview-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR})
+install(TARGETS SciberQuestToolKit DESTINATION ${PV_INSTALL_LIB_DIR})
if(PARAVIEW_USE_MPI)
include(vtkMPI)
Index: ParaView-v4.1.0/Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt
===================================================================
--- ParaView-v4.1.0.orig/Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt
+++ ParaView-v4.1.0/Plugins/SciberQuestToolKit/SciberQuest/CMakeLists.txt
@@ -162,7 +162,7 @@ if (SQTK_CUDA AND CUDA_FOUND)
LINK_PRIVATE ${CUDA_LIBRARIES})
endif()
-install(TARGETS vtkSciberQuest DESTINATION lib/paraview-${PARAVIEW_VERSION_MAJOR}.${PARAVIEW_VERSION_MINOR})
+install(TARGETS vtkSciberQuest DESTINATION ${PV_INSTALL_LIB_DIR})
if (BUILD_TESTING)
add_subdirectory(Testing)

21
paraview-default-qtstyle.patch
View File

@ -1,7 +1,8 @@
diff -ur ParaView-3.10.0.orig//CMake/branded_paraview_main.cxx.in ParaView-3.10.0//CMake/branded_paraview_main.cxx.in
--- ParaView-3.10.0.orig//CMake/branded_paraview_main.cxx.in 2011-03-10 00:01:13.000000000 +0530
+++ ParaView-3.10.0//CMake/branded_paraview_main.cxx.in 2011-04-03 22:44:49.705998568 +0530
@@ -40,19 +40,20 @@
Index: ParaView-v4.1.0/CMake/branded_paraview_main.cxx.in
===================================================================
--- ParaView-v4.1.0.orig/CMake/branded_paraview_main.cxx.in
+++ ParaView-v4.1.0/CMake/branded_paraview_main.cxx.in
@@ -40,7 +40,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
#include "pq@BPC_NAME@Initializer.h"
#ifdef Q_WS_X11
@ -9,20 +10,20 @@ diff -ur ParaView-3.10.0.orig//CMake/branded_paraview_main.cxx.in ParaView-3.10.
+#include <QStyle>
#endif
#include <clocale>
#include <stdlib.h>
@@ -64,12 +64,12 @@ static bool checkenv(const char* vname)
int main(int argc, char* argv[])
{
-#ifdef Q_WS_X11
+//#ifdef Q_WS_X11
+// #ifdef Q_WS_X11
// Using motif style gives us test failures (and its ugly).
// Using cleanlooks style gives us errors when using valgrind (Trolltech's bug #179200)
// let's just use plastique for now
- QApplication::setStyle(new QPlastiqueStyle);
-#endif
+
+ //QApplication::setStyle(new QPlastiqueStyle);
+//#endif
+ // QApplication::setStyle(new QPlastiqueStyle);
+// #endif
// When playing tests, disable all effects.
if (getenv("DART_TEST_FROM_DART") ||
if (checkenv("DART_TEST_FROM_DART") ||

19
paraview-fix-file-contains-date-time.patch
View File

@ -1,7 +1,7 @@
Index: ParaView-v4.0.1-source/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
Index: ParaView-v4.1.0/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
===================================================================
--- ParaView-v4.0.1-source.orig/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
+++ ParaView-v4.0.1-source/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
--- ParaView-v4.1.0.orig/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
+++ ParaView-v4.1.0/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
@@ -9,7 +9,7 @@
#include "ncdispatch.h"
@ -11,3 +11,16 @@ Index: ParaView-v4.0.1-source/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.
const char *
nc_inq_libvers(void)
Index: ParaView-v4.1.0/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx
===================================================================
--- ParaView-v4.1.0.orig/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx
+++ ParaView-v4.1.0/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx
@@ -438,7 +438,7 @@ void vtknifti1_io::nifti_disp_lib_hist(
*//*--------------------------------------------------------------------*/
void vtknifti1_io::nifti_disp_lib_version( void )
{
- printf("%s, compiled %s\n", gni_version, __DATE__);
+ printf("%s\n", gni_version);
}

13
paraview-fix-vtkpython-modules-install-dir.patch
View File

@ -1,13 +0,0 @@
Index: ParaView-v4.0.1-source/CMakeLists.txt
===================================================================
--- ParaView-v4.0.1-source.orig/CMakeLists.txt
+++ ParaView-v4.0.1-source/CMakeLists.txt
@@ -176,7 +176,7 @@ set (VTK_INSTALL_NO_QT_PLUGIN TRUE)
# ParaView install the vtk python modules specifically to appropriate locations.
set (VTK_INSTALL_NO_PYTHON TRUE)
-set (VTK_INSTALL_PYTHON_USING_CMAKE TRUE)
+set (VTK_INSTALL_PYTHON_USING_CMAKE FALSE)
# for temporary backwards compatibility.
set (PV_INSTALL_BIN_DIR ${VTK_INSTALL_RUNTIME_DIR})

12
paraview-no-return-in-nonvoid-function.patch
View File

@ -1,12 +0,0 @@
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)
{

19
paraview.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Sun Feb 2 00:19:56 UTC 2014 - badshah400@gmail.com
- Update to version 4.1.0:
+ See list of changes at
http://vtk.org/Bug/changelog_page.php?version_id=102
- Packaging changes:
+ Use full URL for source tarball
+ Drop patches:
- paraview-fix-vtkpython-modules-install-dir.patch: corrected
upstream
- paraview-no-return-in-nonvoid-function.patch: corrected
upstream
+ Rebase existing patches
+ Also fix a new occurrance of __DATE__ in a source file
within paraview-fix-file-contains-date-time.patch
+ Change build type to RelWithDebInfo from Release
(DCMAKE_BUILD_TYPE=RelWithDebInfo).
-------------------------------------------------------------------
Mon Jul 8 04:49:03 UTC 2013 - badshah400@gmail.com

35
paraview.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package paraview
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 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
@ -16,26 +16,22 @@
#
%define major_ver 4.0
%define major_ver 4.1
Name: paraview
Version: 4.0.1
Version: 4.1.0
Release: 0
Summary: Data analysis and visualization application
License: BSD-3-Clause
Group: Productivity/Scientific/Physics
Url: http://www.paraview.org
Source0: ParaView-v%{version}-source.tgz
Source0: http://www.paraview.org/files/v%{major_ver}/ParaView-v%{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
Patch0: paraview-default-qtstyle.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
Patch2: paraview-no-return-in-nonvoid-function.patch
# PATCH-FIX-UPSTREAM paraview-fix-vtkpython-modules-install-dir.patch badshah400@gmail.com -- Workaround vtk's python modules getting installed in the wrong location
Patch3: paraview-fix-vtkpython-modules-install-dir.patch
# PATCH-FIX-UPSTREAM paraview-fix-file-contains-date-time.patch badshah400@gmail.com -- Remove reference to __DATE__ and __TIME__ from source
Patch4: paraview-fix-file-contains-date-time.patch
Patch2: paraview-fix-file-contains-date-time.patch
BuildRequires: Mesa-devel
BuildRequires: boost-devel
BuildRequires: cmake >= 2.8.8
@ -54,10 +50,8 @@ BuildRequires: openssl-devel
BuildRequires: python-devel
BuildRequires: python-matplotlib
%py_requires
%if 0%{?suse_version} >= 1140
BuildRequires: qt4-assistant-adp-devel
%endif
BuildRequires: fdupes
BuildRequires: qt4-assistant-adp-devel
BuildRequires: readline-devel
BuildRequires: tk-devel
BuildRequires: wget
@ -113,12 +107,10 @@ This package provides the SciberQuestToolKit plugin for paraview.
%prep
%setup -q -n ParaView-v%{version}-source
%setup -q -n ParaView-v%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
export CC='gcc'
@ -131,14 +123,17 @@ export CXXFLAGS="%{optflags}"
-DVTK_INSTALL_INCLUDE_DIR:PATH=include/%{name} \\\
-DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/%{name} \\\
-DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/%{name} \\\
-DVTK_INSTALL_DATA_DIR=%{_datadir}/%{name} \\\
-DBUILD_SHARED_LIBS:BOOL=ON \\\
-DCMAKE_CXX_COMPILER:FILEPATH=$CXX \\\
-DCMAKE_C_COMPILER:FILEPATH=$CC \\\
-DCMAKE_BUILD_TYPE=Release \\\
-DCMAKE_BUILD_TYPE=RelWithDebInfo \\\
-DPARAVIEW_BUILD_QT_GUI:BOOL=ON \\\
-DPARAVIEW_QT_QMAKE_EXECUTABLE=%{_bindir}/qmake \\\
-DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=ON \\\
-DPARAVIEW_ENABLE_PYTHON:BOOL=ON \\\
-DVTK_WRAP_PYTHON:BOOL=ON \\\
-DVTK_WRAP_PYTHON_SIP:BOOL=ON \\\
-DVTK_OPENGL_HAS_OSMESA:BOOL=OFF \\\
-DVTK_USE_SYSTEM_EXPAT:BOOL=ON \\\
-DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \\\
@ -147,7 +142,8 @@ export CXXFLAGS="%{optflags}"
-DVTK_USE_SYSTEM_TIFF:BOOL=ON \\\
-DVTK_USE_SYSTEM_ZLIB:BOOL=ON \\\
-DBUILD_DOCUMENTATION:BOOL=ON \\\
-DBUILD_EXAMPLES:BOOL=ON
-DBUILD_EXAMPLES:BOOL=ON \\\
-DBUILD_TESTING:BOOL=OFF
mkdir temp_dir
pushd temp_dir
@ -165,10 +161,8 @@ pushd temp_dir
%makeinstall DESTDIR=%{buildroot}
popd
rm -rf temp_dir/
rm -rf /usr/src/packages/BUILD/ParaView-%{version}/temp_dir/Plugins/PointSprite/PointSpriteDemo
%fdupes %{buildroot}%{_libdir}/%{name}/site-packages
%fdupes %{buildroot}%{_libdir}/%{name}/www
%fdupes %{buildroot}/
%post -p /sbin/ldconfig
%post -n %{name}-plugin-SciberQuestToolKit -p /sbin/ldconfig
@ -182,6 +176,7 @@ rm -rf /usr/src/packages/BUILD/ParaView-%{version}/temp_dir/Plugins/PointSprite/
%{_libdir}/%{name}/
%{_bindir}/*
%{_datadir}/doc/%{name}-%{major_ver}/
%{_datadir}/%{name}/
%exclude %{_libdir}/%{name}/libSciberQuestToolKit.so
%files -n %{name}-plugin-SciberQuestToolKit