[med-svn] [Git][med-team/gdcm][master] 3 commits: Disable Java on hurd-amd64 (Closes: #1095011)
Dominique Belhachemi (@domibel)
gitlab at salsa.debian.org
Tue Oct 7 01:09:40 BST 2025
Dominique Belhachemi pushed to branch master at Debian Med / gdcm
Commits:
e429cc04 by Dominique Belhachemi at 2025-10-06T19:23:50-04:00
Disable Java on hurd-amd64 (Closes: #1095011)
- - - - -
fedf41fa by Dominique Belhachemi at 2025-10-06T19:29:18-04:00
Disable the PDF documentation generation temporarily
- - - - -
8594d97b by Dominique Belhachemi at 2025-10-06T19:55:55-04:00
Add VTK 9.5 compatibility fix
- - - - -
6 changed files:
- debian/changelog
- debian/gdcm-doc.docs
- debian/gdcm-doc.install
- + debian/patches/05_vtk95.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+gdcm (3.0.24-6) unstable; urgency=medium
+
+ * Team upload.
+ * Disable Java on hurd-amd64 (Closes: #1095011)
+ * Disable the PDF documentation generation temporarily
+ * Add VTK 9.5 compatibility fix
+
+ -- Dominique Belhachemi <domibel at debian.org> Mon, 06 Oct 2025 19:08:59 -0400
+
gdcm (3.0.24-5) unstable; urgency=medium
* Team upload.
=====================================
debian/gdcm-doc.docs
=====================================
@@ -1,2 +1,2 @@
-usr/share/doc/gdcm-*/gdcm-*.pdf
+#usr/share/doc/gdcm-*/gdcm-*.pdf
usr/share/doc/gdcm-*/html/
=====================================
debian/gdcm-doc.install
=====================================
@@ -1,2 +1,2 @@
-usr/share/doc/gdcm-*/gdcm-*.pdf usr/share/doc/gdcm-doc/
+#usr/share/doc/gdcm-*/gdcm-*.pdf usr/share/doc/gdcm-doc/
usr/share/doc/gdcm-*/html/
=====================================
debian/patches/05_vtk95.patch
=====================================
@@ -0,0 +1,146 @@
+Description: VTK 9.5 compat fix: use .c_str() instead of deprecated vtkStdString cast
+Author: Dominique Belhachemi <domibel at debian.org>
+Last-Update: 2025-10-06
+
+--- gdcm-3.0.24.orig/Utilities/VTK/Applications/gdcm2vtk.cxx
++++ gdcm-3.0.24/Utilities/VTK/Applications/gdcm2vtk.cxx
+@@ -498,7 +498,7 @@ int main(int argc, char *argv[])
+ {
+ imgreader->SetFileLowerLeft( lowerleft );
+ if( names->GetNumberOfValues() == 1 )
+- imgreader->SetFileName( names->GetValue(0) );
++ imgreader->SetFileName( names->GetValue(0).c_str() );
+ else
+ imgreader->SetFileNames(names);
+ imgreader->Update();
+--- gdcm-3.0.24.orig/Utilities/VTK/Applications/gdcmviewer.cxx
++++ gdcm-3.0.24/Utilities/VTK/Applications/gdcmviewer.cxx
+@@ -321,7 +321,7 @@ void ExecuteViewer(TViewer *viewer, vtkS
+ vtkGDCMImageReader *reader = vtkGDCMImageReader::New();
+ if( filenames->GetSize() == 1 ) // Backward compatible...
+ {
+- reader->SetFileName( filenames->GetValue(0) );
++ reader->SetFileName( filenames->GetValue(0).c_str() );
+ }
+ else
+ {
+--- gdcm-3.0.24.orig/Utilities/VTK/Testing/Cxx/TestvtkGDCMImageWriter2.cxx
++++ gdcm-3.0.24/Utilities/VTK/Testing/Cxx/TestvtkGDCMImageWriter2.cxx
+@@ -113,7 +113,7 @@ int TestvtkGDCMImageWrite2(const char *f
+ // Need to check we can still read those files back:
+ for(int file=0; file<filenames->GetNumberOfValues(); ++file)
+ {
+- const char *fname = filenames->GetValue(file);
++ const char *fname = filenames->GetValue(file).c_str();
+ gdcm::ImageReader r;
+ //r.SetFileName( gdcmfile.c_str() );
+ r.SetFileName( fname );
+--- gdcm-3.0.24.orig/Utilities/VTK/Testing/Cxx/TestvtkGDCMThreadedImageReader2.cxx
++++ gdcm-3.0.24/Utilities/VTK/Testing/Cxx/TestvtkGDCMThreadedImageReader2.cxx
+@@ -160,7 +160,7 @@ int TestvtkGDCMThreadedImageRead2(const
+ assert( sarray->GetNumberOfValues() == (int)nfiles );
+ reader->SetFileNames( sarray );
+ sarray->Delete();
+- refimage = sarray->GetValue( 0 ); // Ok since sarray is ref count
++ refimage = sarray->GetValue( 0 ).c_str(); // Ok since sarray is ref count
+ }
+ else
+ {
+--- gdcm-3.0.24.orig/Utilities/VTK/vtkGDCMImageReader.cxx
++++ gdcm-3.0.24/Utilities/VTK/vtkGDCMImageReader.cxx
+@@ -608,7 +608,7 @@ ComputePixelTypeFromFiles(const char *in
+ // FIXME a gdcm::Scanner would be much faster here:
+ for(int i = 0; i < filenames->GetNumberOfValues(); ++i )
+ {
+- const char *filename = filenames->GetValue( i );
++ const char *filename = filenames->GetValue( i ).c_str();
+ gdcm::ImageReader reader;
+ reader.SetFileName( filename );
+ if( !reader.Read() )
+@@ -703,7 +703,7 @@ int vtkGDCMImageReader::RequestInformati
+ }
+ else if ( this->FileNames && this->FileNames->GetNumberOfValues() > 0 )
+ {
+- filename = this->FileNames->GetValue( 0 );
++ filename = this->FileNames->GetValue( 0 ).c_str();
+ }
+ else
+ {
+@@ -1459,7 +1459,7 @@ int vtkGDCMImageReader::RequestDataCompa
+ for(int j = dext[4]; !this->AbortExecute && j <= dext[5]; ++j)
+ {
+ assert( j >= 0 && j <= this->FileNames->GetNumberOfValues() );
+- const char *filename = this->FileNames->GetValue( j );
++ const char *filename = this->FileNames->GetValue( j ).c_str();
+ int load = this->LoadSingleFile( filename, pointer, len );
+ if( !load )
+ {
+--- gdcm-3.0.24.orig/Utilities/VTK/vtkGDCMImageReader2.cxx
++++ gdcm-3.0.24/Utilities/VTK/vtkGDCMImageReader2.cxx
+@@ -388,7 +388,7 @@ ComputePixelTypeFromFiles(const char *in
+ // FIXME a gdcm::Scanner would be much faster here:
+ for(int i = 0; i < filenames->GetNumberOfValues(); ++i )
+ {
+- const char *filename = filenames->GetValue( i );
++ const char *filename = filenames->GetValue( i ).c_str();
+ gdcm::ImageReader reader;
+ reader.SetFileName( filename );
+ if( !reader.Read() )
+@@ -480,7 +480,7 @@ int vtkGDCMImageReader2::RequestInformat
+ }
+ else if ( this->FileNames && this->FileNames->GetNumberOfValues() > 0 )
+ {
+- filename = this->FileNames->GetValue( 0 );
++ filename = this->FileNames->GetValue( 0 ).c_str();
+ }
+ else
+ {
+@@ -1177,7 +1177,7 @@ int vtkGDCMImageReader2::RequestDataComp
+ for(int j = outExt[4]; !this->AbortExecute && j <= outExt[5]; ++j)
+ {
+ assert( j >= 0 && j <= this->FileNames->GetNumberOfValues() );
+- const char *filename = this->FileNames->GetValue( j );
++ const char *filename = this->FileNames->GetValue( j ).c_str();
+ int load = this->LoadSingleFile( filename, pointer, len );
+ vtkDebugMacro( "LoadSingleFile: " << filename );
+ if( !load )
+--- gdcm-3.0.24.orig/Utilities/VTK/vtkGDCMImageWriter.cxx
++++ gdcm-3.0.24/Utilities/VTK/vtkGDCMImageWriter.cxx
+@@ -255,7 +255,7 @@ int vtkGDCMImageWriter::RequestData(
+ {
+ if( this->FileNames->GetNumberOfValues() )
+ {
+- const char *filename = this->FileNames->GetValue(0);
++ const char *filename = this->FileNames->GetValue(0).c_str();
+ return const_cast<char*>(filename);
+ }
+ return this->Superclass::GetFileName();
+@@ -1148,7 +1148,7 @@ int vtkGDCMImageWriter::WriteGDCMData(vt
+ if( this->FileNames->GetNumberOfValues() )
+ {
+ //int n = this->FileNames->GetNumberOfValues();
+- filename = this->FileNames->GetValue(k);
++ filename = this->FileNames->GetValue(k).c_str();
+ }
+ else
+ {
+--- gdcm-3.0.24.orig/Utilities/VTK/vtkGDCMThreadedImageReader2.cxx
++++ gdcm-3.0.24/Utilities/VTK/vtkGDCMThreadedImageReader2.cxx
+@@ -71,7 +71,7 @@ vtkGDCMThreadedImageReader2::~vtkGDCMThr
+ //----------------------------------------------------------------------------
+ const char *vtkGDCMThreadedImageReader2::GetFileName(int i)
+ {
+- return this->FileNames->GetValue( i );
++ return this->FileNames->GetValue( i ).c_str();
+ }
+
+ //----------------------------------------------------------------------------
+@@ -106,7 +106,7 @@ void vtkGDCMThreadedImageReader2Execute(
+ for( int i = outExt[4]; i <= outExt[5] && i < maxfiles; ++i )
+ {
+ assert( i < maxfiles );
+- const char *filename = self->GetFileNames()->GetValue( i );
++ const char *filename = self->GetFileNames()->GetValue( i ).c_str();
+ //ReadOneFile( filename );
+ //outData->GetPointData()->GetScalars()->SetName("GDCMImage");
+
=====================================
debian/patches/series
=====================================
@@ -6,3 +6,4 @@ dircos_rev.patch
de650849a1f294dda8401e2925c40daec51d0d3b.patch
3be6c2fa0945c91889bcf06e8c20e88f69692dd5.patch
cxx-standard-20.patch
+05_vtk95.patch
=====================================
debian/rules
=====================================
@@ -12,7 +12,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
export LD_LIBRARY_PATH:=$(LD_LIBRARY_PATH):/usr/lib/jni
DEFAULT_JAVA_VERSION=1.8
-ifeq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH),hppa hurd-i386 kfreebsd-i386 kfreebsd-amd64))
+ifneq (,$(filter $(DEB_BUILD_ARCH),hppa hurd-i386 hurd-amd64))
DEFAULT_JAVA_VERSION=
endif
@@ -52,7 +52,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_SKIP_RPATH=ON \
-DGDCM_DOCUMENTATION:BOOL=$(BUILDDOC) \
-DGDCM_VTK_DOCUMENTATION:BOOL=OFF \
-DDOCUMENTATION_DOWNLOAD_VTK_TAGFILE:BOOL=OFF \
- -DGDCM_PDF_DOCUMENTATION:BOOL=$(BUILDDOC) \
+ -DGDCM_PDF_DOCUMENTATION:BOOL=OFF \
-DGDCM_BUILD_SHARED_LIBS:BOOL=ON \
-DGDCM_WRAP_PYTHON:BOOL=ON \
-DVTKGDCM_WRAP_PYTHON:BOOL=ON \
View it on GitLab: https://salsa.debian.org/med-team/gdcm/-/compare/5815e8394fb33285337e3c367e5b23f6c57535a4...8594d97bf87df9b982486b9229fdfdfb03f4f9d7
--
View it on GitLab: https://salsa.debian.org/med-team/gdcm/-/compare/5815e8394fb33285337e3c367e5b23f6c57535a4...8594d97bf87df9b982486b9229fdfdfb03f4f9d7
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/20251007/61e4916d/attachment-0001.htm>
More information about the debian-med-commit
mailing list