Hi, Thanks for the help! I don't have time to test it now, but the patch looks good. Feel free to NMU without delay.
Thanks, Bas On Wed, Oct 31, 2018 at 12:24:29AM +0800, Ying-Chun Liu (PaulLiu) wrote: > Hi all, > > I'll also do NMU in 10 days if nobody denies it. > > debdiff as attachment > > Yours, > Paul > > > -- > PaulLiu (劉穎駿) > E-mail: Ying-Chun Liu (PaulLiu) <paul...@debian.org> > diff -Nru vmmlib-1.0/debian/changelog vmmlib-1.0/debian/changelog > --- vmmlib-1.0/debian/changelog 2012-04-29 07:22:43.000000000 +0800 > +++ vmmlib-1.0/debian/changelog 2018-10-31 00:10:19.000000000 +0800 > @@ -1,3 +1,11 @@ > +vmmlib (1.0-2.1) unstable; urgency=low > + > + * Non-maintainer upload. > + * Add debian/patches/fix_ftbfs_gcc8.patch > + - Fix FTBFS on gcc8 (Closes: #897845) (Closes: #834472) > + > + -- Ying-Chun Liu (PaulLiu) <paul...@debian.org> Wed, 31 Oct 2018 00:10:19 > +0800 > + > vmmlib (1.0-2) unstable; urgency=low > > * Add dependency to build test suite. (Closes: #663949) > diff -Nru vmmlib-1.0/debian/compat vmmlib-1.0/debian/compat > --- vmmlib-1.0/debian/compat 2011-11-26 17:22:16.000000000 +0800 > +++ vmmlib-1.0/debian/compat 2018-10-29 16:05:44.000000000 +0800 > @@ -1 +1 @@ > -8 > +10 > diff -Nru vmmlib-1.0/debian/control vmmlib-1.0/debian/control > --- vmmlib-1.0/debian/control 2012-04-29 07:22:07.000000000 +0800 > +++ vmmlib-1.0/debian/control 2018-10-29 16:05:53.000000000 +0800 > @@ -2,7 +2,7 @@ > Section: libdevel > Priority: optional > Maintainer: Bas Wijnen <wij...@debian.org> > -Build-Depends: debhelper (>= 8), libblas-dev, liblapack-dev, libf2c2-dev > +Build-Depends: debhelper (>= 10), libblas-dev, liblapack-dev, libf2c2-dev > Standards-Version: 3.9.3 > > Package: libvmmlib-dev > diff -Nru vmmlib-1.0/debian/patches/fix_ftbfs_gcc8.patch > vmmlib-1.0/debian/patches/fix_ftbfs_gcc8.patch > --- vmmlib-1.0/debian/patches/fix_ftbfs_gcc8.patch 1970-01-01 > 08:00:00.000000000 +0800 > +++ vmmlib-1.0/debian/patches/fix_ftbfs_gcc8.patch 2018-10-29 > 19:46:59.000000000 +0800 > @@ -0,0 +1,142 @@ > +Description: Fix FTBFS on gcc-8 > + There are several build failed due to min/max/abs defined somewhere. > + We have to undef it to let it uses those from <algorithm> > +Author: Ying-Chun Liu (PaulLiu) <paul...@debian.org> > +Bug-Debian: https://bugs.debian.org/834472 > +Last-Update: 2018-10-25 > +Index: vmmlib-1.0/include/vmmlib/vector.hpp > +=================================================================== > +--- vmmlib-1.0.orig/include/vmmlib/vector.hpp > ++++ vmmlib-1.0/include/vmmlib/vector.hpp > +@@ -1,6 +1,10 @@ > + #ifndef __VMML__VECTOR__HPP__ > + #define __VMML__VECTOR__HPP__ > + > ++#undef min > ++#undef max > ++#undef abs > ++ > + #include <vmmlib/vmmlib_config.hpp> > + #include <vmmlib/math.hpp> > + #include <vmmlib/enable_if.hpp> > +Index: vmmlib-1.0/include/vmmlib/quaternion.hpp > +=================================================================== > +--- vmmlib-1.0.orig/include/vmmlib/quaternion.hpp > ++++ vmmlib-1.0/include/vmmlib/quaternion.hpp > +@@ -757,7 +757,7 @@ quaternion< T >::operator-=( const vecto > + x() -= xyz.x(); > + y() -= xyz.y(); > + z() -= xyz.z(); > +- return *this; > ++ //return *this; > + } > + > + > +Index: vmmlib-1.0/tests/tensor3_test.cpp > +=================================================================== > +--- vmmlib-1.0.orig/tests/tensor3_test.cpp > ++++ vmmlib-1.0/tests/tensor3_test.cpp > +@@ -1,5 +1,9 @@ > + #include "tensor3_test.hpp" > + > ++#undef max > ++#undef min > ++#undef abs > ++ > + #include <vmmlib/tensor3.hpp> > + #include <sstream> > + > +Index: vmmlib-1.0/tests/tucker3_tensor_test.cpp > +=================================================================== > +--- vmmlib-1.0.orig/tests/tucker3_tensor_test.cpp > ++++ vmmlib-1.0/tests/tucker3_tensor_test.cpp > +@@ -1,5 +1,9 @@ > + #include "tucker3_tensor_test.hpp" > + > ++#undef min > ++#undef max > ++#undef abs > ++ > + #include <vmmlib/tucker3_tensor.hpp> > + #include <sstream> > + > +Index: vmmlib-1.0/tests/qtucker3_tensor_test.cpp > +=================================================================== > +--- vmmlib-1.0.orig/tests/qtucker3_tensor_test.cpp > ++++ vmmlib-1.0/tests/qtucker3_tensor_test.cpp > +@@ -1,4 +1,6 @@ > + #include "qtucker3_tensor_test.hpp" > ++#undef min > ++ > + #include <vmmlib/qtucker3_tensor.hpp> > + #include <sstream> > + > +Index: vmmlib-1.0/tests/tucker3_exporter_importer_test.cpp > +=================================================================== > +--- vmmlib-1.0.orig/tests/tucker3_exporter_importer_test.cpp > ++++ vmmlib-1.0/tests/tucker3_exporter_importer_test.cpp > +@@ -1,4 +1,5 @@ > + #include "tucker3_exporter_importer_test.hpp" > ++#undef min > + #include <vmmlib/tucker3_exporter.hpp> > + #include <vmmlib/tucker3_importer.hpp> > + #include <sstream> > +Index: vmmlib-1.0/tests/cp3_tensor_test.cpp > +=================================================================== > +--- vmmlib-1.0.orig/tests/cp3_tensor_test.cpp > ++++ vmmlib-1.0/tests/cp3_tensor_test.cpp > +@@ -1,4 +1,5 @@ > + #include "cp3_tensor_test.hpp" > ++#undef min > + #include <vmmlib/cp3_tensor.hpp> > + #include <vmmlib/t3_hopm.hpp> > + #include <sstream> > +Index: vmmlib-1.0/tests/t3_hosvd_test.cpp > +=================================================================== > +--- vmmlib-1.0.orig/tests/t3_hosvd_test.cpp > ++++ vmmlib-1.0/tests/t3_hosvd_test.cpp > +@@ -1,3 +1,4 @@ > ++#undef min > + #include "t3_hosvd_test.hpp" > + #include "vmmlib/t3_hosvd.hpp" > + > +Index: vmmlib-1.0/tests/t3_hooi_test.cpp > +=================================================================== > +--- vmmlib-1.0.orig/tests/t3_hooi_test.cpp > ++++ vmmlib-1.0/tests/t3_hooi_test.cpp > +@@ -1,3 +1,4 @@ > ++#undef min > + #include "t3_hooi_test.hpp" > + #include "vmmlib/t3_hooi.hpp" > + > +Index: vmmlib-1.0/tests/t3_hopm_test.cpp > +=================================================================== > +--- vmmlib-1.0.orig/tests/t3_hopm_test.cpp > ++++ vmmlib-1.0/tests/t3_hopm_test.cpp > +@@ -1,3 +1,4 @@ > ++#undef min > + #include "t3_hopm_test.hpp" > + #include "vmmlib/t3_hopm.hpp" > + #include <sstream> > +Index: vmmlib-1.0/tests/t3_ihopm_test.cpp > +=================================================================== > +--- vmmlib-1.0.orig/tests/t3_ihopm_test.cpp > ++++ vmmlib-1.0/tests/t3_ihopm_test.cpp > +@@ -1,3 +1,4 @@ > ++#undef min > + #include "t3_ihopm_test.hpp" > + #include "vmmlib/t3_ihopm.hpp" > + #include <sstream> > +Index: vmmlib-1.0/Makefile > +=================================================================== > +--- vmmlib-1.0.orig/Makefile > ++++ vmmlib-1.0/Makefile > +@@ -27,7 +27,7 @@ VMMLIB_UNIT_TESTS =\ > + > + VMMLIB_UNIT_TESTS_OBJECTS = ${VMMLIB_UNIT_TESTS:%.cpp=%.o} > + > +-CXXFLAGS += -I. -Iinclude -Itests -include stdint.h > ++CXXFLAGS += -I. -Iinclude -Itests -include cstdint -include algorithm > -include string -include iostream > + > + # Mac OS X specific stuff > + # on mac we want to use the frameworks, not the unix style libs > diff -Nru vmmlib-1.0/debian/patches/series vmmlib-1.0/debian/patches/series > --- vmmlib-1.0/debian/patches/series 2012-01-28 02:55:13.000000000 +0800 > +++ vmmlib-1.0/debian/patches/series 2018-10-29 19:18:01.000000000 +0800 > @@ -1 +1,2 @@ > fix-makefile > +fix_ftbfs_gcc8.patch
signature.asc
Description: PGP signature
