[odb-api] 08/14: Fix for unsigned long convert to size_t on 32-bit systems. Closes: #880680

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository odb-api.

commit 3d2fc582dab2bca127a21fe0a22a7f8e59c4134c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Nov 4 17:55:16 2017 +0000

    Fix for unsigned long convert to size_t on 32-bit systems. Closes: #880680
---
 debian/changelog                            |  1 +
 debian/patches/series                       |  1 +
 debian/patches/unsigned-long-on-32bit.patch | 13 +++++++++++++
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 860b3f7..d329664 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ odb-api (0.17.4-1) UNRELEASED; urgency=medium
   * Add ksh depenendency for libodb-api-bin
   * Set DISABLE_OS_CHECK=On. Closes: #880681
   * Sanitise build path in cmake files for reproducibility.
+  * Fix for unsigned long convert to size_t on 32-bit systems. Closes: #880680
 
  -- Alastair McKinstry <mckinstry at debian.org>  Fri, 03 Nov 2017 13:28:15 +0000
 
diff --git a/debian/patches/series b/debian/patches/series
index 4ba8d87..86351d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,5 @@
 python-multiarch.patch
 shared_lib.patch
 python3.patch
+unsigned-long-on-32bit.patch
 py3-port.patch
diff --git a/debian/patches/unsigned-long-on-32bit.patch b/debian/patches/unsigned-long-on-32bit.patch
new file mode 100644
index 0000000..123576c
--- /dev/null
+++ b/debian/patches/unsigned-long-on-32bit.patch
@@ -0,0 +1,13 @@
+Index: odb-api-0.17.4/eckit/tests/config/test_configuration.cc
+===================================================================
+--- odb-api-0.17.4.orig/eckit/tests/config/test_configuration.cc
++++ odb-api-0.17.4/eckit/tests/config/test_configuration.cc
+@@ -52,7 +52,7 @@ CASE( "test_configuration_interface" )
+     std::string         value_string          = std::string("string");
+     std::vector<int>    value_arr_int         = make_vector(1,2,3);
+     std::vector<long>   value_arr_long        = make_vector(4l,5l);
+-    std::vector<size_t> value_arr_size_t      = make_vector(6ul,7ul);
++    std::vector<size_t> value_arr_size_t      = make_vector(6,7);
+     std::vector<float>  value_arr_float       = make_vector(1.234567f,2.345678f);
+     std::vector<double> value_arr_double      = make_vector(1.234567,2.345678);
+     std::vector<std::string> value_arr_string = make_vector(std::string("hello"),std::string("world"));

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