From: Jan Palus Date: Thu, 6 Aug 2020 22:27:27 +0000 (+0200) Subject: force use of system installed pugixml X-Git-Tag: auto/th/vtk-8.2.0-1~5 X-Git-Url: http://git.pld-linux.org/?p=packages%2Fvtk.git;a=commitdiff_plain;h=aa6a95e force use of system installed pugixml --- diff --git a/system-pugixml.patch b/system-pugixml.patch new file mode 100644 index 0000000..a48e59b --- /dev/null +++ b/system-pugixml.patch @@ -0,0 +1,14 @@ +--- VTK-8.2.0/ThirdParty/pugixml/CMakeLists.txt.orig 2020-08-07 00:25:58.603999094 +0200 ++++ VTK-8.2.0/ThirdParty/pugixml/CMakeLists.txt 2020-08-07 00:26:12.843915244 +0200 +@@ -1,10 +1 @@ +-vtk_module_third_party(pugixml +- LIBRARIES vtkpugixml +- INCLUDE_DIRS ${vtkpugixml_SOURCE_DIR}/vtkpugixml +- ${vtkpugixml_BINARY_DIR}/vtkpugixml +- NO_ADD_SUBDIRECTORY) +- +-vtk_module_export_info() +-add_subdirectory(vtkpugixml) +- +-vtk_target_export(vtkpugixml) ++vtk_module_third_party(pugixml) diff --git a/vtk.spec b/vtk.spec index 4195ebd..2f2da7d 100644 --- a/vtk.spec +++ b/vtk.spec @@ -31,6 +31,7 @@ Patch2: proj6_compat.patch Patch3: qt-5.15.patch Patch4: python-3.8.patch Patch5: link.patch +Patch6: system-pugixml.patch URL: http://www.vtk.org/ %{?with_OSMesa:BuildRequires: Mesa-libOSMesa-devel} BuildRequires: OpenGL-GLX-devel @@ -309,6 +310,7 @@ potrzebne do uruchamiania różnych przykładów z pakietu vtk-examples. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 # Replace relative path ../../../VTKData with destination filesystem path grep -Erl '(\.\./)+VTKData' Examples | xargs \