diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index c840950140c3d..491cfe1f4b196 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { hash = "sha256-Zlb6UCP4aFZOJJNhFQBBrwzst+f37gs1zaCBMTOUgZE="; }; + # slight reformatting from https://raw.githubusercontent.com/nilason/macports-ports/7de732656c10e31530622f405f916ba34d7677b3/science/gdcm/files/patch-vtk-930.diff: + patches = [ ./vtk-9.3.0.patch ]; + cmakeFlags = [ "-DGDCM_BUILD_APPLICATIONS=ON" "-DGDCM_BUILD_SHARED_LIBS=ON" diff --git a/pkgs/development/libraries/gdcm/vtk-9.3.0.patch b/pkgs/development/libraries/gdcm/vtk-9.3.0.patch new file mode 100644 index 0000000000000..59f1b12d97eb1 --- /dev/null +++ b/pkgs/development/libraries/gdcm/vtk-9.3.0.patch @@ -0,0 +1,91 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -698,6 +698,7 @@ + HEADERS_DESTINATION "${GDCM_INSTALL_INCLUDE_DIR}/vtk${vtk_version_suffix}" + CMAKE_DESTINATION "${GDCM_INSTALL_PACKAGE_DIR}" + LICENSE_DESTINATION "${GDCM_INSTALL_DATA_DIR}/vtkgdcm-${GDCM_SHORT_VERSION}" ++ SPDX_DESTINATION "${GDCM_INSTALL_DATA_DIR}/vtkgdcm-${GDCM_SHORT_VERSION}" + HIERARCHY_DESTINATION "${GDCM_INSTALL_LIB_DIR}/vtk${vtk_version_suffix}/hierarchy/vtkgdcm" + LIBRARY_NAME_SUFFIX "${vtkgdcm_library_suffix}" + VERSION "${GDCM_VERSION}" + + +--- a/Utilities/VTK/vtkImageColorViewer.h ++++ b/Utilities/VTK/vtkImageColorViewer.h +@@ -199,22 +199,6 @@ + virtual int GetOffScreenRendering(); + vtkBooleanMacro(OffScreenRendering,int); + +- // Description: +- // @deprecated Replaced by vtkImageColorViewer::GetSliceMin() as of VTK 5.0. +- VTK_LEGACY(int GetWholeZMin()); +- +- // Description: +- // @deprecated Replaced by vtkImageColorViewer::GetSliceMax() as of VTK 5.0. +- VTK_LEGACY(int GetWholeZMax()); +- +- // Description: +- // @deprecated Replaced by vtkImageColorViewer::GetSlice() as of VTK 5.0. +- VTK_LEGACY(int GetZSlice()); +- +- // Description: +- // @deprecated Replaced by vtkImageColorViewer::SetSlice() as of VTK 5.0. +- VTK_LEGACY(void SetZSlice(int)); +- + protected: + vtkImageColorViewer(); + ~vtkImageColorViewer(); + + + +--- a/Utilities/VTK/vtkImageColorViewer.cxx ++++ b/Utilities/VTK/vtkImageColorViewer.cxx +@@ -919,34 +919,6 @@ + } + + //---------------------------------------------------------------------------- +-#ifndef VTK_LEGACY_REMOVE +-int vtkImageColorViewer::GetWholeZMin() +-{ +- VTK_LEGACY_REPLACED_BODY(vtkImageColorViewer::GetWholeZMin, "VTK 5.0", +- vtkImageColorViewer::GetSliceMin); +- return this->GetSliceMin(); +-} +-int vtkImageColorViewer::GetWholeZMax() +-{ +- VTK_LEGACY_REPLACED_BODY(vtkImageColorViewer::GetWholeZMax, "VTK 5.0", +- vtkImageColorViewer::GetSliceMax); +- return this->GetSliceMax(); +-} +-int vtkImageColorViewer::GetZSlice() +-{ +- VTK_LEGACY_REPLACED_BODY(vtkImageColorViewer::GetZSlice, "VTK 5.0", +- vtkImageColorViewer::GetSlice); +- return this->GetSlice(); +-} +-void vtkImageColorViewer::SetZSlice(int s) +-{ +- VTK_LEGACY_REPLACED_BODY(vtkImageColorViewer::SetZSlice, "VTK 5.0", +- vtkImageColorViewer::SetSlice); +- this->SetSlice(s); +-} +-#endif +- +-//---------------------------------------------------------------------------- + void vtkImageColorViewer::PrintSelf(ostream& os, vtkIndent indent) + { + this->Superclass::PrintSelf(os, indent); + + + +--- a/Utilities/VTK/vtkGDCMTesting.cxx ++++ b/Utilities/VTK/vtkGDCMTesting.cxx +@@ -14,7 +14,6 @@ + #include "vtkGDCMTesting.h" + + #include "vtkObjectFactory.h" +-#include "vtkToolkits.h" + #include "gdcmTesting.h" + #include "gdcmFilename.h" + + diff --git a/pkgs/development/libraries/vtk/9.x.nix b/pkgs/development/libraries/vtk/9.x.nix index 3734c20f0e055..bfad6a219dc27 100644 --- a/pkgs/development/libraries/vtk/9.x.nix +++ b/pkgs/development/libraries/vtk/9.x.nix @@ -1,5 +1,5 @@ import ./generic.nix { - majorVersion = "9.2"; - minorVersion = "6"; - sourceSha256 = "sha256-BvyNScTlb0mMQPyzilY+2NTsMTWNAQHomI8LtNU53RI="; + majorVersion = "9.3"; + minorVersion = "1"; + sourceSha256 = "sha256-g1TsCE6g0tw9I9vkJDgjxL/CcDgtDOjWWJOf1QBhyrg="; }