[cdo] 15/16: * Workaround for off_t bug. off_t is defined differently (long vs long long) if <thread>. For consistency, add <thread> to other C++ files needed 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 eecf4e67fede5edac0930f66744afebf61829e55
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Oct 23 16:11:12 2017 +0100

    * Workaround for off_t bug. off_t is defined differently (long vs long long)
      if <thread>. For consistency, add <thread> to other C++ files needed
      Closes: #878408
---
 debian/changelog               | 10 +++++++++-
 debian/patches/off_t-fix.patch | 40 ++++++++++++++++++++++++++--------------
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1b9f53d..6927027 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,15 @@
+cdo (1.9.1+dfsg.1-4) unstable; urgency=medium
+
+  * Workaround for off_t bug. off_t is defined differently (long vs long long)
+    if <thread>. For consistency, add <thread> to other C++ files needed
+    Closes: #878408
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 23 Oct 2017 16:09:43 +0100
+
 cdo (1.9.1+dfsg.1-3) unstable; urgency=medium
 
   * Change homepage to https://code.mpimet.mpg.de/projects/cdo
-  * Fix for off_t defintion on 32-bit systems. Closes: #878408
+  * Fix for off_t definition on 32-bit systems. Closes: #878408
 
  -- Alastair McKinstry <mckinstry at debian.org>  Sat, 21 Oct 2017 17:06:31 +0100
 
diff --git a/debian/patches/off_t-fix.patch b/debian/patches/off_t-fix.patch
index ce0143d..3c84f5e 100644
--- a/debian/patches/off_t-fix.patch
+++ b/debian/patches/off_t-fix.patch
@@ -1,19 +1,31 @@
-Description: Avoid pulling sys/types.h (unneeded) as we get 2 versions of off_t
- (C / C++ conflict?)
+Description: off_t has conflicting definiions if pulled in first after <thread>
+ or not (long vs long long, on 32-bit archs)
+ For consistency, add <thread> ahead where necessary
 Author: Alastair McKinstry <mckinstry at debian.org>
-Last-Updated: 2017-10-21
+Last-Updated: 2017-10-23
 Forwarded: no
 
-Index: cdo-1.9.1+dfsg.1/src/process.h
+Index: cdo-1.9.1+dfsg.1/src/Afterburner.cc
 ===================================================================
---- 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
+--- cdo-1.9.1+dfsg.1.orig/src/Afterburner.cc
++++ cdo-1.9.1+dfsg.1/src/Afterburner.cc
+@@ -10,6 +10,7 @@
+ /*                                                               */
+ /* ============================================================= */
  
--#include <sys/types.h> /* off_t */
-+// #include <sys/types.h> /* off_t */
- #include <vector>
- #include "util.h"
- #include "pstream.h"
++#include <thread>
+ #if defined(HAVE_CONFIG_H)
+ #include "config.h"
+ #endif
+Index: cdo-1.9.1+dfsg.1/src/process.cc
+===================================================================
+--- cdo-1.9.1+dfsg.1.orig/src/process.cc
++++ cdo-1.9.1+dfsg.1/src/process.cc
+@@ -15,6 +15,7 @@
+   GNU General Public License for more details.
+ */
+ 
++#include <thread>
+ #if defined(HAVE_CONFIG_H)
+ #include "config.h"
+ #endif

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