Hello community, here is the log from the commit of package paraview for openSUSE:Factory checked in at 2020-05-12 22:30:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/paraview (Old) and /work/SRC/openSUSE:Factory/.paraview.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "paraview" Tue May 12 22:30:23 2020 rev:32 rq:802707 version:5.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/paraview/paraview.changes 2020-05-07 14:55:08.742365500 +0200 +++ /work/SRC/openSUSE:Factory/.paraview.new.2738/paraview.changes 2020-05-12 22:32:19.883869288 +0200 @@ -1,0 +2,14 @@ +Thu May 7 21:53:50 UTC 2020 - Atri Bhattacharya <[email protected]> + +- 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). + +------------------------------------------------------------------- Old: ---- 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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ paraview.spec ++++++ --- /var/tmp/diff_new_pack.gmd6aM/_old 2020-05-12 22:32:21.995873696 +0200 +++ /var/tmp/diff_new_pack.gmd6aM/_new 2020-05-12 22:32:21.999873704 +0200 @@ -47,18 +47,10 @@ 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 [email protected] -- 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 [email protected] -- Fix linking to python library -Patch9: paraview-link-against-python.patch -# PATCH-FIX-OPENSUSE bundled_exodusii_add_missing_libpthread.patch [email protected] -- Add missing libm for linking +# PATCH-FIX-OPENSUSE bundled_exodusii_add_missing_libpthread.patch [email protected] -- 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 [email protected] -- 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 @@ -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 \ ++++++ bundled_exodusii_add_missing_libpthread.patch ++++++ --- /var/tmp/diff_new_pack.gmd6aM/_old 2020-05-12 22:32:22.031873771 +0200 +++ /var/tmp/diff_new_pack.gmd6aM/_new 2020-05-12 22:32:22.031873771 +0200 @@ -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) +
