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

Accepting request 629907 from science

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/629907
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/paraview?expand=0&rev=23
This commit is contained in:
Dominique Leuenberger 2018-08-27 11:48:28 +00:00 committed by Git OBS Bridge
commit d7d98b7248
17 changed files with 388 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

3
ParaViewGettingStarted-5.4.0.pdf
View File

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

3
ParaViewGettingStarted-5.5.2.pdf Normal file
View File

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

3
ParaViewGuide-5.4.0.pdf
View File

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

3
ParaViewGuide-5.5.2.pdf Normal file
View File

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

3
ParaViewTutorial-5.5.2.pdf Normal file
View File

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

3
ParaViewTutorial.pdf
View File

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

128
fix-hdf5-gcc8.patch Normal file
View File

@ -0,0 +1,128 @@
From 06707a314646873b3bf6c6ef80ab2fd0fd721b72 Mon Sep 17 00:00:00 2001
From: HDF Upstream <kwrobot@kitware.com>
Date: Mon, 4 Jun 2018 10:00:49 -0400
Subject: [PATCH] hdf5 2018-06-04 (247b2ae5)
Code extracted from:
https://gitlab.kitware.com/third-party/hdf5.git
at commit 247b2ae5487f2e3f2fb4f0dc9332abed128e5be2 (for/vtk-old).
---
VTK/ThirdParty/hdf5/vtkhdf5/src/H5detect.c | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/VTK/ThirdParty/hdf5/vtkhdf5/src/H5detect.c b/VTK/ThirdParty/hdf5/vtkhdf5/src/H5detect.c
index b2c958e5c4b..5585d67632e 100644
--- a/VTK/ThirdParty/hdf5/vtkhdf5/src/H5detect.c
+++ b/VTK/ThirdParty/hdf5/vtkhdf5/src/H5detect.c
@@ -1360,8 +1360,8 @@ bit.\n";
*
*-------------------------------------------------------------------------
*/
-static void
-detect_C89_integers(void) HDF_NO_UBSAN
+static void HDF_NO_UBSAN
+detect_C89_integers(void)
{
DETECT_BYTE(signed char, SCHAR, d_g[nd_g]); nd_g++;
DETECT_BYTE(unsigned char, UCHAR, d_g[nd_g]); nd_g++;
@@ -1388,8 +1388,8 @@ detect_C89_integers(void) HDF_NO_UBSAN
*
*-------------------------------------------------------------------------
*/
-static void
-detect_C89_floats(void) HDF_NO_UBSAN
+static void HDF_NO_UBSAN
+detect_C89_floats(void)
{
DETECT_F(float, FLOAT, d_g[nd_g]); nd_g++;
DETECT_F(double, DOUBLE, d_g[nd_g]); nd_g++;
@@ -1410,8 +1410,8 @@ detect_C89_floats(void) HDF_NO_UBSAN
*
*-------------------------------------------------------------------------
*/
-static void
-detect_C99_integers8(void) HDF_NO_UBSAN
+static void HDF_NO_UBSAN
+detect_C99_integers8(void)
{
#if H5_SIZEOF_INT8_T>0
#if H5_SIZEOF_INT8_T==1
@@ -1472,8 +1472,8 @@ detect_C99_integers8(void) HDF_NO_UBSAN
*
*-------------------------------------------------------------------------
*/
-static void
-detect_C99_integers16(void) HDF_NO_UBSAN
+static void HDF_NO_UBSAN
+detect_C99_integers16(void)
{
#if H5_SIZEOF_INT16_T>0
DETECT_I(int16_t, INT16, d_g[nd_g]); nd_g++;
@@ -1510,8 +1510,8 @@ detect_C99_integers16(void) HDF_NO_UBSAN
*
*-------------------------------------------------------------------------
*/
-static void
-detect_C99_integers32(void) HDF_NO_UBSAN
+static void HDF_NO_UBSAN
+detect_C99_integers32(void)
{
#if H5_SIZEOF_INT32_T>0
DETECT_I(int32_t, INT32, d_g[nd_g]); nd_g++;
@@ -1548,8 +1548,8 @@ detect_C99_integers32(void) HDF_NO_UBSAN
*
*-------------------------------------------------------------------------
*/
-static void
-detect_C99_integers64(void) HDF_NO_UBSAN
+static void HDF_NO_UBSAN
+detect_C99_integers64(void)
{
#if H5_SIZEOF_INT64_T>0
DETECT_I(int64_t, INT64, d_g[nd_g]); nd_g++;
@@ -1599,8 +1599,8 @@ detect_C99_integers64(void) HDF_NO_UBSAN
*
*-------------------------------------------------------------------------
*/
-static void
-detect_C99_integers(void) HDF_NO_UBSAN
+static void HDF_NO_UBSAN
+detect_C99_integers(void)
{
/* break it down to more subroutines so that each module subroutine */
/* is smaller and takes less time to compile with optimization on. */
@@ -1625,8 +1625,8 @@ detect_C99_integers(void) HDF_NO_UBSAN
*
*-------------------------------------------------------------------------
*/
-static void
-detect_C99_floats(void) HDF_NO_UBSAN
+static void HDF_NO_UBSAN
+detect_C99_floats(void)
{
#if H5_SIZEOF_DOUBLE == H5_SIZEOF_LONG_DOUBLE
/*
@@ -1656,8 +1656,8 @@ detect_C99_floats(void) HDF_NO_UBSAN
*
*-------------------------------------------------------------------------
*/
-static void
-detect_alignments(void) HDF_NO_UBSAN
+static void HDF_NO_UBSAN
+detect_alignments(void)
{
/* Detect structure alignment for pointers, hvl_t, hobj_ref_t, hdset_reg_ref_t */
DETECT_M(void *, POINTER, m_g[na_g]); na_g++;
@@ -1744,8 +1744,8 @@ static int verify_signal_handlers(int signum, void (*handler)(int))
*
*-------------------------------------------------------------------------
*/
-int
-main(void) HDF_NO_UBSAN
+int HDF_NO_UBSAN
+main(void)
{
#if defined(H5_HAVE_SETSYSINFO) && defined(SSI_NVPAIRS)

24
fix-libharu-missing-m.patch Normal file
View File

@ -0,0 +1,24 @@
--- a/VTK/ThirdParty/libharu/vtklibharu/CMakeLists.txt
+++ b/VTK/ThirdParty/libharu/vtklibharu/CMakeLists.txt
@@ -125,6 +125,9 @@
endif(PNG_FOUND)
endif ()
+find_library(M_LIB m)
+set(ADDITIONAL_LIBRARIES ${ADDITIONAL_LIBRARIES} ${M_LIB})
+
# =======================================================================
# configure header files, add compiler flags
# =======================================================================
--- a/VTK/ThirdParty/libharu/vtklibharu/src/CMakeLists.txt
+++ b/VTK/ThirdParty/libharu/vtklibharu/src/CMakeLists.txt
@@ -102,7 +102,7 @@
endif(LIBHPDF_SHARED)
else ()
vtk_add_library(vtklibharu ${LIBHPDF_SRCS})
- target_link_libraries(vtklibharu PRIVATE ${vtkzlib_LIBRARIES} ${vtkpng_LIBRARIES})
+ target_link_libraries(vtklibharu PRIVATE ${vtkzlib_LIBRARIES} ${vtkpng_LIBRARIES} ${ADDITIONAL_LIBRARIES})
if (WIN32)
set_target_properties(vtklibharu
PROPERTIES

10
fix-libhdf5-missing-m.patch Normal file
View File

@ -0,0 +1,10 @@
--- a/VTK/ThirdParty/hdf5/vtkhdf5/src/CMakeLists.txt
+++ b/VTK/ThirdParty/hdf5/vtkhdf5/src/CMakeLists.txt
@@ -7,6 +7,7 @@
# Apply Definitions to compiler in this directory and below
#-----------------------------------------------------------------------------
add_definitions (${HDF_EXTRA_C_FLAGS})
+link_libraries(m dl pthread)
#-----------------------------------------------------------------------------
# List Source Files

10
fix-no-plugin-doc-dir.patch Normal file
View File

@ -0,0 +1,10 @@
--- a/Plugins/StreamLinesRepresentation/CMakeLists.txt
+++ b/Plugins/StreamLinesRepresentation/CMakeLists.txt
@@ -41,7 +41,6 @@
add_paraview_plugin(
StreamLinesRepresentation "0.1"
- DOCUMENTATION_DIR "${CMAKE_CURRENT_SOURCE_DIR}/doc"
SERVER_MANAGER_XML StreamLinesRepresentation.xml
SERVER_MANAGER_SOURCES
vtkStreamLinesRepresentation.cxx

143
fix-qt-5.11-931c779.patch Normal file
View File

@ -0,0 +1,143 @@
From 931c779dde8460fe32aa8a3d19956b175b96e4f9 Mon Sep 17 00:00:00 2001
From: Robert O'Bara <bob.obara@kitware.com>
Date: Thu, 24 May 2018 09:49:28 -0400
Subject: [PATCH] ENH: Changes needed to support Qt 5.11
Basically needed to add missing header files.
---
Plugins/SLACTools/pqSLACDataLoadManager.cxx | 1 +
Qt/ApplicationComponents/pqColorMapEditor.cxx | 1 +
Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx | 1 +
.../pqStandardViewFrameActionsImplementation.cxx | 1 +
Qt/ApplicationComponents/pqTimeInspectorWidget.cxx | 1 +
.../pqTransferFunctionWidgetPropertyDialog.cxx | 2 ++
Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx | 1 +
Qt/Components/pqChangeInputDialog.cxx | 1 +
Qt/Components/pqCinemaTrackSelection.cxx | 1 +
Qt/Python/pqPythonShell.cxx | 1 +
10 files changed, 11 insertions(+)
diff --git a/Plugins/SLACTools/pqSLACDataLoadManager.cxx b/Plugins/SLACTools/pqSLACDataLoadManager.cxx
index 3ba019c26b..ce38396f68 100644
--- a/Plugins/SLACTools/pqSLACDataLoadManager.cxx
+++ b/Plugins/SLACTools/pqSLACDataLoadManager.cxx
@@ -34,6 +34,7 @@
#include "vtkSMProperty.h"
#include "vtkSMSourceProxy.h"
+#include <QAction>
#include <QPushButton>
#include <QtDebug>
diff --git a/Qt/ApplicationComponents/pqColorMapEditor.cxx b/Qt/ApplicationComponents/pqColorMapEditor.cxx
index 0395185e0a..88b56745eb 100644
--- a/Qt/ApplicationComponents/pqColorMapEditor.cxx
+++ b/Qt/ApplicationComponents/pqColorMapEditor.cxx
@@ -59,6 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <QDebug>
#include <QKeyEvent>
#include <QPointer>
+#include <QStyle>
#include <QVBoxLayout>
class pqColorMapEditor::pqInternals
diff --git a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
index 908e4598e0..820361a2b3 100644
--- a/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
+++ b/Qt/ApplicationComponents/pqDoubleRangeSliderPropertyWidget.cxx
@@ -43,6 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "vtkSMUncheckedPropertyHelper.h"
#include <QGridLayout>
+#include <QStyle>
class pqDoubleRangeSliderPropertyWidget::pqInternals
{
diff --git a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
index c297dc3d9e..501633f63a 100644
--- a/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
+++ b/Qt/ApplicationComponents/pqStandardViewFrameActionsImplementation.cxx
@@ -69,6 +69,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <QPushButton>
#include <QSet>
#include <QShortcut>
+#include <QStyle>
//-----------------------------------------------------------------------------
pqStandardViewFrameActionsImplementation::pqStandardViewFrameActionsImplementation(
diff --git a/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
index 6774c2e48e..e85e614f04 100644
--- a/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
+++ b/Qt/ApplicationComponents/pqTimeInspectorWidget.cxx
@@ -49,6 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "vtkSMPropertyHelper.h"
#include "vtkSMSourceProxy.h"
+#include <QHeaderView>
#include <QLineF>
#include <QPainter>
#include <QVariant>
diff --git a/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx b/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
index 55d3146447..93cd995d92 100644
--- a/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
+++ b/Qt/ApplicationComponents/pqTransferFunctionWidgetPropertyDialog.cxx
@@ -36,6 +36,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "vtkPiecewiseFunction.h"
#include <QString>
+#include <QDoubleValidator>
+
class pqTransferFunctionWidgetPropertyDialog::pqInternals
{
public:
diff --git a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
index 6d2865431e..8d2c4b61cd 100644
--- a/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
+++ b/Qt/ApplicationComponents/pqViewResolutionPropertyWidget.cxx
@@ -39,6 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "vtkSMProxy.h"
#include <QIntValidator>
+#include <QStyle>
class pqViewResolutionPropertyWidget::pqInternals
{
diff --git a/Qt/Components/pqChangeInputDialog.cxx b/Qt/Components/pqChangeInputDialog.cxx
index 8a67b10095..86db3de01c 100644
--- a/Qt/Components/pqChangeInputDialog.cxx
+++ b/Qt/Components/pqChangeInputDialog.cxx
@@ -45,6 +45,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "vtkSMProxy.h"
#include "vtkSmartPointer.h"
+#include <QHeaderView>
#include <QItemSelectionModel>
#include <QLineEdit>
#include <QRadioButton>
diff --git a/Qt/Components/pqCinemaTrackSelection.cxx b/Qt/Components/pqCinemaTrackSelection.cxx
index 3d6d9dde19..eea2e37680 100644
--- a/Qt/Components/pqCinemaTrackSelection.cxx
+++ b/Qt/Components/pqCinemaTrackSelection.cxx
@@ -30,6 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
========================================================================*/
#include <QDebug>
+#include <QHeaderView>
#include "vtkPVArrayInformation.h"
#include "vtkPVDataInformation.h"
diff --git a/Qt/Python/pqPythonShell.cxx b/Qt/Python/pqPythonShell.cxx
index 3d01fd0a96..bc1a014936 100644
--- a/Qt/Python/pqPythonShell.cxx
+++ b/Qt/Python/pqPythonShell.cxx
@@ -52,6 +52,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "vtkStringOutputWindow.h"
#include "vtkWeakPointer.h"
+#include <QAbstractItemView>
#include <QApplication>
#include <QCursor>
#include <QFile>
--
2.17.1

23
paraview-default-qtstyle.patch
View File

@ -1,23 +0,0 @@
Index: ParaView-v5.4.0/CMake/branded_paraview_main.cxx.in
===================================================================
--- 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[])
{
-#if defined(Q_WS_X11) || defined(Q_OS_LINUX)
+// #if defined(Q_WS_X11) || defined(Q_OS_LINUX)
// 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
// "plastique" is only available on Qt4, but this works just fine with Qt5 too. Qt5 just uses the
// default style when QStyleFactory::create("plastique") return nullptr.
- QApplication::setStyle(QStyleFactory::create("plastique"));
-#endif
+// QApplication::setStyle(QStyleFactory::create("plastique"));
+// #endif
// When playing tests, disable all effects.
if (checkenv("DART_TEST_FROM_DART") ||

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

@ -1,20 +1,21 @@
Index: ParaView-v5.4.0/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/error.c
Index: ParaView-v5.5.0/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/derror.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"
--- ParaView-v5.5.0.orig/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/derror.c
+++ ParaView-v5.5.0/VTK/ThirdParty/netcdf/vtknetcdf/libdispatch/derror.c
@@ -13,7 +13,7 @@
#endif
/* Tell the user the version of netCDF. */
-static const char nc_libvers[] = PACKAGE_VERSION " of "__DATE__" "__TIME__" $";
+static const char nc_libvers[] = PACKAGE_VERSION;
const char *
nc_inq_libvers(void)
Index: ParaView-v5.4.0/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx
/**
\defgroup lib_version Library Version
Index: ParaView-v5.5.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
--- ParaView-v5.5.0.orig/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx
+++ ParaView-v5.5.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 +25,10 @@ Index: ParaView-v5.4.0/Plugins/AnalyzeNIfTIReaderWriter/vtknifti1_io.cxx
}
Index: ParaView-v5.4.0/Plugins/CDIReader/cdilib.c
Index: ParaView-v5.5.0/Plugins/CDIReader/cdilib.c
===================================================================
--- ParaView-v5.4.0.orig/Plugins/CDIReader/cdilib.c
+++ ParaView-v5.4.0/Plugins/CDIReader/cdilib.c
--- ParaView-v5.5.0.orig/Plugins/CDIReader/cdilib.c
+++ ParaView-v5.5.0/Plugins/CDIReader/cdilib.c
@@ -5274,7 +5274,7 @@ static void file_table_print(void);
#define LIBVERSION 1.8.2
#define XSTRING(x) #x

22
paraview.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Tue Aug 14 12:36:23 UTC 2018 - foss@grueninger.de
- Update to version 5.5.2
see full changelog at
https://blog.kitware.com/paraview-5-5-0-release-notes/
- Disable build of examples
- Don't use VTKm as it cause CMake configure problems
- drop patch paraview-default-qtstyle.patch as plastic style is
no longer set by upstream
- drop patch Fix-ParaViewDetermineVersion.patch as a similar
change is included upstream
- update patch paraview-fix-file-contains-date-time.patch
- add patches fix-libhdf5-missing-m.patch and
fix-libharu-missing-m.patch to add missing libraries to
third-party dependencies included in ParaView
- add patch fix-qt-5.11-931c779.patch to fix issue with Qt 5.11
- add patch fix-no-plugin-doc-dir.patch to remove reference to
non-existant directory below a plug-in
- add patch fix-hdf5-gcc8.patch to fix issue with GCC 8 taken
from upstream
-------------------------------------------------------------------
Sat Mar 31 11:12:06 UTC 2018 - jengelh@inai.de

57
paraview.spec
View File

@ -15,16 +15,9 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?sle_version} >= 120200)
%define use_qt5 1
%else
%define use_qt5 0
%endif
%define major_ver 5.4
%define major_ver 5.5
Name: paraview
Version: 5.4.1
Version: 5.5.2
Release: 0
Summary: Data analysis and visualization application
License: BSD-3-Clause
@ -33,11 +26,9 @@ 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-%{major_ver}.0.pdf
Source3: http://www.paraview.org/files/v%{major_ver}/ParaViewGuide-%{major_ver}.0.pdf
Source4: http://www.paraview.org/files/v%{major_ver}/ParaViewTutorial.pdf
# 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
Source2: http://www.paraview.org/files/v%{major_ver}/ParaViewGettingStarted-%{version}.pdf
Source3: http://www.paraview.org/files/v%{major_ver}/ParaViewGuide-%{version}.pdf
Source4: http://www.paraview.org/files/v%{major_ver}/ParaViewTutorial-%{version}.pdf
# PATCH-FIX-UPSTREAM paraview-desktop-entry-fix.patch badshah400@gmail.com -- Fix desktop menu entry by inserting proper required categories
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
@ -48,6 +39,16 @@ Patch3: paraview-do-not-install-missing-vtk-doxygen-dir.patch
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 fix-qt-5.11-931c779.patch -- Required includes for Qt 5.11; from upstream, will be part of ParaView 5.6
Patch6: fix-qt-5.11-931c779.patch
# PATCH-FIX-UPSTREAM fix-hdf5-gcc8.patch -- Adjustments required to work with GCC 8; from upstream, might be part of ParaView 5.6
Patch7: fix-hdf5-gcc8.patch
# PATCH-FIX-OPENSUSE fix-libharu-missing-m.patch -- missing libraries for linking
Patch8: fix-libharu-missing-m.patch
# PATCH-FIX-OPENSUSE fix-libhdf5-missing-m.patch -- missing libraries for linking
Patch9: fix-libhdf5-missing-m.patch
# PATCH-FIX-UPSTREAM fix-no-plugin-doc-dir.patch -- plugin does not contain doc dir
Patch10: fix-no-plugin-doc-dir.patch
BuildRequires: Mesa-devel
BuildRequires: boost-devel
BuildRequires: cmake >= 3.3
@ -59,7 +60,6 @@ BuildRequires: libexpat-devel
BuildRequires: libjpeg-devel
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(xt)
#BuildRequires: libpq5
BuildRequires: libpqxx-devel
BuildRequires: libtiff-devel
BuildRequires: openssl-devel
@ -71,7 +71,6 @@ BuildRequires: pkgconfig(freetype2)
BuildRequires: fdupes
BuildRequires: python-twisted
BuildRequires: python-zope.interface
%if 0%{?use_qt5}
BuildRequires: python-qt5-devel
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
@ -83,12 +82,6 @@ BuildRequires: pkgconfig(Qt5WebKitWidgets)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: pkgconfig(Qt5Xml)
%else
BuildRequires: libQtWebKit-devel
BuildRequires: libqt4-devel >= 4.7.0
BuildRequires: python-qt4-devel
BuildRequires: qt4-assistant-adp-devel
%endif
BuildRequires: readline-devel
BuildRequires: tk-devel
BuildRequires: wget
@ -114,21 +107,24 @@ NOTE: The version in this package has NOT been compiled with MPI support.
%prep
%setup -q -n ParaView-v%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%build
# Prepare for gcc 4.9.0: work around gcc 4.9.0 regression
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61294
sed -i -e 's/-Wl,--fatal-warnings//' VTK/CMake/vtkCompilerExtras.cmake
sed -i -e 's/-Wl,--fatal-warnings//' VTK/CMake/vtkCompilerExtraFlags.cmake
export CC='gcc'
export CXX='g++'
export MAKE='make'
%cmake -DPV_INSTALL_LIB_DIR:PATH=%{_lib}/%{name} \
-DVTK_INSTALL_INCLUDE_DIR:PATH=include/%{name} \
@ -139,12 +135,8 @@ export MAKE='make'
-DCMAKE_CXX_COMPILER:FILEPATH=$CXX \
-DCMAKE_C_COMPILER:FILEPATH=$CC \
-DCMAKE_SKIP_RPATH:BOOL=OFF \
-DPARAVIEW_USE_VTKM:BOOL=OFF \
-DPARAVIEW_BUILD_QT_GUI:BOOL=ON \
%if 0%{?use_qt5}
-DPARAVIEW_QT_VERSION:STRING="5" \
%else
-DPARAVIEW_QT_VERSION:STRING="4" \
%endif
-DPARAVIEW_BUILD_PLUGIN_SLACTools:BOOL=ON \
-DPARAVIEW_ENABLE_PYTHON:BOOL=ON \
-DVTK_WRAP_PYTHON:BOOL=ON \
@ -155,12 +147,13 @@ export MAKE='make'
-DVTK_USE_SYSTEM_JPEG:BOOL=ON \
-DVTK_USE_SYSTEM_PNG:BOOL=ON \
-DVTK_USE_SYSTEM_TIFF:BOOL=ON \
-DVTK_USE_SYSTEM_LZMA:BOOL=ON \
-DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
-DVTK_USE_SYSTEM_ZOPE:BOOL=ON \
-DVTK_USE_SYSTEM_TWISTED:BOOL=ON \
-DVTK_USE_SYSTEM_GL2PS:BOOL=OFF \
-DBUILD_DOCUMENTATION:BOOL=ON \
-DBUILD_EXAMPLES:BOOL=ON \
-DBUILD_EXAMPLES:BOOL=OFF \
-DBUILD_TESTING:BOOL=OFF
# FIXME: TURN ON WHEN UPDATED GL2PS > 1.3.9 IS RELEASED
@ -206,6 +199,7 @@ install -Dm0644 %{S:4} %{buildroot}%{_datadir}/%{name}-%{major_ver}/doc/Tutorial
%defattr(-,root,root)
%doc License_v1.2.txt
%{_libdir}/%{name}/
%{_includedir}/%{name}/
%{_bindir}/*
%{_docdir}/%{name}/
%{_datadir}/%{name}-%{major_ver}/
@ -213,6 +207,5 @@ install -Dm0644 %{S:4} %{buildroot}%{_datadir}/%{name}-%{major_ver}/doc/Tutorial
%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/cmake/hdf5/
%changelog