Hello community, here is the log from the commit of package vtk for openSUSE:Factory checked in at 2020-06-08 23:59:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vtk (Old) and /work/SRC/openSUSE:Factory/.vtk.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vtk" Mon Jun 8 23:59:37 2020 rev:47 rq:811182 version:9.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/vtk/vtk.changes 2020-05-01 11:11:47.739644212 +0200 +++ /work/SRC/openSUSE:Factory/.vtk.new.3606/vtk.changes 2020-06-09 00:03:27.713034739 +0200 @@ -1,0 +2,53 @@ +Sun May 31 20:28:03 UTC 2020 - Atri Bhattacharya <[email protected]> + +- Add vtk-qt-5.15-include-QPainterPath.patch: Include QPainterPath + to fix build failures against Qt 5.15; patch taken from + upstream, see + <https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6943>. +- The %%cmake macro sets CMAKE_SKIP_RPATH=ON for Leap 15.x which + causes build failures; set it to OFF and set + CMAKE_SKIP_INSTALL_RPATH=ON for openSUSE <= 1500. See + <https://discourse.vtk.org/t/building-fails-generating-wrap-hierarchy-for-vtk-commoncore-unable-to-open-libvtkwrappingtools-so-1>. +- Build without pegtl for distributions where pegtl > 2.0 is + unavailable (Leap 15.1). +- Disable java bindings for Leap 15.1 only where cmake still + searches for the javah binary (and setting it to %{_bindir}/true + seems to no longer work). +- Run ld post scripts for vtk-qt. + +------------------------------------------------------------------- +Fri May 8 13:33:26 UTC 2020 - Atri Bhattacharya <[email protected]> + +- Update to version 9.0.0 + * See https://discourse.vtk.org/t/vtk-9-0-0/3205. +- Rebase patches still required for building: + * bundled_exodusii_add_missing_libpthread.patch: Update to + upstream patch + (https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6865). + * bundled_libharu_add_missing_libm.patch +- Pass VTK_PYTHON_OPTIONAL_LINK:BOOL=OFF to cmake to link against + the system python library explicitly. +- Add vtk-parallelgeometry-dependency.patch to fix a missing + dependency for vtkparallelgeometry (see + https://discourse.vtk.org/t/building-vtk-9-0-fails-when-using-mpi-support/3227). +- Comment out 0001-Allow-compilation-on-GLES-platforms.patch that + no longer applies and needs extensive rebasing. +- Drop patches incorporated or otherwise fixed upstream: + * 0001-Make-code-calling-proj4-compatible-with-proj4-5.0-an.patch + * 0001-Add-libogg-to-IOMovie-target-link-libraries.patch + * python38.patch + * reproducible.patch +- Adapt to changes in upstream's cmake script: + * Replace old options by their newer versions where applicable. + * Pass VTK_USE_EXTERNAL=ON to use system libraries by default + except for gl2ps, haru, and pugixml. +- New BuildRequires: pegtl-devel and utfcpp-devel. +- No longer needed to pass + Java_JAVAH_EXECUTABLE:PATH=%{_bindir}/true to cmake; script does + not look for javah any more. +- Use autosetup to set up and patch sources: simplifies applying + changing list of patches; use an if guard to avoid patch needing + rebase while not running into conflict with factory bot. +- Use system gl2ps for openSUSE > 1500. + +------------------------------------------------------------------- Old: ---- 0001-Add-libogg-to-IOMovie-target-link-libraries.patch 0001-Make-code-calling-proj4-compatible-with-proj4-5.0-an.patch VTK-8.2.0.tar.gz python38.patch reproducible.patch New: ---- VTK-9.0.0.tar.gz vtk-parallelgeometry-dependency.patch vtk-qt-5.15-include-QPainterPath.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vtk.spec ++++++ --- /var/tmp/diff_new_pack.LVvW3m/_old 2020-06-09 00:03:29.809042176 +0200 +++ /var/tmp/diff_new_pack.LVvW3m/_new 2020-06-09 00:03:29.813042190 +0200 @@ -18,8 +18,6 @@ %global flavor @BUILD_FLAVOR@%{nil} -# FIXME: ENABLE EXAMPLES BY DEFAULT WHEN VERSION 9.0 IS PACKAGED -# [https://gitlab.kitware.com/vtk/vtk/issues/17619] %bcond_with examples %if 0%{?sle_version} >= 150200 @@ -31,17 +29,30 @@ %define pkgname vtk +# PUGIXML, GL2PS IN LEAPS ARE TOO OLD %if 0%{?suse_version} <= 1500 %bcond_with pugixml +%bcond_with gl2ps %else %bcond_without pugixml +%bcond_without gl2ps +%endif + +# PEGTL IN LEAP 15.1 IS TOO OLD (< 2.0.0) +# cmake STILL CHECKS FOR JAVAH (AND CHEATING WITH %{_bindir}/true NO LONGER WORKS) +%if 0%{?suse_version} == 1500 && 0%{?sle_version} == 150100 +%bcond_with java +%bcond_with pegtl +%else +%bcond_without java +%bcond_without pegtl %endif + # Need patched version with HPDF_SHADING %bcond_with haru -# Need unrelased version > 1.4.0 with e.g. gl2psTextOptColorBL -%bcond_with gl2ps %if "%{flavor}" == "" +%define my_suffix %{nil} %define my_prefix %_prefix %define my_bindir %_bindir %define my_libdir %_libdir @@ -88,9 +99,9 @@ %define shlib %{vtklib} Name: vtk%{?my_suffix} -Version: 8.2.0 +Version: 9.0.0 Release: 0 -%define series 8.2 +%define series 9.0 # This is a variant BSD license, a cross between BSD and ZLIB. # For all intents, it has the same rights and restrictions as BSD. # http://fedoraproject.org/wiki/Licensing/BSD#VTKBSDVariant @@ -102,20 +113,19 @@ # FIXME See if packaging can be tweaked to accommodate python-vtk's devel files in a devel package later # We need to use the compat conditionals here to avoid Factory's source validator from tripping up Source99: vtk-rpmlintrc +# PATCH-NEEDS-REBASE +%if 0 # PATCH-FIX-OPENSUSE 0001-Allow-compilation-on-GLES-platforms.patch VTK issue #17113 [email protected] -- Fix building with Qt GLES builds Patch2: 0001-Allow-compilation-on-GLES-platforms.patch -# PATCH-FIX-OPENSUSE bundled_libharu_add_missing_libm.patch [email protected] -- Add missing libm for linking +%endif +# PATCH-FIX-OPENSUSE bundled_libharu_add_missing_libm.patch [email protected] -- Add missing libm for linking (gh#libharu/libharu#213) Patch3: bundled_libharu_add_missing_libm.patch -# PATCH-FIX-OPENSUSE bundled_exodusii_add_missing_libpthread.patch [email protected] -- Add missing libm for linking +# PATCH-FIX-UPSTREAM bundled_exodusii_add_missing_libpthread.patch [email protected] -- Add missing libm for linking (updated to upstream patch by badshah400, see https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6865) Patch4: bundled_exodusii_add_missing_libpthread.patch -# PATCH-FIX-OPENSUSE -- Missing libogg symbols -Patch5: 0001-Add-libogg-to-IOMovie-target-link-libraries.patch -# PATCH-FIX-UPSTREAM -- Compatibility for proj4 5.x and 6.0, https://gitlab.kitware.com/vtk/vtk/issues/17554 -Patch6: 0001-Make-code-calling-proj4-compatible-with-proj4-5.0-an.patch -# PATCH-FIX-UPSTREAM -- Support for python3.8 -Patch7: python38.patch -# PATCH-FIX-UPSTREAM https://gitlab.kitware.com/vtk/vtk/merge_requests/5633 + 5634 -Patch8: reproducible.patch +# PATCH-FIX-UPSTREAM vtk-parallelgeometry-dependency.patch [email protected] -- Fix a mistake in the dependencies for ParallelGeometry causing build failures for MPI builds +Patch5: vtk-parallelgeometry-dependency.patch +# PATCH-FIX-UPSTREAM vtk-qt-5.15-include-QPainterPath.patch [email protected] -- Include QPainterPath to fix build failures against Qt 5.15; patch taken from upstream, see https://gitlab.kitware.com/vtk/vtk/-/merge_requests/6943 +Patch6: vtk-qt-5.15-include-QPainterPath.patch BuildRequires: R-base-devel BuildRequires: chrpath BuildRequires: cmake >= 3.4 @@ -123,37 +133,19 @@ BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ -%if %{with gl2ps} -BuildRequires: gl2ps-devel > 1.4.0 -%endif BuildRequires: gnuplot BuildRequires: graphviz -%if %{with mpi} -BuildRequires: hdf5-%{mpi_flavor}-devel -%endif BuildRequires: hdf5-devel -BuildRequires: java-devel BuildRequires: libboost_graph-devel BuildRequires: libboost_graph_parallel-devel BuildRequires: libboost_serialization-devel -%if %{with mpi} -BuildRequires: libboost_mpi-devel -%endif -%if %{with haru} -BuildRequires: libharu-devel > 2.3.0 -%endif BuildRequires: libjpeg-devel BuildRequires: libmysqlclient-devel BuildRequires: libtiff-devel -%if %{with mpi} -BuildRequires: %{mpi_flavor}-devel -%endif BuildRequires: python3-devel -%if %{with mpi} -BuildRequires: python3-mpi4py-devel -%endif BuildRequires: python3-numpy-devel BuildRequires: python3-qt5-devel +BuildRequires: utfcpp-devel BuildRequires: wget BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5OpenGL) @@ -177,19 +169,35 @@ BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(netcdf) -%if %{with mpi} -BuildRequires: netcdf-%{mpi_flavor}-devel -%endif BuildRequires: pkgconfig(proj) >= 5.0.0 -%if %{with pugixml} -BuildRequires: pkgconfig(pugixml) -%endif BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(theora) # Still required with 8.2.x for PythonTkInter BuildRequires: pkgconfig(tk) BuildRequires: pkgconfig(xt) BuildRequires: pkgconfig(zlib) +%if %{with gl2ps} +BuildRequires: gl2ps-devel > 1.4.0 +%endif +%if %{with haru} +BuildRequires: libharu-devel > 2.3.0 +%endif +%if %{with java} +BuildRequires: java-devel +%endif +%if %{with mpi} +BuildRequires: %{mpi_flavor}-devel +BuildRequires: hdf5-%{mpi_flavor}-devel +BuildRequires: libboost_mpi-devel +BuildRequires: netcdf-%{mpi_flavor}-devel +BuildRequires: python3-mpi4py-devel +%endif +%if %{with pugixml} +BuildRequires: pkgconfig(pugixml) +%endif +%if %{with pegtl} +BuildRequires: pegtl-devel >= 2.0.0 +%endif %description VTK is a software system for image processing, 3D graphics, volume @@ -232,6 +240,7 @@ Requires: libtiff-devel Requires: python3-%{name} = %{version} Requires: python3-%{name} = %{version} +Requires: utfcpp-devel %{?with_mpi:Requires: %{mpi_flavor}} %{?with_mpi:Requires: %{mpi_flavor}-devel} Requires: pkgconfig(Qt5Core) @@ -256,6 +265,9 @@ Requires: pkgconfig(netcdf) Requires: pkgconfig(theora) Requires: pkgconfig(zlib) +%if %{with pegtl} +Requires: pegtl-devel +%endif Conflicts: vtk-compat_gl-devel %description devel @@ -351,14 +363,7 @@ %endif %prep -%setup -q -n VTK-%{version} -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 +%autosetup -p1 -n VTK-%{version} # Replace relative path ../../../../VTKData with %%{_datadir}/vtkdata # otherwise it will break on symlinks. @@ -378,58 +383,50 @@ export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" -# FindJava.cmake looks for javah executable. However, -# the build never invokes the tool. Define a bogus -# Java_JAVAH_EXECUTABLE in order to be able to build -# with JDK10 that does not have this tool, deprecated -# since JDK8. +# THE %%cmake MACRO SETS CMAKE_SKIP_RPATH=ON FOR LEAP 15.x WHICH CAUSES BUILD FAILURES +# https://discourse.vtk.org/t/building-fails-generating-wrap-hierarchy-for-vtk-commoncore-unable-to-open-libvtkwrappingtools-so-1 %cmake \ - -DBUILD_DOCUMENTATION:BOOL=ON \ - -DBUILD_EXAMPLES:BOOL=%{?with_examples:ON}%{!?with_examples:OFF} \ - -DBUILD_TESTING:BOOL=OFF \ + -DCMAKE_INSTALL_PREFIX:PATH=%{my_prefix} \ + -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \ + -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name}-%{series} \ + -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib} \ + -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/%{pkgname} \ + -DVTK_PYTHON_OPTIONAL_LINK:BOOL=OFF \ + -DVTK_BUILD_TESTING:BOOL=ON \ -DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON \ - -DJava_JAVAH_EXECUTABLE:PATH=%{_bindir}/true \ - -DModule_vtkTestingCore:BOOL=ON \ - -DModule_vtkTestingRendering:BOOL=ON \ +%if 0%{?suse_version} <= 1500 + -DCMAKE_SKIP_RPATH:BOOL=OFF \ + -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \ +%endif + -DVTK_MODULE_ENABLE_VTK_TestingCore=WANT \ + -DVTK_MODULE_ENABLE_VTK_TestingRendering=WANT \ -DOpenGL_GL_PREFERENCE:STRING='GLVND' \ -DVTK_CUSTOM_LIBRARY_SUFFIX="" \ - -DVTK_Group_Imaging:BOOL=ON \ + -DVTK_GROUP_ENABLE_Imaging=WANT \ %if %{with mpi} - -DVTK_Group_MPI:BOOL=ON \ + -DVTK_USE_MPI:BOOL=ON \ + -DVTK_GROUP_ENABLE_MPI=WANT \ %else - -DVTK_Group_MPI:BOOL=OFF \ + -DVTK_USE_MPI:BOOL=OFF \ %endif - -DVTK_Group_Qt:BOOL=ON \ - -DVTK_Group_Rendering:BOOL=ON \ - -DVTK_Group_StandAlone:BOOL=ON \ - -DVTK_Group_Tk:BOOL=ON \ - -DVTK_Group_Views:BOOL=ON \ - -DCMAKE_INSTALL_PREFIX:PATH=%{my_prefix} \ - -DVTK_INSTALL_ARCHIVE_DIR:PATH=%{_lib} \ - -DVTK_INSTALL_LIBRARY_DIR:PATH=%{_lib} \ - -DVTK_INSTALL_PACKAGE_DIR:PATH=%{_lib}/cmake/%{pkgname} \ - -DVTK_INSTALL_QT_DIR:STRING=%{_lib}/qt5/plugins/designer \ + -DVTK_GROUP_ENABLE_Qt=WANT \ + -DVTK_GROUP_ENABLE_Rendering=WANT \ + -DVTK_GROUP_ENABLE_StandAlone=WANT \ + -DVTK_GROUP_ENABLE_Views=WANT \ -DVTK_PYTHON_VERSION=3 \ - -DVTK_QT_VERSION=5 \ -DVTK_USE_OGGTHEORA_ENCODER:BOOL=ON \ - -DVTK_USE_SYSTEM_LIBRARIES:BOOL=ON \ - -DVTK_USE_SYSTEM_DIY2=OFF \ - -DVTK_USE_SYSTEM_GL2PS:BOOL=%{?with_gl2ps:ON}%{!?with_gl2ps:OFF} \ - -DVTK_USE_SYSTEM_LIBHARU:BOOL=%{?with_haru:ON}%{!?with_haru:OFF} \ - -DVTK_USE_SYSTEM_LIBPROJ:BOOL=ON \ - -DVTK_USE_SYSTEM_HDF5:BOOL=ON \ - -DVTK_USE_SYSTEM_MPI4PY=ON \ - -DVTK_USE_SYSTEM_NETCDF:BOOL=ON \ - -DVTK_USE_SYSTEM_PUGIXML:BOOL=%{?with_pugixml:ON}%{!?with_pugixml:OFF} \ - -DVTK_WRAP_JAVA:BOOL=ON \ + -DVTK_WRAP_JAVA:BOOL=%{?with_java:ON}%{!?with_java:OFF} \ -DVTK_WRAP_PYTHON:BOOL=ON \ - -DVTK_WRAP_PYTHON_SIP:BOOL=ON \ + -DVTK_USE_EXTERNAL:BOOL=ON \ + -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps=%{?with_gl2ps:ON}%{!?with_gl2ps:OFF} \ + -DVTK_MODULE_USE_EXTERNAL_VTK_libharu=%{?with_haru:ON}%{!?with_haru:OFF} \ + -DVTK_MODULE_USE_EXTERNAL_VTK_pugixml=%{?with_pugixml:ON}%{!?with_pugixml:OFF} \ + -DVTK_MODULE_ENABLE_VTK_pegtl=%{?with_pegtl:YES}%{!?with_pegtl:NO} \ -DVTK_INSTALL_DOC_DIR:PATH=%{_docdir}/%{name}-%{series} #-DVTK_EXTERNAL_LIBHARU_IS_SHARED:BOOL=OFF \ -%make_jobs -make %{?_smp_mflags} DoxygenDoc +%cmake_build # Remove executable bits from sources (some of which are generated) find . -name \*.c -o -name \*.cxx -o -name \*.h -o -name \*.hxx -o -name \*.gif -exec chmod -x "{}" "+" @@ -491,6 +488,10 @@ %endif +# MOVE LICENSES TO PROPER DOCDIR INSTEAD OF %%{my_datadir}/licenses +mkdir -p %{buildroot}%{_datadir}/licenses/%{name} +mv %{buildroot}%{my_datadir}/licenses/VTK/* %{buildroot}%{_datadir}/licenses/%{name}/ + %fdupes -s %{buildroot} %check @@ -507,47 +508,52 @@ %post -n %{shlib} -p /sbin/ldconfig %postun -n %{shlib} -p /sbin/ldconfig +%if %{with java} %post java -p /sbin/ldconfig %postun java -p /sbin/ldconfig +%endif +%post qt -p /sbin/ldconfig +%postun qt -p /sbin/ldconfig %post -n python3-%{name} -p /sbin/ldconfig %postun -n python3-%{name} -p /sbin/ldconfig %files -n %{shlib} %license Copyright.txt %{my_libdir}/lib*.so.* +%exclude %{my_libdir}/libvtk*Qt*.so.* %exclude %{my_libdir}/libvtk*Java.so.1 -%exclude %{my_libdir}/libvtk*Python3*.so.1 -%exclude %{my_libdir}/libvtkFiltersPython.so.1 -%exclude %{my_libdir}/libvtkPythonContext2D.so.1 +%exclude %{my_libdir}/libvtk*Python*.so.1 %files devel %license Copyright.txt -#%%{my_bindir}/%%{pkgname}EncodeString -#%%{my_bindir}/%%{pkgname}HashSource +%license %{_datadir}/licenses/%{name}/ +%{my_bindir}/vtkProbeOpenGLVersion %{my_bindir}/%{pkgname}ParseJava %{my_bindir}/%{pkgname}WrapHierarchy %{my_bindir}/%{pkgname}WrapJava %{my_bindir}/%{pkgname}WrapPython %{my_bindir}/%{pkgname}WrapPythonInit %{my_libdir}/*.so +%{my_libdir}/vtk/ %{?with_mpi: %dir %{my_libdir}/cmake/} -%{my_libdir}/cmake/%{pkgname}/ -%{my_libdir}/libvtkWrappingTools.a +%{my_libdir}/cmake/%{pkgname}-%{series}/ %{my_incdir}/%{pkgname}-%{series}/ -# VTK JNI, PythonTkinter +# VTK JNI, PythonTkinter, QtGUI %exclude %{my_libdir}/libvtk*Java.so -%exclude %{my_libdir}/libvtk*Python3*.so -%exclude %{my_libdir}/libvtkRenderingPythonTkWidgets*.so +%exclude %{my_libdir}/libvtk*Python*.so +%exclude %{my_libdir}/libvtk*Qt*.so %files devel-doc %license Copyright.txt %{_docdir}/%{name}-%{series} +%if %{with java} %files java %license Copyright.txt -%{my_libdir}/%{pkgname}.jar %{my_libdir}/libvtk*Java.so %{my_libdir}/libvtk*Java.so.1 +%{my_libdir}/java/ +%endif %files -n python3-%{name} %license Copyright.txt @@ -558,17 +564,13 @@ %else %{python3_sitearch}/ %endif -%{my_libdir}/libvtk*Python3*.so.1 -%{my_libdir}/libvtkFiltersPython.so.1 -%{my_libdir}/libvtkPythonContext2D.so.1 -%{my_libdir}/libvtkRenderingPythonTkWidgets*.so +%{my_libdir}/libvtk*Python*.so.1 +%{my_libdir}/libvtk*Python*.so %files qt %license Copyright.txt -%{?with_mpi: %dir %{my_libdir}/qt5/} -%{?with_mpi: %dir %{my_libdir}/qt5/plugins/} -%dir %{my_libdir}/qt5/plugins/designer/ -%{my_libdir}/qt5/plugins/designer/libQVTKWidgetPlugin.so +%{my_libdir}/libvtk*Qt*.so.* +%{my_libdir}/libvtk*Qt*.so %if %{with examples} %if "%{flavor}" == "" ++++++ VTK-8.2.0.tar.gz -> VTK-9.0.0.tar.gz ++++++ /work/SRC/openSUSE:Factory/vtk/VTK-8.2.0.tar.gz /work/SRC/openSUSE:Factory/.vtk.new.3606/VTK-9.0.0.tar.gz differ: char 5, line 1 ++++++ bundled_exodusii_add_missing_libpthread.patch ++++++ --- /var/tmp/diff_new_pack.LVvW3m/_old 2020-06-09 00:03:29.873042403 +0200 +++ /var/tmp/diff_new_pack.LVvW3m/_new 2020-06-09 00:03:29.873042403 +0200 @@ -1,14 +1,63 @@ ---- VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt_orig 2019-02-14 23:22:45.209934041 +0100 -+++ VTK-8.2.0/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt 2019-02-14 23:23:32.793799582 +0100 -@@ -297,8 +297,10 @@ +From ca02bcc844e4d268ac5060f56f10467e2579fb43 Mon Sep 17 00:00:00 2001 +From: Ben Boeckel <[email protected]> +Date: Thu, 7 May 2020 11:36:50 -0400 +Subject: [PATCH 1/3] exodusII: also link to hdf5 directly + +--- + ThirdParty/exodusII/vtk.module | 1 + + 1 file changed, 1 insertion(+) + +Index: VTK-9.0.0/ThirdParty/exodusII/vtk.module +=================================================================== +--- VTK-9.0.0.orig/ThirdParty/exodusII/vtk.module ++++ VTK-9.0.0/ThirdParty/exodusII/vtk.module +@@ -3,5 +3,6 @@ NAME + LIBRARY_NAME + vtkexodusII + DEPENDS ++ VTK::hdf5 + VTK::netcdf + THIRD_PARTY + +From a98772f6d5f6b62c0f3ac360702b585c09bc5557 Mon Sep 17 00:00:00 2001 +From: Seacas Upstream <[email protected]> +Date: Thu, 7 May 2020 12:22:01 -0400 +Subject: [PATCH 3/3] exodusII 2020-05-07 (2c24a120) + +Code extracted from: + + https://gitlab.kitware.com/third-party/seacas.git + +at commit 2c24a120deb77a8a2ea05462d0a60e7f9d90e58e (for/vtk-20200507-7.24f-v2019-12-18). +--- + ThirdParty/exodusII/vtkexodusII/CMakeLists.txt | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt b/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt +index 025abc43e0..d931004997 100644 +--- a/ThirdParty/exodusII/vtkexodusII/CMakeLists.txt ++++ b/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_add_library(vtkexodusII ${sources} ${headers}) -+vtk_add_library(vtkexodusII ${sources} ${headers}) -+set_property(TARGET vtkexodusII PROPERTY POSITION_INDEPENDENT_CODE ON) - target_link_libraries(vtkexodusII PUBLIC ${vtknetcdf_LIBRARIES}) -+target_link_libraries(vtkexodusII PUBLIC pthread) - if (NOT VTK_INSTALL_NO_DEVELOPMENT) - install(FILES - ${headers} ++vtk_module_find_package(PACKAGE Threads) ++ + vtk_module_add_module(VTK::exodusII + SOURCES ${sources} + HEADERS ${headers} + HEADERS_SUBDIR "vtkexodusII/include") +-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) +-- +2.26.2 ++++++ bundled_libharu_add_missing_libm.patch ++++++ --- /var/tmp/diff_new_pack.LVvW3m/_old 2020-06-09 00:03:29.881042431 +0200 +++ /var/tmp/diff_new_pack.LVvW3m/_new 2020-06-09 00:03:29.885042445 +0200 @@ -1,14 +1,13 @@ ---- VTK-8.2.0/ThirdParty/libharu/vtklibharu/src/CMakeLists.txt_orig 2019-02-14 22:43:46.723537248 +0100 -+++ VTK-8.2.0/ThirdParty/libharu/vtklibharu/src/CMakeLists.txt 2019-02-14 22:45:37.203271692 +0100 -@@ -101,8 +101,10 @@ - ) - endif(LIBHPDF_SHARED) - else () -- vtk_add_library(vtklibharu ${LIBHPDF_SRCS}) -+ vtk_add_library(vtklibharu ${LIBHPDF_SRCS}) -+ set_property(TARGET vtklibharu PROPERTY POSITION_INDEPENDENT_CODE ON) - target_link_libraries(vtklibharu PRIVATE ${vtkzlib_LIBRARIES} ${vtkpng_LIBRARIES}) -+ target_link_libraries(vtklibharu PUBLIC m) - if (WIN32) - set_target_properties(vtklibharu - PROPERTIES +Index: VTK-9.0.0/ThirdParty/libharu/vtklibharu/CMakeLists.txt +=================================================================== +--- VTK-9.0.0.orig/ThirdParty/libharu/vtklibharu/CMakeLists.txt ++++ VTK-9.0.0/ThirdParty/libharu/vtklibharu/CMakeLists.txt +@@ -125,6 +125,8 @@ if(PNG_FOUND) + endif(PNG_FOUND) + endif () + ++link_libraries(m) ++ + # ======================================================================= + # configure header files, add compiler flags + # ======================================================================= ++++++ vtk-parallelgeometry-dependency.patch ++++++ Index: VTK-9.0.0/Filters/ParallelGeometry/vtk.module =================================================================== --- VTK-9.0.0.orig/Filters/ParallelGeometry/vtk.module +++ VTK-9.0.0/Filters/ParallelGeometry/vtk.module @@ -12,6 +12,7 @@ DEPENDS VTK::CommonCore VTK::CommonSystem VTK::CommonExecutionModel + VTK::FiltersCore VTK::FiltersGeometry VTK::FiltersParallel VTK::ParallelMPI ++++++ vtk-qt-5.15-include-QPainterPath.patch ++++++ >From 797f28697d5ba50c1fa2bc5596af626a3c277826 Mon Sep 17 00:00:00 2001 From: "Andrew J. P. Maclean" <[email protected]> Date: Wed, 27 May 2020 15:27:15 +1000 Subject: [PATCH] Qt 5.15 needs the include file QPainterPath --- Rendering/Qt/vtkQtLabelRenderStrategy.cxx | 1 + Rendering/Qt/vtkQtStringToImage.cxx | 1 + 2 files changed, 2 insertions(+) diff --git a/Rendering/Qt/vtkQtLabelRenderStrategy.cxx b/Rendering/Qt/vtkQtLabelRenderStrategy.cxx index afda585cca..eca65c64cd 100644 --- a/Rendering/Qt/vtkQtLabelRenderStrategy.cxx +++ b/Rendering/Qt/vtkQtLabelRenderStrategy.cxx @@ -41,6 +41,7 @@ #include <QImage> #include <QMap> #include <QPainter> +#include <QPainterPath> #include <QPair> #include <QPixmap> #include <QTextDocument> diff --git a/Rendering/Qt/vtkQtStringToImage.cxx b/Rendering/Qt/vtkQtStringToImage.cxx index 659c71570e..fbb9b78f05 100644 --- a/Rendering/Qt/vtkQtStringToImage.cxx +++ b/Rendering/Qt/vtkQtStringToImage.cxx @@ -30,6 +30,7 @@ #include <QFontMetrics> #include <QImage> #include <QPainter> +#include <QPainterPath> #include <QPixmap> #include <QString> #include <QTextDocument> -- 2.26.2
