diff options
| -rw-r--r-- | 0001-fix-tao-pegtl-contrib-tracer.hpp-No-such-file-or-dir.patch | 44 | ||||
| -rw-r--r-- | vtk.spec | 3 |
2 files changed, 1 insertions, 46 deletions
diff --git a/0001-fix-tao-pegtl-contrib-tracer.hpp-No-such-file-or-dir.patch b/0001-fix-tao-pegtl-contrib-tracer.hpp-No-such-file-or-dir.patch deleted file mode 100644 index f48302b..0000000 --- a/0001-fix-tao-pegtl-contrib-tracer.hpp-No-such-file-or-dir.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/IO/MotionFX/vtkMotionFXCFGGrammar.h b/IO/MotionFX/vtkMotionFXCFGGrammar.h -index e58eeb80..67bc5d88 100644 ---- a/IO/MotionFX/vtkMotionFXCFGGrammar.h -+++ b/IO/MotionFX/vtkMotionFXCFGGrammar.h -@@ -11,7 +11,7 @@ - - // for debugging - // clang-format off --#include VTK_PEGTL(pegtl/contrib/tracer.hpp) -+#include VTK_PEGTL(pegtl/contrib/trace.hpp) - // clang-format on - - namespace MotionFX -diff --git a/IO/MotionFX/vtkMotionFXCFGReader.cxx b/IO/MotionFX/vtkMotionFXCFGReader.cxx -index 9cbf553c..7417a418 100644 ---- a/IO/MotionFX/vtkMotionFXCFGReader.cxx -+++ b/IO/MotionFX/vtkMotionFXCFGReader.cxx -@@ -1210,7 +1210,7 @@ bool PositionFileMotion::read_position_file(const std::string& rootDir) const - } - return true; - } -- catch (const tao::pegtl::input_error& e) -+ catch (const tao::pegtl::parse_error& e) - { - vtkGenericWarningMacro("PositionFileMotion::read_position_file failed: " << e.what()); - } -@@ -1229,7 +1229,7 @@ bool UniversalTransformMotion::read_universaltransform_file(const std::string& r - in, numbers, this->transforms); - return true; - } -- catch (const tao::pegtl::input_error& e) -+ catch (const tao::pegtl::parse_error& e) - { - vtkGenericWarningMacro( - "UniversalTransformMotion::read_universaltransform_file failed: " << e.what()); -@@ -1266,7 +1266,7 @@ public: - if (getenv("MOTIONFX_DEBUG_GRAMMAR") != nullptr) - { - tao::pegtl::read_input<> in2(filename); -- tao::pegtl::parse<MotionFX::CFG::Grammar, tao::pegtl::nothing, tao::pegtl::tracer>(in2); -+ tao::pegtl::complete_trace<MotionFX::CFG::Grammar>(in2); - } - return false; - } @@ -26,8 +26,6 @@ Source100: https://www.vtk.org/files/release/9.1/VTKData-%{version}.tar.gz_00 Source101: https://www.vtk.org/files/release/9.1/VTKData-%{version}.tar.gz_01 Source102: https://www.vtk.org/files/release/9.1/VTKData-%{version}.tar.gz_02 -Patch01: 0001-fix-tao-pegtl-contrib-tracer.hpp-No-such-file-or-dir.patch - URL: https://vtk.org/ BuildRequires: cmake @@ -501,6 +499,7 @@ export JAVA_HOME=/usr/lib/jvm/java %endif \ -DVTK_MODULE_USE_EXTERNAL_VTK_exprtk:BOOL=OFF \\\ -DVTK_MODULE_USE_EXTERNAL_VTK_ioss:BOOL=OFF \\\ + -DVTK_MODULE_USE_EXTERNAL_VTK_pegtl:BOOL=OFF \\\ -DVTK_USE_TK=ON \\\ %{?with_flexiblas:-DBLA_VENDOR=FlexiBLAS} # https://gitlab.kitware.com/cmake/cmake/issues/17223 |