rpm/paraview
SHA256
1
0
Fork 0
forked from pool/paraview
Code Pull Requests Activity
e6087c1dae
paraview/paraview-link-against-python.patch

46 lines
2.1 KiB
Diff
Raw Normal View History

Accepting request 770701 from home:badshah400:branches:science Fix a typo in .changes in previous sr. - Update to version 5.7.0: See https://blog.kitware.com/paraview-5-7-0-release-notes/ - Split out new subpackages: libparaview5_7 for all the shared libs, paraview-plugins for bundled plugins, and python3-paraview for python3 bindings. - Move shared libraries to %{_libdir} and install them as part of libparaview5_7. - Update commands passed to cmake in keeping with upstream's overhaul. - Drop paraview-find-qhelpgenerator-qt5.patch: no longer needed. - Drop paraview-fix-file-contains-date-time.patch: GCC supports SOURCE_DATE_EPOCH and, as such, this fix is no longer needed. - Switch to python3: Paraview is production ready with python3 starting with version 5.7.0, and python2 support is slated to be dropped from the next major upgrade. - Rebase patches for updated version: * fix-libharu-missing-m.patch. * bundled_exodusii_add_missing_libpthread.patch. - New patches to fix linking problems introduced with version 5.7.0: * fix-loguru-missing-links.patch: Add linking to libraries libm, libdl, and libpthread when building loguru. * fix-QtGUI-missing-GLX_mesa-linking.patch: Link to library libGLX_mesa when building Qt GUI support. * paraview-link-against-python.patch to fix linking against the python library. - Patch 0001-Allow-compilation-on-GLES-platforms.patch needs rebase; commented out for now. - Switch an env based hashbang with one directly calling the required binary (python3 in this case). - Switch as many BuildRequires as possible to pkgconfig based ones. - Update rpmlintrc file to remove no longer needed filters and update the leftover filter (hidden file or dir) for directory change. OBS-URL: https://build.opensuse.org/request/show/770701 OBS-URL: https://build.opensuse.org/package/show/science/paraview?expand=0&rev=70
2020-02-11 01:33:43 +01:00
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)
Copy Permalink