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

Accepting request 253525 from home:mathletic:branches:science

Browse Source 
update to 4.2.0 release

OBS-URL: https://build.opensuse.org/request/show/253525
OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=27
This commit is contained in:
Atri Bhattacharya 2014-10-01 17:40:27 +00:00 committed by Git OBS Bridge
parent 4c8de1fac7
commit 220f6da313
8 changed files with 29 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ParaView-v4.2.0-RC1-source.tar.gz
View File

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

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

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

13
paraview-Mesa10.3-build-failures.patch
View File

@ -1,13 +0,0 @@
Index: ParaView-v4.2.0-RC1-source/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
===================================================================
--- ParaView-v4.2.0-RC1-source.orig/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
+++ ParaView-v4.2.0-RC1-source/VTK/Rendering/OpenGL/vtkXOpenGLRenderWindow.cxx
@@ -26,7 +26,7 @@
// define GLX_GLXEXT_LEGACY to prevent glx.h to include glxext.h provided by
// the system
-//#define GLX_GLXEXT_LEGACY
+#define GLX_GLXEXT_LEGACY
#include "GL/glx.h"
#include "vtkgl.h"

6
paraview-default-qtstyle.patch
View File

@ -1,7 +1,7 @@
Index: ParaView-v4.2.0-RC1-source/CMake/branded_paraview_main.cxx.in Index: ParaView-v4.2.0-source/CMake/branded_paraview_main.cxx.in
=================================================================== ===================================================================
--- ParaView-v4.2.0-RC1-source.orig/CMake/branded_paraview_main.cxx.in --- ParaView-v4.2.0-source.orig/CMake/branded_paraview_main.cxx.in
+++ ParaView-v4.2.0-RC1-source/CMake/branded_paraview_main.cxx.in +++ ParaView-v4.2.0-source/CMake/branded_paraview_main.cxx.in
@@ -48,7 +48,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI @@ -48,7 +48,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
#endif #endif

6
paraview-desktop-entry-fix.patch
View File

@ -1,7 +1,7 @@
Index: ParaView-v4.2.0-RC1-source/Applications/ParaView/paraview.desktop.in Index: ParaView-v4.2.0-source/Applications/ParaView/paraview.desktop.in
=================================================================== ===================================================================
--- ParaView-v4.2.0-RC1-source.orig/Applications/ParaView/paraview.desktop.in --- ParaView-v4.2.0-source.orig/Applications/ParaView/paraview.desktop.in
+++ ParaView-v4.2.0-RC1-source/Applications/ParaView/paraview.desktop.in +++ ParaView-v4.2.0-source/Applications/ParaView/paraview.desktop.in
@@ -1,7 +1,9 @@ @@ -1,7 +1,9 @@
[Desktop Entry] [Desktop Entry]
-Version=@PARAVIEW_VERSION_FULL@ -Version=@PARAVIEW_VERSION_FULL@

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

@ -1,7 +1,7 @@
Index: ParaView-v4.2.0-RC1-source/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c Index: ParaView-v4.2.0-source/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
=================================================================== ===================================================================
--- ParaView-v4.2.0-RC1-source.orig/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c --- ParaView-v4.2.0-source.orig/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
+++ ParaView-v4.2.0-RC1-source/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c +++ ParaView-v4.2.0-source/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
#include "ncdispatch.h" #include "ncdispatch.h"
@ -11,10 +11,10 @@ Index: ParaView-v4.2.0-RC1-source/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/er
const char * const char *
nc_inq_libvers(void) nc_inq_libvers(void)
Index: ParaView-v4.2.0-RC1-source/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx Index: ParaView-v4.2.0-source/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx
=================================================================== ===================================================================
--- ParaView-v4.2.0-RC1-source.orig/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx --- ParaView-v4.2.0-source.orig/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx
+++ ParaView-v4.2.0-RC1-source/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx +++ ParaView-v4.2.0-source/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx
@@ -438,7 +438,7 @@ void vtknifti1_io::nifti_disp_lib_hist( @@ -438,7 +438,7 @@ void vtknifti1_io::nifti_disp_lib_hist(
*//*--------------------------------------------------------------------*/ *//*--------------------------------------------------------------------*/
void vtknifti1_io::nifti_disp_lib_version( void ) void vtknifti1_io::nifti_disp_lib_version( void )

10
paraview.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Wed Oct 1 12:40:59 UTC 2014 - foss@grueninger.de
- Update to version 4.2.0:
+ See list of changes at
http://vtk.org/Bug/changelog_page.php?version_id=108
- Packaging changes:
+ Drop paraview-Mesa10.3-build-failures.patch as this patch has
been included upstream
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 8 01:57:35 UTC 2014 - badshah400@gmail.com Mon Sep 8 01:57:35 UTC 2014 - badshah400@gmail.com

14
paraview.spec
View File

@ -17,16 +17,15 @@
%define major_ver 4.2 %define major_ver 4.2
%define rc_ver 4.2.0-RC1 %define complete_ver 4.2.0
Name: paraview Name: paraview
# This is the (only) RC release before version 4.2 is released Version: 4.2.0
Version: 4.1.990
Release: 0 Release: 0
Summary: Data analysis and visualization application Summary: Data analysis and visualization application
License: BSD-3-Clause License: BSD-3-Clause
Group: Productivity/Scientific/Physics Group: Productivity/Scientific/Physics
Url: http://www.paraview.org Url: http://www.paraview.org
Source0: http://www.paraview.org/files/v%{major_ver}/ParaView-v%{rc_ver}-source.tar.gz Source0: http://www.paraview.org/files/v%{major_ver}/ParaView-v%{complete_ver}-source.tar.gz
Source1: %{name}-rpmlintrc Source1: %{name}-rpmlintrc
# PATCH-FIX-OPENSUSE paraview-default-qtstyle.patch badshah400@gmail.com -- Make paraview inherit default qt gui look and feel, instead of using the Plastique theme # PATCH-FIX-OPENSUSE 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 Patch0: paraview-default-qtstyle.patch
@ -34,8 +33,6 @@ Patch0: paraview-default-qtstyle.patch
Patch1: paraview-desktop-entry-fix.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 # 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 Patch2: paraview-fix-file-contains-date-time.patch
# PATCH-FIX-UPSTREAM paraview-Mesa10.3-build-failures.patch badshah400@gmail.com -- Actually define GLX_GLXEXT_LEGACY to prevent the system glext.h include; fixes buld failures with Mesa >= 10.3; fix taken from upstream git and rebased
Patch3: paraview-Mesa10.3-build-failures.patch
BuildRequires: Mesa-devel BuildRequires: Mesa-devel
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: cmake >= 2.8.8 BuildRequires: cmake >= 2.8.8
@ -114,13 +111,10 @@ This package provides the SciberQuestToolKit plugin for paraview.
%prep %prep
%setup -q -n ParaView-v%{rc_ver}-source %setup -q -n ParaView-v%{complete_ver}-source
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%if 0%{?suse_version} > 1310
%patch3 -p1
%endif
%build %build
# Prepare for gcc 4.9.0: work around gcc 4.9.0 regression # Prepare for gcc 4.9.0: work around gcc 4.9.0 regression