[otb] 01/07: Add upstream patch to fix FTBFS with ITK 4.9.0.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository otb.

commit ce40360d34e7ba97944a810b3b5fa165f2e34331
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Feb 12 14:44:53 2016 +0100

    Add upstream patch to fix FTBFS with ITK 4.9.0.
---
 debian/changelog                                   |  1 +
 ...2-not-compatible-with-ITK-4.9-mantis-1142.patch | 52 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 54 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 29206e2..f60b08c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ otb (5.2.1+dfsg-1) UNRELEASED; urgency=medium
   * Update Vcs-Git URL to use HTTPS.
   * Update watch file to use orfeo-toolbox.org.
   * Drop patches, applied upstream.
+  * Add upstream patch to fix FTBFS with ITK 4.9.0.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 11 Feb 2016 21:20:55 +0100
 
diff --git a/debian/patches/0001-BUG-OTB-5.2-not-compatible-with-ITK-4.9-mantis-1142.patch b/debian/patches/0001-BUG-OTB-5.2-not-compatible-with-ITK-4.9-mantis-1142.patch
new file mode 100644
index 0000000..30d575b
--- /dev/null
+++ b/debian/patches/0001-BUG-OTB-5.2-not-compatible-with-ITK-4.9-mantis-1142.patch
@@ -0,0 +1,52 @@
+From c7b301d750c67f6e7b740ad5e085522a3c478ed9 Mon Sep 17 00:00:00 2001
+From: Manuel Grizonnet <manuel.grizonnet at cnes.fr>
+Date: Fri, 12 Feb 2016 09:34:31 +0100
+Subject: BUG: OTB 5.2 not compatible with ITK 4.9 (mantis 1142)
+Origin: https://git.orfeo-toolbox.org/otb.git/commit/c7b301d750c67f6e7b740ad5e085522a3c478ed9
+Bug: https://bugs.orfeo-toolbox.org/view.php?id=1142
+
+---
+ Modules/Core/Common/include/otbConfigurationManager.h             | 4 ++--
+ Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+--- a/Modules/Core/Common/include/otbConfigurationManager.h
++++ b/Modules/Core/Common/include/otbConfigurationManager.h
+@@ -18,7 +18,7 @@
+ #ifndef _otbConfigurationManager_h
+ #define _otbConfigurationManager_h
+ 
+-#include "itksys/FundamentalType.h"
++#include "itk_kwiml.h"
+ 
+ #include <string>
+ #include <boost/cstdint.hpp>
+@@ -38,7 +38,7 @@ namespace otb
+ class ConfigurationManager
+ {
+ public:
+-  typedef ::itksysFundamentalType_UInt64 RAMValueType;
++  typedef KWIML_INT_uint64_t RAMValueType;
+ 
+   /**
+    * DEMDirectory is a directory were DEM tiles are stored. 
+--- a/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
++++ b/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
+@@ -19,7 +19,7 @@
+ #define __otbPipelineMemoryPrintCalculator_h
+ 
+ #include "itkProcessObject.h"
+-#include "itksys/FundamentalType.h"
++#include "itk_kwiml.h"
+ #include <set>
+ 
+ namespace otb
+@@ -75,7 +75,7 @@ public:
+   typedef ProcessObjectType::Pointer          ProcessObjectPointerType;
+   typedef itk::DataObject                     DataObjectType;
+   typedef DataObjectType::Pointer             DataObjectPointerType;
+-  typedef ::itksysFundamentalType_UInt64      MemoryPrintType;
++  typedef KWIML_INT_uint64_t                  MemoryPrintType;
+   typedef std::set<const ProcessObjectType *> ProcessObjectPointerSetType;
+ 
+   /** Run-time type information (and related methods). */
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..017abf7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-BUG-OTB-5.2-not-compatible-with-ITK-4.9-mantis-1142.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git