Hi, I've prepared a fixed version in Ubuntu and Graham uploaded it. There is another issue than this SPDX one.
I'm attaching the patch and won't paraphrase it. -- Adrien
diff --git a/debian/changelog b/debian/changelog index d155039..da50cb1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +gdcm (3.0.24-1ubuntu1) oracular; urgency=medium + + * VTK 9.3 compatibility (LP: #2069612): + - d/p/vtk-9.3-compat.patch + - d/p/cmake-include-gnuinstalldirs.patch: include(GNUInstallDirs) in + order to define CMAKE_INSTALLDIR_INCLUDE + - install usr/include/vtkgdcmpython.h + + -- Adrien Nader <adrien.na...@canonical.com> Fri, 14 Jun 2024 17:04:24 +0200 + gdcm (3.0.24-1build1) oracular; urgency=medium * Rebuild against new libvtk9.3. diff --git a/debian/control b/debian/control index 648e47f..56a43dc 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,6 @@ Source: gdcm -Maintainer: Debian Med Packaging Team <debian-med-packag...@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Med Packaging Team <debian-med-packag...@lists.alioth.debian.org> Uploaders: Steve M. Robbins <s...@debian.org>, Sébastien Jodogne <s.jodo...@gmail.com>, Gert Wollny <g...@debian.org> diff --git a/debian/control.in b/debian/control.in index 5f7b1f0..77a795d 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,5 +1,6 @@ Source: gdcm -Maintainer: Debian Med Packaging Team <debian-med-packag...@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Med Packaging Team <debian-med-packag...@lists.alioth.debian.org> Uploaders: Steve M. Robbins <s...@debian.org>, Sébastien Jodogne <s.jodo...@gmail.com>, Gert Wollny <g...@debian.org> diff --git a/debian/patches/cmake-include-gnuinstalldirs.patch b/debian/patches/cmake-include-gnuinstalldirs.patch new file mode 100644 index 0000000..2163cb0 --- /dev/null +++ b/debian/patches/cmake-include-gnuinstalldirs.patch @@ -0,0 +1,19 @@ +Subject: Use default "GNU" installation directories +Author: Adrien Nader +Forwarded: https://sourceforge.net/p/gdcm/bugs/563/ +Last-Update: 2024-06-14 +Applied-Upstream: no + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 38c65d11..d0d77d7d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -187,6 +187,8 @@ macro(CHECK_INCLUDE_FILE_CONCAT FILE VARIABLE) + endif() + endmacro() + ++include(GNUInstallDirs) ++ + #include(${GDCM_SOURCE_DIR}/CMake/gdcmPlatformCxxTests.cmake) + # + #GDCM_PLATFORM_CXX_TEST(GDCM_CXX_HAS_FUNCTION diff --git a/debian/patches/series b/debian/patches/series index 20a1fa9..66ebc2a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,5 @@ rename-pdf.patch 03_linkvtkdoc.patch 04_multiarch.patch dircos_rev.patch +vtk-9.3-compat.patch +cmake-include-gnuinstalldirs.patch diff --git a/debian/patches/vtk-9.3-compat.patch b/debian/patches/vtk-9.3-compat.patch new file mode 100644 index 0000000..a5cc411 --- /dev/null +++ b/debian/patches/vtk-9.3-compat.patch @@ -0,0 +1,96 @@ +Subject: Compatibility with VTK 9.3 +Author: Nicklas Larsson +Forwarded: https://sourceforge.net/p/gdcm/bugs/552/#9e8f +Applied-Upstream: no +Last-Update: 2023-12-05 +Bug: https://sourceforge.net/p/gdcm/bugs/552/ + +--- gdcm.orig/CMakeLists.txt.orig ++++ gdcm/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}" + + +--- gdcm.orig/Utilities/VTK/vtkImageColorViewer.h.orig ++++ gdcm/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(); + + + +--- gdcm.orig/Utilities/VTK/vtkImageColorViewer.cxx.orig ++++ gdcm/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); + + + +--- gdcm.orig/Utilities/VTK/vtkGDCMTesting.cxx.orig ++++ gdcm/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/debian/python3-vtkgdcm.install b/debian/python3-vtkgdcm.install index 0b3361a..aead328 100644 --- a/debian/python3-vtkgdcm.install +++ b/debian/python3-vtkgdcm.install @@ -1,2 +1,3 @@ +usr/include/vtkgdcmpython.h usr/lib/python3*/dist-packages/vtkgdcm/* usr/lib/*/vtk-*/hierarchy/vtkgdcm/vtkgdcm-hierarchy.txt