Merge pull request #1057 from julien-tierny/patch

[pv513] Final patchset fix
topology-tool-kit · Sep 12, 2024 · f5c6044 · f5c6044
2 parents 827c678 + bee3ba9
commit f5c6044
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/paraview/patch/paraview-5.13.0-vtkPVFileInformation.cxx.patch b/paraview/patch/paraview-5.13.0-vtkPVFileInformation.cxx.patch
@@ -0,0 +1,13 @@
+--- a/Remoting/Core/vtkPVFileInformation.cxx	2018-04-06 22:03:33.000000000 +0200
++++ b/Remoting/Core/vtkPVFileInformation.cxx	2018-05-20 07:11:10.114020235 +0200
+@@ -1226,6 +1222,11 @@
+     resource_dir = vtksys::SystemTools::CollapseFullPath(resource_dir);
+   }
+
++  vtkProcessModule* pm = vtkProcessModule::GetProcessModule();
++
++  if((pm)&&(prefixes.size()))
++    resource_dir = pm->GetSelfDir() + "/../" + prefixes[0];
++
+   return resource_dir;
+ }
diff --git a/paraview/patch/patch-paraview-5.13.0.sh b/paraview/patch/patch-paraview-5.13.0.sh
@@ -74,9 +74,8 @@ mkdir -p TTK/Data/
 cp ${PATCH_DIR}/data/* TTK/Data/
 cp TTK/Data/*pvsm Qt/ApplicationComponents/Resources/ExampleVisualizations/
 cp TTK/Data/*png Qt/ApplicationComponents/Resources/Thumbnails/
-# the patch below makes the build fail under macos-14...
-#$PATCH_BIN Remoting/Core/vtkPVFileInformation.cxx \
-#  < "${PATCH_DIR}/paraview-5.8.0-vtkPVFileInformation.cxx.patch"
+$PATCH_BIN Remoting/Core/vtkPVFileInformation.cxx \
+  < "${PATCH_DIR}/paraview-5.13.0-vtkPVFileInformation.cxx.patch"
 $PATCH_BIN Qt/ApplicationComponents/Resources/UI/pqExampleVisualizationsDialog.ui \
   < "${PATCH_DIR}/paraview-5.13.0-ApplicationComponents.patch"
 $PATCH_BIN Qt/ApplicationComponents/pqExampleVisualizationsDialog.cxx \