Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package vtk for openSUSE:Factory checked in at 2021-06-28 15:33:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vtk (Old) and /work/SRC/openSUSE:Factory/.vtk.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vtk" Mon Jun 28 15:33:33 2021 rev:52 rq:902668 version:9.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/vtk/vtk.changes 2020-10-24 15:17:59.392259796 +0200 +++ /work/SRC/openSUSE:Factory/.vtk.new.2625/vtk.changes 2021-06-28 15:33:53.411205200 +0200 @@ -1,0 +2,30 @@ +Sat Jun 19 21:04:19 UTC 2021 - Ben Greiner <c...@bnavigator.de> + +- Add vtk-opensuse-python-metadata.patch: + Installing without VTK_BUILD_WHEEL lacks the dist-info/egg-info + metadata. When a user installs python packages which depend + on vtk through pip (into the user home or into a virtualenv), + pip does not recognize the files installed into site-packages + without the metadata and pulls in a big manylinux wheel from + PyPI. We introduce the necessary egg-info metadata in order to + avoid this. +- python3-vtk: Don't own the arch site-packages (%python3_sitearch) + and the toplevel __pycache__ dir, only our own python files. +- Move qt and python .so devel files to main devel package, adjust + rpmlintrc: The devel files are not required by the + python bindings (anymore?). + +------------------------------------------------------------------- +Wed Jun 9 17:21:57 UTC 2021 - Ben Greiner <c...@bnavigator.de> + +- Add vtk-std_numeric_limits.patch in order to fix gcc 11.1 build + https://gitlab.kitware.com/vtk/vtk/-/issues/18194 +- Require %{name}-qt in python3-%{name}: The Python bindings link + to libvtkRenderingQt.so.1, but zypper fails to resolve the + requirement to the correct (non-)mpi flavor -- boo#1187161 +- Change description: The vtk-qt subpackage provides some Qt + libraries, not a designer plugin. +- Support for QtWebkit was removed with vtk 9.0.0: Remove the build + requirement. + +------------------------------------------------------------------- New: ---- vtk-opensuse-python-metadata.patch vtk-std_numeric_limits.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vtk.spec ++++++ --- /var/tmp/diff_new_pack.FQrDxu/_old 2021-06-28 15:33:54.259206236 +0200 +++ /var/tmp/diff_new_pack.FQrDxu/_new 2021-06-28 15:33:54.263206241 +0200 @@ -1,7 +1,7 @@ # -# spec file for package vtk +# spec file # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -150,6 +150,10 @@ Patch14: 0001-Replace-invalid-GL_LINE-with-GL_LINES-for-glDrawArra.patch # PATCH-FIX-UPSTREAM -- https://gitlab.kitware.com/vtk/vtk/-/issues/18033 Patch15: vtk-freetype-2.10.3-replace-FT_CALLBACK_DEF.patch +# PATCH-FIX-UPSTREAM -- https://gitlab.kitware.com/vtk/vtk/-/issues/18194 +Patch16: vtk-std_numeric_limits.patch +# PATCH-FIX-OPENSUSE -- create python package metadata (egg-info) despite not building a wheel +Patch17: vtk-opensuse-python-metadata.patch BuildRequires: R-base-devel BuildRequires: chrpath BuildRequires: cmake >= 3.4 @@ -166,12 +170,12 @@ BuildRequires: python3-devel BuildRequires: python3-numpy-devel BuildRequires: python3-qt5-devel +BuildRequires: python3-setuptools BuildRequires: utfcpp-devel BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5OpenGLExtensions) BuildRequires: pkgconfig(Qt5Sql) -BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(eigen3) >= 2.91.0 BuildRequires: pkgconfig(expat) @@ -270,7 +274,6 @@ Requires: pkgconfig(Qt5OpenGL) Requires: pkgconfig(Qt5OpenGLExtensions) Requires: pkgconfig(Qt5Sql) -Requires: pkgconfig(Qt5WebKitWidgets) Requires: pkgconfig(Qt5Widgets) Requires: pkgconfig(expat) Requires: pkgconfig(freetype2) @@ -338,6 +341,10 @@ %package -n python3-%{name} Summary: Python bindings for VTK Group: Development/Libraries/Python +# explicitly require the correct mpi flavor, because the automatic +# rpm requirements generator for shared libs fails to distinguish +# between them -- boo#1187161 +Requires: %{name}-qt = %{version} Requires: %{shlib} = %{version} %{?with_mpi:Requires: python3-mpi4py} Requires: python3-numpy @@ -354,7 +361,7 @@ This package provides python 3.x bindings for VTK. %package qt -Summary: Qt Designer plugin for QVTKWidget +Summary: Qt libraries for VTK Group: Development/Libraries/C and C++ Requires: %{shlib} = %{version} Conflicts: vtk-compat_gl-qt @@ -366,7 +373,7 @@ rendering techniques (e.g. hardware-accelerated volume rendering, LOD control). -This package provides a Qt Designer plugin for the QVTKWidget. +This package provides the Qt libraries for VTK. # The examples work with any VTK flavor, just package these once %if "%{flavor}" == "" @@ -407,6 +414,8 @@ %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 +%patch17 -p1 # Replace relative path ../../../../VTKData with %%{_datadir}/vtkdata # otherwise it will break on symlinks. @@ -460,6 +469,7 @@ -DVTK_GROUP_ENABLE_StandAlone=WANT \ -DVTK_GROUP_ENABLE_Views=WANT \ -DVTK_PYTHON_VERSION=3 \ + -DVTK_OPENSUSE_PYTHON_BUILD:BOOL=ON \ -DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON \ -DJava_JAVAH_EXECUTABLE=%{_bindir}/true \ -DVTK_WRAP_JAVA:BOOL=%{?with_java:ON}%{!?with_java:OFF} \ @@ -540,6 +550,16 @@ mkdir -p %{buildroot}%{_licensedir} mv %{buildroot}%{my_datadir}/licenses/VTK %{buildroot}%{_licensedir}/%{name} +%if ! %{with mpi} +# install python distribution metadata despite not building a wheel +buildsitearch=%{python3_sitearch} +buildsitearch=${buildsitearch/\/usr/build} +cp build/{setup.py,README.md,MANIFEST.in,requirements.txt,vtk_features.py} ${buildsitearch}/ +pushd ${buildsitearch} +python3 setup.py install_egg_info -d %{buildroot}%{python3_sitearch} +popd +%endif + %fdupes -s %{buildroot} %check @@ -588,10 +608,8 @@ %{?with_mpi: %dir %{my_libdir}/cmake/} %{my_libdir}/cmake/%{pkgname}-%{series}/ %{my_incdir}/%{pkgname}-%{series}/ -# VTK JNI, PythonTkinter, QtGUI +# VTK JNI %exclude %{my_libdir}/libvtk*Java.so -%exclude %{my_libdir}/libvtk*Python*.so -%exclude %{my_libdir}/libvtk*Qt*.so %if %{with documentation} %files devel-doc @@ -614,15 +632,15 @@ %{my_bindir}/p%{pkgname}python %{my_libdir}/py* %else -%{python3_sitearch}/ +%{python3_sitearch}/vtk.py +%{python3_sitearch}/vtk-%{version}*-info +%{python3_sitearch}/vtkmodules %endif %{my_libdir}/libvtk*Python*.so.1 -%{my_libdir}/libvtk*Python*.so %files qt %license Copyright.txt %{my_libdir}/libvtk*Qt*.so.* -%{my_libdir}/libvtk*Qt*.so %if %{with examples} %if "%{flavor}" == "" ++++++ vtk-opensuse-python-metadata.patch ++++++ Index: VTK-9.0.1/CMakeLists.txt =================================================================== --- VTK-9.0.1.orig/CMakeLists.txt +++ VTK-9.0.1/CMakeLists.txt @@ -48,6 +48,8 @@ include(vtkCMakeBackports) if (VTK_WHEEL_BUILD) include(vtkWheelPreparation) +elseif(VTK_OPENSUSE_PYTHON_BUILD) + include(vtkPythonMetadataPrepare) endif () include(vtkCompilerChecks) @@ -474,7 +476,7 @@ install( # TODO: HeaderTest exclusions for memcheck. -if (VTK_WHEEL_BUILD) +if (VTK_WHEEL_BUILD OR VTK_OPENSUSE_PYTHON_BUILD) include(vtkWheelFinalization) endif () Index: VTK-9.0.1/CMake/vtkPythonMetadataPrepare.cmake =================================================================== --- /dev/null +++ VTK-9.0.1/CMake/vtkPythonMetadataPrepare.cmake @@ -0,0 +1,18 @@ +# copied from vtkWheelPrepare, but without forcing wheel specific options + +configure_file( + "${CMAKE_CURRENT_LIST_DIR}/setup.py.in" + "${CMAKE_BINARY_DIR}/setup.py" + @ONLY) +configure_file( + "${CMAKE_CURRENT_LIST_DIR}/MANIFEST.in.in" + "${CMAKE_BINARY_DIR}/MANIFEST.in" + @ONLY) +configure_file( + "${CMAKE_SOURCE_DIR}/Copyright.txt" + "${CMAKE_BINARY_DIR}/LICENSE" + COPYONLY) +configure_file( + "${CMAKE_SOURCE_DIR}/README.md" + "${CMAKE_BINARY_DIR}/README.md" + COPYONLY) ++++++ vtk-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.FQrDxu/_old 2021-06-28 15:33:54.343206339 +0200 +++ /var/tmp/diff_new_pack.FQrDxu/_new 2021-06-28 15:33:54.343206339 +0200 @@ -1,12 +1,3 @@ -# FIXME: See if packaging can be tweaked to avoid these warnings later -# python-vtk needs these devel files to work -addFilter("python3-vtk.* shlib-policy-name-error") -addFilter("python3-vtk.* shlib-policy-missing-suffix") -addFilter("python3-vtk.* devel-file-in-non-devel-package") -addFilter("python3-vtk-openmpi.* shlib-policy-name-error") -addFilter("python3-vtk-openmpi.* shlib-policy-missing-suffix") -addFilter("python3-vtk-openmpi.* devel-file-in-non-devel-package") - # Upstream does not supply manuals for any binary, suppress warnings addFilter(".* no-manual-page-for-binary") ++++++ vtk-std_numeric_limits.patch ++++++ >From c7d6a8d81367a4ed92163c059aa3181386eabc24 Mon Sep 17 00:00:00 2001 From: Ben Boeckel <ben.boec...@kitware.com> Date: Mon, 3 May 2021 11:55:27 -0400 Subject: [PATCH] vtkDataArrayPrivate: include <limits> for std::numeric_limits See: #18194 --- Common/Core/vtkDataArrayPrivate.txx | 1 + 1 file changed, 1 insertion(+) Index: VTK-9.0.1/Common/Core/vtkDataArrayPrivate.txx =================================================================== --- VTK-9.0.1.orig/Common/Core/vtkDataArrayPrivate.txx +++ VTK-9.0.1/Common/Core/vtkDataArrayPrivate.txx @@ -24,6 +24,7 @@ #include <algorithm> #include <array> #include <cassert> // for assert() +#include <limits> #include <vector> namespace vtkDataArrayPrivate Index: VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h =================================================================== --- VTK-9.0.1.orig/Common/Core/vtkGenericDataArrayLookupHelper.h +++ VTK-9.0.1/Common/Core/vtkGenericDataArrayLookupHelper.h @@ -25,6 +25,7 @@ #include "vtkIdList.h" #include <algorithm> #include <cmath> +#include <limits> #include <unordered_map> #include <vector> Index: VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx =================================================================== --- VTK-9.0.1.orig/Common/DataModel/vtkPiecewiseFunction.cxx +++ VTK-9.0.1/Common/DataModel/vtkPiecewiseFunction.cxx @@ -22,6 +22,7 @@ #include <cassert> #include <cmath> #include <iterator> +#include <limits> #include <set> #include <vector> Index: VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx =================================================================== --- VTK-9.0.1.orig/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx +++ VTK-9.0.1/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx @@ -28,6 +28,7 @@ #include "vtkHyperTreeGridNonOrientedCursor.h" #include <cmath> +#include <limits> vtkStandardNewMacro(vtkHyperTreeGridThreshold); Index: VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx =================================================================== --- VTK-9.0.1.orig/Rendering/Core/vtkColorTransferFunction.cxx +++ VTK-9.0.1/Rendering/Core/vtkColorTransferFunction.cxx @@ -21,6 +21,7 @@ #include <algorithm> #include <cmath> #include <iterator> +#include <limits> #include <set> #include <vector>
