[vtk7] 08/24: remove patch 90-gdal-2.0

[Gert Wollny]

This is an automated email from the git hooks/post-receive script.

gewo pushed a commit to branch master
in repository vtk7.

commit 477f02783ee635f724993319785613b2a9c2b7b3
Author: Gert Wollny <gewo at debian.org>
Date:   Sat Jul 8 10:24:12 2017 +0000

    remove patch 90-gdal-2.0
---
 debian/patches/90_gdal-2.0.patch | 40 ----------------------------------------
 debian/patches/series            |  1 -
 2 files changed, 41 deletions(-)

diff --git a/debian/patches/90_gdal-2.0.patch b/debian/patches/90_gdal-2.0.patch
index 4db3240..97464fe 100644
--- a/debian/patches/90_gdal-2.0.patch
+++ b/debian/patches/90_gdal-2.0.patch
@@ -3,43 +3,3 @@ Description: Fix GDAL 2.0 compatibility.
 Origin: https://projects.archlinux.org/svntogit/community.git/tree/trunk/gdal2.patch?h=packages/vtk
 Bug: http://www.vtk.org/Bug/view.php?id=15692
 
-Index: VTK-6.3.0/IO/GDAL/vtkGDALVectorReader.cxx
-===================================================================
---- VTK-6.3.0.orig/IO/GDAL/vtkGDALVectorReader.cxx
-+++ VTK-6.3.0/IO/GDAL/vtkGDALVectorReader.cxx
-@@ -44,7 +44,11 @@ class vtkGDALVectorReader::Internal
- public:
-   Internal( const char* srcName, int srcMode, int appendFeatures, int addFeatIds )
-     {
-+#if GDAL_VERSION_MAJOR < 2
-     this->Source = OGRSFDriverRegistrar::Open( srcName, srcMode, &this->Driver );
-+#else
-+    this->Source = (GDALDataset*) OGROpen( srcName, srcMode, NULL );
-+#endif
-     if ( ! this->Source )
-       {
-       this->LastError = CPLGetLastErrorMsg();
-@@ -61,7 +65,11 @@ public:
-     {
-     if ( this->Source )
-       {
-+#if GDAL_VERSION_MAJOR < 2
-       OGRDataSource::DestroyDataSource( this->Source );
-+#else
-+      GDALClose( (GDALDatasetH) this->Source );
-+#endif
-       }
-     }
- 
-@@ -307,7 +315,11 @@ public:
-     return nCells;
-     }
- 
-+#if GDAL_VERSION_MAJOR < 2
-   OGRDataSource* Source;
-+#else
-+  GDALDataset* Source;
-+#endif
-   OGRSFDriver* Driver;
-   const char* LastError;
-   int LayerIdx;
diff --git a/debian/patches/series b/debian/patches/series
index 0a7e621..00b8567 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,7 +6,6 @@
 60_use_system_mpi4py.patch
 70_fix_ftbfs_gcc49.patch
 80_fix_arm_compilation.patch
-90_gdal-2.0.patch
 95_ffmpeg_2.9.patch
 97_fix_latex_doxygen.patch
 100_javac-heap.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/vtk7.git