[med-svn] [Git][med-team/gdcm][master] 3 commits: d/patches: gdcm FTBFS with VTK 9.3.0. Closes: #1072822
Mathieu Malaterre (@malat)
gitlab at salsa.debian.org
Tue Jun 18 07:31:28 BST 2024
Mathieu Malaterre pushed to branch master at Debian Med / gdcm
Commits:
f923088d by Adrien Nader at 2024-06-18T08:27:50+02:00
d/patches: gdcm FTBFS with VTK 9.3.0. Closes: #1072822
- - - - -
2726ef74 by Mathieu Malaterre at 2024-06-18T08:27:53+02:00
d/control: Bump Std-Vers to 4.7.0 no changes needed
- - - - -
40c337bc by Mathieu Malaterre at 2024-06-18T08:30:27+02:00
d/changelog: Upload 3.0.24-2 to unstable
- - - - -
7 changed files:
- debian/changelog
- debian/control
- debian/control.in
- + debian/patches/3be6c2fa0945c91889bcf06e8c20e88f69692dd5.patch
- + debian/patches/de650849a1f294dda8401e2925c40daec51d0d3b.patch
- debian/patches/series
- debian/python3-vtkgdcm.install
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,14 @@
+gdcm (3.0.24-2) unstable; urgency=medium
+
+ [ Adrien Nader ]
+ * Team upload.
+ * d/patches: gdcm FTBFS with VTK 9.3.0. Closes: #1072822
+
+ [ Mathieu Malaterre ]
+ * d/control: Bump Std-Vers to 4.7.0 no changes needed
+
+ -- Mathieu Malaterre <malat at debian.org> Tue, 18 Jun 2024 08:28:12 +0200
+
gdcm (3.0.24-1) unstable; urgency=high
* Team upload.
=====================================
debian/control
=====================================
@@ -5,7 +5,7 @@ Uploaders: Steve M. Robbins <smr at debian.org>,
Gert Wollny <gewo at debian.org>
Section: libs
Priority: optional
-Build-Depends: dpkg-dev (>= 1.22.5), castxml,
+Build-Depends: castxml,
cli-common-dev [amd64 armel armhf i386 mipsel kfreebsd-amd64 kfreebsd-i386 powerpc ppc64 ppc64el s390x arm64] <!nocil>,
cmake,
debhelper-compat (= 13),
@@ -14,6 +14,7 @@ Build-Depends: dpkg-dev (>= 1.22.5), castxml,
dh-python,
dh-strip-nondeterminism,
docbook-xsl-ns,
+ dpkg-dev (>= 1.22.5),
javahelper,
libcharls-dev (>= 2.4.1),
libexpat-dev,
=====================================
debian/control.in
=====================================
@@ -14,6 +14,7 @@ Build-Depends: castxml,
dh-python,
dh-strip-nondeterminism,
docbook-xsl-ns,
+ dpkg-dev (>= 1.22.5),
javahelper,
libcharls-dev (>= 2.4.1),
libexpat-dev,
@@ -37,7 +38,7 @@ Build-Depends: castxml,
xsltproc
Build-Depends-Indep: doxygen, doxygen-latex, ghostscript, graphviz, vtk9-doc
Build-Conflicts: libopenjpeg-dev
-Standards-Version: 4.6.1
+Standards-Version: 4.7.0
Vcs-Browser: https://salsa.debian.org/med-team/gdcm
Vcs-Git: https://salsa.debian.org/med-team/gdcm.git
Homepage: http://gdcm.sourceforge.net/
=====================================
debian/patches/3be6c2fa0945c91889bcf06e8c20e88f69692dd5.patch
=====================================
@@ -0,0 +1,105 @@
+From 3be6c2fa0945c91889bcf06e8c20e88f69692dd5 Mon Sep 17 00:00:00 2001
+From: Nicklas Larsson <n_larsson at yahoo.com>
+Date: Tue, 18 Jun 2024 08:06:20 +0200
+Subject: [PATCH] Problem compiling with VTK 9.3.0 support
+
+With the following patch I succeded to build against VTK 9.3.0
+
+Fixes #552
+---
+ CMakeLists.txt | 1 +
+ Utilities/VTK/vtkGDCMTesting.cxx | 1 -
+ Utilities/VTK/vtkImageColorViewer.cxx | 28 ---------------------------
+ Utilities/VTK/vtkImageColorViewer.h | 16 ---------------
+ 4 files changed, 1 insertion(+), 45 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f1083c5fcd..758a60e68d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -707,6 +707,7 @@ if(GDCM_STANDALONE)
+ 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}"
+diff --git a/Utilities/VTK/vtkGDCMTesting.cxx b/Utilities/VTK/vtkGDCMTesting.cxx
+index 3d74802f0a..a4e4ef1f23 100644
+--- 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/Utilities/VTK/vtkImageColorViewer.cxx b/Utilities/VTK/vtkImageColorViewer.cxx
+index 909d21fceb..175d634e46 100644
+--- a/Utilities/VTK/vtkImageColorViewer.cxx
++++ b/Utilities/VTK/vtkImageColorViewer.cxx
+@@ -918,34 +918,6 @@ void vtkImageColorViewer::SetOverlayVisibility(double vis)
+ this->OverlayImageActor->SetVisibility((int)vis);
+ }
+
+-//----------------------------------------------------------------------------
+-#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)
+ {
+diff --git a/Utilities/VTK/vtkImageColorViewer.h b/Utilities/VTK/vtkImageColorViewer.h
+index ad03febb0d..8542cd99c9 100644
+--- a/Utilities/VTK/vtkImageColorViewer.h
++++ b/Utilities/VTK/vtkImageColorViewer.h
+@@ -199,22 +199,6 @@ class VTKGDCM_EXPORT vtkImageColorViewer : public vtkObject
+ 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();
=====================================
debian/patches/de650849a1f294dda8401e2925c40daec51d0d3b.patch
=====================================
@@ -0,0 +1,30 @@
+From de650849a1f294dda8401e2925c40daec51d0d3b Mon Sep 17 00:00:00 2001
+From: Adrien Nader <adrien at notk.org>
+Date: Tue, 18 Jun 2024 08:01:50 +0200
+Subject: [PATCH] include(GNUInstallDirs) in CMakeLists.txt
+
+While updating the Debian/Ubuntu package, I encountered a configure
+error with vtkgdcmpython.h not being given an installation destination
+due to CMAKE_INSTALL_INCLUDEDIR not being set. This is solved by adding
+"include(GNUInstallDirs)" in CMakeLists.txt. I picked up line 190 but I
+think that other lines will do just as fine. I've attached the
+corresponding patch.
+---
+ CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 33a40349d..f1083c5fc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -187,6 +187,10 @@ macro(CHECK_INCLUDE_FILE_CONCAT FILE VARIABLE)
+ endif()
+ endmacro()
+
++if(UNIX)
++ include(GNUInstallDirs)
++endif()
++
+ #include(${GDCM_SOURCE_DIR}/CMake/gdcmPlatformCxxTests.cmake)
+ #
+ #GDCM_PLATFORM_CXX_TEST(GDCM_CXX_HAS_FUNCTION
=====================================
debian/patches/series
=====================================
@@ -3,3 +3,5 @@ rename-pdf.patch
03_linkvtkdoc.patch
04_multiarch.patch
dircos_rev.patch
+de650849a1f294dda8401e2925c40daec51d0d3b.patch
+3be6c2fa0945c91889bcf06e8c20e88f69692dd5.patch
=====================================
debian/python3-vtkgdcm.install
=====================================
@@ -1,2 +1,3 @@
-usr/lib/python3*/dist-packages/vtkgdcm/*
+usr/include/vtkgdcmpython.h
usr/lib/*/vtk-*/hierarchy/vtkgdcm/vtkgdcm-hierarchy.txt
+usr/lib/python3*/dist-packages/vtkgdcm/*
View it on GitLab: https://salsa.debian.org/med-team/gdcm/-/compare/7f709fa3890a022b2832cd0fc868f2c692597345...40c337bce5d873e420a16aa4fcded9ad92b19e03
--
This project does not include diff previews in email notifications.
View it on GitLab: https://salsa.debian.org/med-team/gdcm/-/compare/7f709fa3890a022b2832cd0fc868f2c692597345...40c337bce5d873e420a16aa4fcded9ad92b19e03
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20240618/7354540a/attachment-0001.htm>
More information about the debian-med-commit
mailing list