Bug#1038618: vtk6: Stop using netcdf-cxx-legacy

[Bas Couwenberg]

Source: vtk6
Version: 6.3.0+dfsg2-8.1
Severity: important
Tags: patch
User: debian-gis at lists.debian.org
Usertags: netcdf-cxx-legacy-rm

Dear Maintainer,

Your package uses netcdf-cxx-legacy which is dead upstream and will be removed during the trixie development cycle.

The attached patch switches to the embedded copy, because the build actually requires the CXX component.

Kind Regards,

Bas
-------------- next part --------------
diff -Nru vtk6-6.3.0+dfsg2/debian/changelog vtk6-6.3.0+dfsg2/debian/changelog
--- vtk6-6.3.0+dfsg2/debian/changelog	2021-04-24 23:09:44.000000000 +0200
+++ vtk6-6.3.0+dfsg2/debian/changelog	2023-06-18 19:53:55.000000000 +0200
@@ -1,3 +1,10 @@
+vtk6 (6.3.0+dfsg2-8.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Don't use netcdf-cxx-legacy.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 18 Jun 2023 19:53:55 +0200
+
 vtk6 (6.3.0+dfsg2-8.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru vtk6-6.3.0+dfsg2/debian/control vtk6-6.3.0+dfsg2/debian/control
--- vtk6-6.3.0+dfsg2/debian/control	2020-12-11 22:46:17.000000000 +0100
+++ vtk6-6.3.0+dfsg2/debian/control	2023-06-18 19:53:28.000000000 +0200
@@ -28,7 +28,6 @@
                libjsoncpp-dev,
                libmrmpi-dev,
                libnetcdf-dev,
-               libnetcdf-cxx-legacy-dev,
                libogg-dev,
                libosmesa6-dev,
                libpng-dev,
@@ -79,7 +78,6 @@
          libjpeg-dev,
          libjsoncpp-dev,
          libnetcdf-dev,
-         libnetcdf-cxx-legacy-dev,
          libogg-dev,
          libpng-dev,
          libpq-dev,
diff -Nru vtk6-6.3.0+dfsg2/debian/copyright vtk6-6.3.0+dfsg2/debian/copyright
--- vtk6-6.3.0+dfsg2/debian/copyright	2020-12-11 22:46:17.000000000 +0100
+++ vtk6-6.3.0+dfsg2/debian/copyright	2023-06-18 19:53:55.000000000 +0200
@@ -13,7 +13,6 @@
   ThirdParty/jpeg/vtkjpeg
   ThirdParty/jsoncpp/vtkjsoncpp
   ThirdParty/libxml2/vtklibxml2
-  ThirdParty/netcdf/vtknetcdf
   ThirdParty/oggtheora/vtkoggtheora
   ThirdParty/png/vtkpng
   ThirdParty/sqlite/vtksqlite
diff -Nru vtk6-6.3.0+dfsg2/debian/rules vtk6-6.3.0+dfsg2/debian/rules
--- vtk6-6.3.0+dfsg2/debian/rules	2020-12-11 22:46:17.000000000 +0100
+++ vtk6-6.3.0+dfsg2/debian/rules	2023-06-18 19:53:55.000000000 +0200
@@ -30,7 +30,7 @@
 	-DVTK_USE_SYSTEM_TIFF=ON \
 	-DVTK_USE_SYSTEM_ZLIB=ON \
 	-DVTK_USE_SYSTEM_JSONCPP=ON \
-	-DVTK_USE_SYSTEM_NETCDF=ON \
+	-DVTK_USE_SYSTEM_NETCDF=OFF \
 	-DVTK_USE_SYSTEM_GLEW=ON \
 	-DVTK_EXTRA_COMPILER_WARNINGS=ON \
 	-DVTK_Group_Imaging=ON \