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

Accepting request 802707 from science

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/802707
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/paraview?expand=0&rev=32
This commit is contained in:
Dominique Leuenberger 2020-05-12 20:30:23 +00:00 committed by Git OBS Bridge
commit df1f312553
7 changed files with 50 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
0001-Add-libogg-to-IOMovie-target-link-libraries.patch
View File

@ -1,21 +0,0 @@
From 9418a8a8c84c8185d61e5135b95a67c3d98ba23e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Mon, 25 Feb 2019 00:27:07 +0100
Subject: [PATCH] Add libogg to IOMovie target link libraries
---
IO/Movie/CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
Index: ParaView-v5.7.0/VTK/IO/Movie/CMakeLists.txt
===================================================================
--- ParaView-v5.7.0.orig/VTK/IO/Movie/CMakeLists.txt
+++ ParaView-v5.7.0/VTK/IO/Movie/CMakeLists.txt
@@ -20,3 +20,7 @@ if (WIN32 AND VTK_USE_VIDEO_FOR_WINDOWS)
PRIVATE
vfw32)
endif ()
+
+if(vtkIOMovie_vtkoggtheora)
+ target_link_libraries(vtkIOMovie PUBLIC ogg)
+endif()

41
bundled_exodusii_add_missing_libpthread.patch
View File

