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

Accepting request 508465 from home:badshah400:branches:science

Browse Source 
Disable 32-bit builds for now, until cgns issue there can be sorted out

OBS-URL: https://build.opensuse.org/request/show/508465
OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=51
This commit is contained in:
Atri Bhattacharya 2017-07-11 22:44:14 +00:00 committed by Git OBS Bridge
parent 322ed0efad
commit 186ceabd73
12 changed files with 53 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

3
ParaViewGettingStarted-5.3.0.pdf
View File

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

3
ParaViewGettingStarted-5.4.0.pdf Normal file
View File

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

3
ParaViewGuide-5.3.0.pdf
View File

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

3
ParaViewGuide-5.4.0.pdf Normal file
View File

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

8
paraview-default-qtstyle.patch
View File

@ -1,8 +1,8 @@
Index: ParaView-v5.2.0/CMake/branded_paraview_main.cxx.in
Index: ParaView-v5.4.0/CMake/branded_paraview_main.cxx.in
===================================================================
--- ParaView-v5.2.0.orig/CMake/branded_paraview_main.cxx.in
+++ ParaView-v5.2.0/CMake/branded_paraview_main.cxx.in
@@ -72,15 +72,15 @@ static bool checkenv(const char* vname)
--- ParaView-v5.4.0.orig/CMake/branded_paraview_main.cxx.in
+++ ParaView-v5.4.0/CMake/branded_paraview_main.cxx.in
@@ -73,15 +73,15 @@ static bool checkenv(const char* vname)
int main(int argc, char* argv[])
{

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

@ -1,15 +1,10 @@
Index: ParaView-v5.2.0/Applications/ParaView/paraview.desktop.in
Index: ParaView-v5.4.0/Applications/ParaView/paraview.desktop.in
===================================================================
--- ParaView-v5.2.0.orig/Applications/ParaView/paraview.desktop.in
+++ ParaView-v5.2.0/Applications/ParaView/paraview.desktop.in
@@ -1,7 +1,9 @@
[Desktop Entry]
-Version=@PARAVIEW_VERSION_FULL@
Type=Application
Name=ParaView
Comment=Parallel visualization application
--- ParaView-v5.4.0.orig/Applications/ParaView/paraview.desktop.in
+++ ParaView-v5.4.0/Applications/ParaView/paraview.desktop.in
@@ -6,3 +6,5 @@ Comment=Parallel visualization applicati
Exec=paraview
TryExec=paraview
+Exec=paraview
Icon=paraview
+Categories=Graphics;2DGraphics;3DGraphics;
+StartupNotify=true

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

@ -1,7 +1,7 @@
Index: ParaView-v5.2.0/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
Index: ParaView-v5.4.0/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
===================================================================
--- ParaView-v5.2.0.orig/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
+++ ParaView-v5.2.0/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
--- ParaView-v5.4.0.orig/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
+++ ParaView-v5.4.0/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
@@ -9,7 +9,7 @@
#include "ncdispatch.h"
@ -11,10 +11,10 @@ Index: ParaView-v5.2.0/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
const char *
nc_inq_libvers(void)
Index: ParaView-v5.2.0/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx
Index: ParaView-v5.4.0/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx
===================================================================
--- ParaView-v5.2.0.orig/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx
+++ ParaView-v5.2.0/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx
--- ParaView-v5.4.0.orig/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx
+++ ParaView-v5.4.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 )
@ -24,10 +24,10 @@ Index: ParaView-v5.2.0/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx
}
Index: ParaView-v5.2.0/Plugins/CDIReader/cdilib.c
Index: ParaView-v5.4.0/Plugins/CDIReader/cdilib.c
===================================================================
--- ParaView-v5.2.0.orig/Plugins/CDIReader/cdilib.c
+++ ParaView-v5.2.0/Plugins/CDIReader/cdilib.c
--- ParaView-v5.4.0.orig/Plugins/CDIReader/cdilib.c
+++ ParaView-v5.4.0/Plugins/CDIReader/cdilib.c
@@ -5274,7 +5274,7 @@ static void file_table_print(void);
#define LIBVERSION 1.8.2
#define XSTRING(x) #x

41
paraview-pythonqt-build-fix.patch
View File

