[Git][debian-gis-team/otb][master] 3 commits: Add upstream patch to fix FTBFS with GDAL 2.3.0. (closes: #896837)

[Bas Couwenberg]

Bas Couwenberg pushed to branch master at Debian GIS Project / otb


Commits:
b7747222 by Bas Couwenberg at 2018-04-27T17:01:11+02:00
Add upstream patch to fix FTBFS with GDAL 2.3.0. (closes: #896837)

- - - - -
15380043 by Bas Couwenberg at 2018-04-27T18:11:09+02:00
Drop unused lintian override.

- - - - -
ecafdfbe by Bas Couwenberg at 2018-04-27T18:11:32+02:00
Set distribution to unstable.

- - - - -


4 changed files:

- debian/changelog
- debian/libotb-apps.lintian-overrides
- + debian/patches/0001-BUG-1567-fix-compilation-with-GDAL-2.3.0.patch
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
-otb (6.4.0+dfsg-2) UNRELEASED; urgency=medium
+otb (6.4.0+dfsg-2) unstable; urgency=medium
 
-  * Add lintian override for spelling-error-in-binary false positive.
+  * Team upload.
   * Update Vcs-* URLs for Salsa.
   * Bump Standards-Version to 4.1.4, no changes.
+  * Add upstream patch to fix FTBFS with GDAL 2.3.0.
+    (closes: #896837)
 
- -- Bas Couwenberg <sebastic at debian.org>  Tue, 06 Mar 2018 09:24:45 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Fri, 27 Apr 2018 18:06:58 +0200
 
 otb (6.4.0+dfsg-1) unstable; urgency=medium
 


=====================================
debian/libotb-apps.lintian-overrides
=====================================
--- a/debian/libotb-apps.lintian-overrides
+++ b/debian/libotb-apps.lintian-overrides
@@ -1,5 +1,4 @@
 # False positive, string not included in source.
 libotb-apps: spelling-error-in-binary * Verticies Vertices
 libotb-apps: spelling-error-in-binary * onthe on the
-libotb-apps: spelling-error-in-binary * wIH with
 


=====================================
debian/patches/0001-BUG-1567-fix-compilation-with-GDAL-2.3.0.patch
=====================================
--- /dev/null
+++ b/debian/patches/0001-BUG-1567-fix-compilation-with-GDAL-2.3.0.patch
@@ -0,0 +1,44 @@
+Description: fix compilation with GDAL 2.3.0
+Author: Guillaume Pasero <guillaume.pasero at c-s.fr>
+Origin: https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/commit/11d05983c3d475e01263831f9d864916d09852b6
+Bug: https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/issues/1567
+Bug-Debian: https://bugs.debian.org/896837
+
+--- a/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.txx
++++ b/Modules/Adapters/GdalAdapters/include/otbOGRFieldWrapper.txx
+@@ -114,7 +114,11 @@ typedef mpl::map
+  */
+ template
+   < typename T
++#if GDAL_VERSION_NUM >= 2030000
++  , T ( OGRFeature::*ptr_to_function )(int) const
++#else
+   , T ( OGRFeature::*ptr_to_function )(int)
++#endif
+   , typename FinalReturnType = T
+   > class MemberGetterPtr
+     {
+@@ -190,7 +194,11 @@ template
+  */
+ template
+   < typename T
++#if GDAL_VERSION_NUM >= 2030000
++  , T const* ( OGRFeature::*ptr_to_function )(int, int*) const
++#else
+   , T const* ( OGRFeature::*ptr_to_function )(int, int*)
++#endif
+   , typename FinalReturnType = std::vector<T>
+   > class MemberContainerGetterPtr
+     {
+@@ -292,7 +300,11 @@ template
+  */
+ template
+   < typename T
++#if GDAL_VERSION_NUM >= 2030000
++  , void ( OGRFeature::*ptr_to_function )(int, int, const T*)
++#else
+   , void ( OGRFeature::*ptr_to_function )(int, int, T*) // not const-correct
++#endif
+   , typename ActualParamType = std::vector<T>
+   > class MemberContainerSetterPtr
+     {


=====================================
debian/patches/series
=====================================
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-BUG-1567-fix-compilation-with-GDAL-2.3.0.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/otb/compare/f6dc8df1d7b237f15388670f67325b00ad5a4da8...ecafdfbe055db08434a8399f9d1301dd0902e582

---
View it on GitLab: https://salsa.debian.org/debian-gis-team/otb/compare/f6dc8df1d7b237f15388670f67325b00ad5a4da8...ecafdfbe055db08434a8399f9d1301dd0902e582
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/pkg-grass-devel/attachments/20180427/bc634e06/attachment-0001.html>