[cdo] 12/16: Fix for off_t defintion on 32-bit systems. Closes: #878408

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository cdo.

commit 675d50abffc19a284d37647ee0aaa5dc0d0d53b6
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Oct 21 17:06:26 2017 +0100

    Fix for off_t defintion on 32-bit systems. Closes: #878408
---
 debian/changelog               |  1 +
 debian/patches/off_t-fix.patch | 19 +++++++++++++++++++
 debian/patches/series          |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0da695d..c18fb62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 cdo (1.9.1+dfsg.1-3) UNRELEASED; urgency=medium
 
   * Change homepage to https://code.mpimet.mpg.de/projects/cdo
+  * Fix for off_t defintion on 32-bit systems. Closes: #878408
 
  -- Alastair McKinstry <mckinstry at debian.org>  Tue, 17 Oct 2017 13:35:05 +0100
 
diff --git a/debian/patches/off_t-fix.patch b/debian/patches/off_t-fix.patch
new file mode 100644
index 0000000..ce0143d
--- /dev/null
+++ b/debian/patches/off_t-fix.patch
@@ -0,0 +1,19 @@
+Description: Avoid pulling sys/types.h (unneeded) as we get 2 versions of off_t
+ (C / C++ conflict?)
+Author: Alastair McKinstry <mckinstry at debian.org>
+Last-Updated: 2017-10-21
+Forwarded: no
+
+Index: cdo-1.9.1+dfsg.1/src/process.h
+===================================================================
+--- cdo-1.9.1+dfsg.1.orig/src/process.h
++++ cdo-1.9.1+dfsg.1/src/process.h
+@@ -18,7 +18,7 @@
+ #ifndef _PROCESS_H
+ #define _PROCESS_H
+ 
+-#include <sys/types.h> /* off_t */
++// #include <sys/types.h> /* off_t */
+ #include <vector>
+ #include "util.h"
+ #include "pstream.h"
diff --git a/debian/patches/series b/debian/patches/series
index 1c72c27..65c2737 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ ignore.patch
 deregister.patch
 reproducible-builds.patch
 ppc64el.patch
+off_t-fix.patch

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