@ -7,39 +7,16 @@ Subject: [PATCH] Fix build issues with PythonQtPlugin.
Plugins/PythonQtPlugin/CMakeLists.txt | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/Plugins/PythonQtPlugin/CMakeLists.txt b/Plugins/PythonQtPlugin/CMakeLists.txt
index d87853b..d249961 100644
--- a/Plugins/PythonQtPlugin/CMakeLists.txt
+++ b/Plugins/PythonQtPlugin/CMakeLists.txt
@@ -7,6 +7,8 @@ else()
include(${PARAVIEW_USE_FILE})
endif()
Index: ParaView-v5.4.0/Plugins/PythonQtPlugin/CMakeLists.txt
===================================================================
--- ParaView-v5.4.0.orig/Plugins/PythonQtPlugin/CMakeLists.txt
+++ ParaView-v5.4.0/Plugins/PythonQtPlugin/CMakeLists.txt
@@ -44,6 +44,8 @@ add_paraview_auto_start(
OUTSRCS
CLASS_NAME pqPythonQtPlugin)
+include(ParaViewQt)
+pv_find_package_qt(qt_targets REQUIRED QT4_COMPONENTS QtGui QT5_COMPONENTS Widgets)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
find_package(PythonQt REQUIRED)
@@ -23,17 +25,7 @@ set(PythonQtPlugin_MOC_SRCS
pqPythonEventFilter.h
)
-if (PARAVIEW_QT_VERSION VERSION_GREATER "4")
- qt5_wrap_cpp(MOC_SRCS
- ${PythonQtPlugin_MOC_SRCS}
- ${decorator_file}
- )
-else ()
- qt4_wrap_cpp(MOC_SRCS
- ${PythonQtPlugin_MOC_SRCS}
- ${decorator_file}
- )
-endif ()
+pv_qt_wrap_cpp(MOC_SRCS ${PythonQtPlugin_MOC_SRCS} ${decorator_file})
set(srcs
pqPythonQtPlugin.cxx
--
2.7.4
add_paraview_plugin(PythonQtPlugin "1.0"
GUI_INTERFACES ${OUTIFACES}

11
paraview.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Jul 2 17:09:33 UTC 2017 - badshah400@gmail.com
- Update to version 5.4.0:
* See https://blog.kitware.com/paraview-5-4-0-release-notes/ for
a full list of updates.
- Use the %%cmake macro instead of using cmake manually.
- Minor rebase of existing patches for version update.
- ExcludeArch for ix86 processors until 32 bit builds can be
sorted out; issue reported upstream.
-------------------------------------------------------------------
Mon Mar 20 15:42:39 UTC 2017 - foss@grueninger.de

27
paraview.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package paraview
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -22,9 +22,9 @@
%define use_qt5 0
%endif
%define major_ver 5.3
%define major_ver 5.4
Name: paraview
Version: 5.3.0
Version: 5.4.0
Release: 0
Summary: Data analysis and visualization application
License: BSD-3-Clause
@ -99,6 +99,8 @@ Requires: python
Requires: python-base
Requires: python-twisted
Requires: python-zope.interface
# FIXME: Remove when builds for 32-bit are fixed; they currently fail due to offt definition issues in ThirdParty/cgns/vtkcgns/src/adf/ADF_internals.c
ExcludeArch: %ix86
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -136,24 +138,7 @@ export CC='gcc'
export CXX='g++'
export MAKE='make'
# FIXME: WE CANNOT USE THE %%cmake MACRO BECAUSE SOME OF ITS OPTIONS CAUSE ISSUES (SEE FIXME'S BELOW); REPLICATE IT HERE LEAVING OUT THE PROBLEMATIC AND UNUSED OPTIONS
find ./ -name CMakeLists.txt \
-exec sed -i -re '/^[[:blank:]]*[sS][eE][tT][[:blank:]]*\\\([[:blank:]]*(CMAKE_BUILD_TYPE|CMAKE_COLOR_MAKEFILE|CMAKE_INSTALL_PREFIX|CMAKE_VERBOSE_MAKEFILE).*\\\)/{s/^/#IGNORE /}' {} +
mkdir -p build
cd build
cmake $OLDPWD \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \
-DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \
-DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}} -DNDEBUG" \
-DCMAKE_EXE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,now" \
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-DBUILD_SHARED_LIBS:BOOL=ON \
-DCMAKE_COLOR_MAKEFILE:BOOL=OFF \
-DPV_INSTALL_LIB_DIR:PATH=%{_lib}/%{name} \
%cmake -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/%{name} \
-DVTK_INSTALL_INCLUDE_DIR:PATH=include/%{name} \
-DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib}/%{name} \
-DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib}/%{name} \