Accepting request 802707 from science

OBS-URL: https://build.opensuse.org/request/show/802707 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/paraview?expand=0&rev=32
2020-05-12 20:30:23 +00:00 · 2020-05-12 20:30:23 +00:00 · df1f312553
commit df1f312553
parent 72749e254f 1f47470db2
7 changed files with 50 additions and 111 deletions
--- a/0001-Add-libogg-to-IOMovie-target-link-libraries.patch
+++ b/0001-Add-libogg-to-IOMovie-target-link-libraries.patch
@ -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()
--- a/bundled_exodusii_add_missing_libpthread.patch
+++ b/bundled_exodusii_add_missing_libpthread.patch
@ -1,13 +1,38 @@
-Index: ParaView-v5.7.0/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
-===================================================================
--- ParaView-v5.7.0.orig/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
-+++ ParaView-v5.7.0/VTK/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt
-@@ -301,6 +301,8 @@ vtk_module_add_module(VTK::exodusII
+diff --git a/VTK/ThirdParty/exodusII/vtk.module b/VTK/ThirdParty/exodusII/vtk.module
+index 27301eceb62f6200f69d65046a0e35a3572825e8..cb6bd927acd008a15c9d2df67d75cbbfd3237b57 100644
+--- a/VTK/ThirdParty/exodusII/vtk.module
+++ b/VTK/ThirdParty/exodusII/vtk.module
+@@ -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}
   HEADERS ${headers}
   HEADERS_SUBDIR "vtkexodusII/include")
-+vtk_module_link(VTK::exodusII PUBLIC pthread)
-+vtk_module_link(VTK::exodusII PUBLIC hdf5)
- target_compile_definitions(exodusII
+-target_compile_definitions(exodusII
+vtk_module_definitions(VTK::exodusII
   PRIVATE
     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)
+
--- a/fix-loguru-missing-links.patch
+++ b/fix-loguru-missing-links.patch
@ -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
--- a/paraview-do-not-install-missing-vtk-doxygen-dir.patch
+++ b/paraview-do-not-install-missing-vtk-doxygen-dir.patch
@ -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()
--- a/paraview-link-against-python.patch
+++ b/paraview-link-against-python.patch
@ -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)
-
--- a/paraview.changes
+++ b/paraview.changes
@ -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>

--- a/paraview.spec
+++ b/paraview.spec
@ -47,18 +47,10 @@ Source3:        https://www.paraview.org/files/v%{major_ver}/ParaViewGuide-%{ver
 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
 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
-Patch3:         paraview-do-not-install-missing-vtk-doxygen-dir.patch
-# PATCH-FIX-OPENSUSE fix-libharu-missing-m.patch -- missing libraries for linking
+# PATCH-FIX-OPENSUSE fix-libharu-missing-m.patch -- missing libraries for linking (gh#libharu/libharu#213)
 Patch8:         fix-libharu-missing-m.patch
-# PATCH-FIX-UPSTREAM paraview-link-against-python.patch badshah400@gmail.com -- Fix linking to python library
-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
+# 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)
 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:  cgns-devel
 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_PYTHON:BOOL=ON \
       -DPARAVIEW_PYTHON_SITE_PACKAGES_SUFFIX=%{_lib}/python%{py3_ver}/site-packages/paraview \
+       -DVTK_PYTHON_OPTIONAL_LINK:BOOL=OFF \
       -DPARAVIEW_ENABLE_WEB:BOOL=ON \
       -DVTK_WRAP_PYTHON:BOOL=ON \
       -DVTK_OPENGL_HAS_OSMESA:BOOL=OFF \