@ -1,13 +1,38 @@
Index: ParaView-v5.7.0/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt diff --git a/VTK/ThirdParty/exodusII/vtk.module b/VTK/ThirdParty/exodusII/vtk.module
=================================================================== index 27301eceb62f6200f69d65046a0e35a3572825e8..cb6bd927acd008a15c9d2df67d75cbbfd3237b57 100644
--- ParaView-v5.7.0.orig/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt --- a/VTK/ThirdParty/exodusII/vtk.module
+++ ParaView-v5.7.0/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt +++ b/VTK/ThirdParty/exodusII/vtk.module
@@ -301,6 +301,8 @@ vtk_module_add_module(VTK::exodusII @@ -3,5 +3,6 @@ NAME
LIBRARY_NAME
vtkexodusII
DEPENDS
+ VTK::hdf5
VTK::netcdf
THIRD_PARTY
diff --git a/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt b/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
index 025abc43e0a8f9a94abdafdb7dfc95713d8f9216..d931004997f199c4aab57b94797043dd384fd2dd 100644
--- a/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
+++ b/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
@@ -297,14 +297,19 @@ set(headers
"${CMAKE_CURRENT_BINARY_DIR}/include/exodusII_cfg.h"
"${CMAKE_CURRENT_BINARY_DIR}/include/exodus_config.h")
+vtk_module_find_package(PACKAGE Threads)
+
vtk_module_add_module(VTK::exodusII
SOURCES ${sources} SOURCES ${sources}
HEADERS ${headers} HEADERS ${headers}
HEADERS_SUBDIR "vtkexodusII/include") HEADERS_SUBDIR "vtkexodusII/include")
+vtk_module_link(VTK::exodusII PUBLIC pthread) -target_compile_definitions(exodusII
+vtk_module_link(VTK::exodusII PUBLIC hdf5) +vtk_module_definitions(VTK::exodusII
target_compile_definitions(exodusII
PRIVATE PRIVATE
exoIIc_EXPORTS) exoIIc_EXPORTS)
-target_include_directories(exodusII
+vtk_module_include(VTK::exodusII
PUBLIC
"$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
"$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>")
+vtk_module_link(VTK::exodusII
+ PRIVATE
+ Threads::Threads)

15
fix-loguru-missing-links.patch
View File

@ -1,15 +0,0 @@
Index: ParaView-v5.7.0/VTK/ThirdParty/loguru/vtkloguru/CMakeLists.txt
===================================================================
--- ParaView-v5.7.0.orig/VTK/ThirdParty/loguru/vtkloguru/CMakeLists.txt
+++ ParaView-v5.7.0/VTK/ThirdParty/loguru/vtkloguru/CMakeLists.txt
@@ -10,6 +12,10 @@ vtk_module_add_module(VTK::loguru
HEADERS ${headers}
HEADERS_SUBDIR "vtkloguru")
+vtk_module_link(VTK::loguru PUBLIC m)
+vtk_module_link(VTK::loguru PUBLIC dl)
+vtk_module_link(VTK::loguru PUBLIC pthread)
+
include(GenerateExportHeader)
generate_export_header(loguru
EXPORT_MACRO_NAME LOGURU_EXPORT

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

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

45
paraview-link-against-python.patch
View File

@ -1,45 +0,0 @@
Index: ParaView-v5.7.0/VTK/Web/Core/CMakeLists.txt
===================================================================
--- ParaView-v5.7.0.orig/VTK/Web/Core/CMakeLists.txt
+++ ParaView-v5.7.0/VTK/Web/Core/CMakeLists.txt
@@ -1,3 +1,10 @@
+if ("${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" VERSION_GREATER "3.7")
+ link_libraries(python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+else ("${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" VERSION_GREATER "3.7")
+ link_libraries(python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}m)
+endif ("${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" VERSION_GREATER "3.7")
+
+
set(classes
vtkDataEncoder
vtkObjectIdMap
Index: ParaView-v5.7.0/VTK/Wrapping/PythonCore/CMakeLists.txt
===================================================================
--- ParaView-v5.7.0.orig/VTK/Wrapping/PythonCore/CMakeLists.txt
+++ ParaView-v5.7.0/VTK/Wrapping/PythonCore/CMakeLists.txt
@@ -1,3 +1,10 @@
+if ("${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" VERSION_GREATER "3.7")
+ link_libraries(python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+else ("${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" VERSION_GREATER "3.7")
+ link_libraries(python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}m)
+endif ("${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" VERSION_GREATER "3.7")
+
+
set(classes
vtkPythonArgs
vtkPythonCommand
Index: ParaView-v5.7.0/VTK/Utilities/PythonInterpreter/CMakeLists.txt
===================================================================
--- ParaView-v5.7.0.orig/VTK/Utilities/PythonInterpreter/CMakeLists.txt
+++ ParaView-v5.7.0/VTK/Utilities/PythonInterpreter/CMakeLists.txt
@@ -1,3 +1,9 @@
+if ("${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" VERSION_GREATER "3.7")
+ link_libraries(python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+else ("${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" VERSION_GREATER "3.7")
+ link_libraries(python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}m)
+endif ("${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" VERSION_GREATER "3.7")
+
set(classes
vtkPythonInteractiveInterpreter
vtkPythonInterpreter)

14
paraview.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu May 7 21:53:50 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>
- Drop patches no longer needed:
* 0001-Add-libogg-to-IOMovie-target-link-libraries.patch
* fix-loguru-missing-links.patch
* paraview-do-not-install-missing-vtk-doxygen-dir.patch
* paraview-link-against-python.patch: pass
DVTK_PYTHON_OPTIONAL_LINK=OFF to cmake instead (see
https://gitlab.kitware.com/vtk/vtk/-/issues/17881).
- Update bundled_exodusii_add_missing_libpthread.patch to version
from upstream
(https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6865).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 5 17:56:54 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com> Tue May 5 17:56:54 UTC 2020 - Atri Bhattacharya <badshah400@gmail.com>

13
paraview.spec
View File

@ -47,18 +47,10 @@ Source3: https://www.paraview.org/files/v%{major_ver}/ParaViewGuide-%{ver
Patch1: paraview-desktop-entry-fix.patch Patch1: paraview-desktop-entry-fix.patch
# PATCH-FIX-UPSTREAM fix-3d48a287-support-new-api-cgio_read_data_type.patch -- Add support for new API cgio_read_***data***_type # PATCH-FIX-UPSTREAM fix-3d48a287-support-new-api-cgio_read_data_type.patch -- Add support for new API cgio_read_***data***_type
Patch2: fix-3d48a287-support-new-api-cgio_read_data_type.patch Patch2: fix-3d48a287-support-new-api-cgio_read_data_type.patch
# PATCH-FIX-UPSTREAM paraview-do-not-install-missing-vtk-doxygen-dir.patch foss@grueninger.de -- Remove install of nonexistent doxygen/html dir # PATCH-FIX-OPENSUSE fix-libharu-missing-m.patch -- missing libraries for linking (gh#libharu/libharu#213)
Patch3: paraview-do-not-install-missing-vtk-doxygen-dir.patch
# PATCH-FIX-OPENSUSE fix-libharu-missing-m.patch -- missing libraries for linking
Patch8: fix-libharu-missing-m.patch Patch8: fix-libharu-missing-m.patch
# PATCH-FIX-UPSTREAM paraview-link-against-python.patch badshah400@gmail.com -- Fix linking to python library # PATCH-FIX-OPENSUSE bundled_exodusii_add_missing_libpthread.patch stefan.bruens@rwth-aachen.de -- Add missing libm for linking (updated to upstream patch, see https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6865)
Patch9: paraview-link-against-python.patch
# PATCH-FIX-OPENSUSE bundled_exodusii_add_missing_libpthread.patch stefan.bruens@rwth-aachen.de -- Add missing libm for linking
Patch10: bundled_exodusii_add_missing_libpthread.patch Patch10: bundled_exodusii_add_missing_libpthread.patch
# PATCH-FIX-OPENSUSE -- Missing libogg symbols
Patch11: 0001-Add-libogg-to-IOMovie-target-link-libraries.patch
# PATCH-FIX-UPSTREAM fix-loguru-missing-links.patch badshah400@gmail.com -- Fix missing libs (libm, libpthread, libdl) when linking to build loguru
Patch13: fix-loguru-missing-links.patch
BuildRequires: Mesa-devel BuildRequires: Mesa-devel
BuildRequires: cgns-devel BuildRequires: cgns-devel
BuildRequires: cmake >= 3.13 BuildRequires: cmake >= 3.13
@ -202,6 +194,7 @@ sed -Ei "1{s|#!/usr/bin/env python3|#!/usr/bin/python3|}" Clients/CommandLineExe
-DPARAVIEW_USE_QT:BOOL=ON \ -DPARAVIEW_USE_QT:BOOL=ON \
-DPARAVIEW_USE_PYTHON:BOOL=ON \ -DPARAVIEW_USE_PYTHON:BOOL=ON \
-DPARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX=%{_lib}/python%{py3_ver}/site-packages/paraview \ -DPARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX=%{_lib}/python%{py3_ver}/site-packages/paraview \
-DVTK_PYTHON_OPTIONAL_LINK:BOOL=OFF \
-DPARAVIEW_ENABLE_WEB:BOOL=ON \ -DPARAVIEW_ENABLE_WEB:BOOL=ON \
-DVTK_WRAP_PYTHON:BOOL=ON \ -DVTK_WRAP_PYTHON:BOOL=ON \
-DVTK_OPENGL_HAS_OSMESA:BOOL=OFF \ -DVTK_OPENGL_HAS_OSMESA:BOOL=OFF \