[med-svn] [libcereal] 01/01: apply enhanced arch compatability patch from upstream

[Michael Crusoe]

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

misterc-guest pushed a commit to branch master
in repository libcereal.

commit 87ed83210609a9691a568b73e7c2a990d6805f6d
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Date:   Thu Feb 11 13:50:08 2016 -0800

    apply enhanced arch compatability patch from upstream
---
 debian/changelog           |  8 +++++++-
 debian/control             |  2 +-
 debian/patches/more_compat | 49 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 4 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 30c13be..5580bcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-libcereal (1.1.2-2) UNRELEASED; urgency=medium
+libcereal (1.1.2-3) UNRELEASED; urgency=medium
+
+  * Applied patch from upstream, try building on all archs again. 
+
+ -- Michael R. Crusoe <crusoe at ucdavis.edu>  Thu, 11 Feb 2016 14:04:10 -0800
+
+libcereal (1.1.2-2) unstable; urgency=medium
 
   * Only build for *-amd64, sparc64 until upstream fixes their code.
   (Closes: # 813280, #813281, #813282)
diff --git a/debian/control b/debian/control
index 05818e8..c785a9e 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Vcs-Git: https://anonscm.debian.org/git/debian-med/libcereal.git
 Homepage: http://uscilab.github.io/cereal/
 
 Package: libcereal-dev
-Architecture: any-amd64 any-arm64 armel armhf any-ppc64el any-s390x any-alpha any-hppa any-m68k any-mips64el any-ppc64 any-sh4 any-sparc64
+Architecture: any
 Depends: ${misc:Depends}
 Description: C++11 library for serialization
  cereal is a header-only C++11 serialization library. cereal takes arbitrary
diff --git a/debian/patches/more_compat b/debian/patches/more_compat
new file mode 100644
index 0000000..398e3ff
--- /dev/null
+++ b/debian/patches/more_compat
@@ -0,0 +1,49 @@
+From fc17bd94e6022db986cb325c03407fc4bdf1280d Mon Sep 17 00:00:00 2001
+Author: Kalle Huttunen <kalle.huttunen at ge.com>
+Date: Fri, 22 Jan 2016 10:00:59 +0200
+Description: Fix test compilation on ARM based platform
+Origin: https://github.com/USCiLab/cereal/pull/257
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- libcereal.orig/CMakeLists.txt
++++ libcereal/CMakeLists.txt
+@@ -10,7 +10,7 @@
+ find_package(Boost COMPONENTS serialization unit_test_framework)
+ 
+ if(Boost_FOUND)
+-  include_directories(${Boost_INCLUDE_DIRS})
++  include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+   enable_testing()
+   if(NOT ONLY_TEST)
+     include_directories(./include)
+--- libcereal.orig/include/cereal/archives/xml.hpp
++++ libcereal/include/cereal/archives/xml.hpp
+@@ -525,6 +525,7 @@
+       //! Loads a type best represented as an unsigned long from the current top node
+       template <class T, traits::EnableIf<std::is_unsigned<T>::value,
+                                           !std::is_same<T, bool>::value,
++                                          !std::is_same<T, char>::value,
+                                           !std::is_same<T, unsigned char>::value,
+                                           sizeof(T) < sizeof(long long)> = traits::sfinae> inline
+       void loadValue( T & value )
+--- libcereal.orig/include/cereal/archives/json.hpp
++++ libcereal/include/cereal/archives/json.hpp
+@@ -641,14 +641,14 @@
+       //! Serialize a long if it would not be caught otherwise
+       template <class T> inline
+       typename std::enable_if<std::is_same<T, long>::value &&
+-                              !std::is_same<T, std::int32_t>::value &&
++                              sizeof(T) >= sizeof(std::int64_t) &&
+                               !std::is_same<T, std::int64_t>::value, void>::type
+       loadValue( T & t ){ loadLong(t); }
+ 
+       //! Serialize an unsigned long if it would not be caught otherwise
+       template <class T> inline
+       typename std::enable_if<std::is_same<T, unsigned long>::value &&
+-                              !std::is_same<T, std::uint32_t>::value &&
++                              sizeof(T) >= sizeof(std::uint64_t) &&
+                               !std::is_same<T, std::uint64_t>::value, void>::type
+       loadValue( T & t ){ loadLong(t); }
+       #endif // _MSC_VER
diff --git a/debian/patches/series b/debian/patches/series
index a51e923..3d0d8c4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 drop-google-analytics
 add-only-tests-target
+more_compat

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/libcereal.git