Bug#834472: vmmlib: Patch for address #834472 , #897845

2018-11-02 Thread Dr. Bas Wijnen 
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) 

> diff -Nru vmmlib-1.0/debian/changelog vmmlib-1.0/debian/changelog
> --- vmmlib-1.0/debian/changelog   2012-04-29 07:22:43.0 +0800
> +++ vmmlib-1.0/debian/changelog   2018-10-31 00:10:19.0 +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)   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.0 +0800
> +++ vmmlib-1.0/debian/compat  2018-10-29 16:05:44.0 +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.0 +0800
> +++ vmmlib-1.0/debian/control 2018-10-29 16:05:53.0 +0800
> @@ -2,7 +2,7 @@
>  Section: libdevel
>  Priority: optional
>  Maintainer: Bas Wijnen 
> -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.patch1970-01-01 
> 08:00:00.0 +0800
> +++ vmmlib-1.0/debian/patches/fix_ftbfs_gcc8.patch2018-10-29 
> 19:46:59.0 +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 
> +Author: Ying-Chun Liu (PaulLiu) 
> +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 
> + #include 
> + #include 
> +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 
> + #include 
> + 
> +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 
> + #include 
> + 
> +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 
> + #include 
> + 
> +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 
> + #include 
> + #include 
> +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 
> + #include 
> + #include 
> +Index: vmmlib-1.0/tests/t3_hosvd_test.cpp
>

Bug#834472: vmmlib: Patch for address #834472 , #897845

2018-10-30 Thread Ying-Chun Liu (PaulLiu) 
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) 
diff -Nru vmmlib-1.0/debian/changelog vmmlib-1.0/debian/changelog
--- vmmlib-1.0/debian/changelog 2012-04-29 07:22:43.0 +0800
+++ vmmlib-1.0/debian/changelog 2018-10-31 00:10:19.0 +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)   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/compat2011-11-26 17:22:16.0 +0800
+++ vmmlib-1.0/debian/compat2018-10-29 16:05:44.0 +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.0 +0800
+++ vmmlib-1.0/debian/control   2018-10-29 16:05:53.0 +0800
@@ -2,7 +2,7 @@
 Section: libdevel
 Priority: optional
 Maintainer: Bas Wijnen 
-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.0 +0800
+++ vmmlib-1.0/debian/patches/fix_ftbfs_gcc8.patch  2018-10-29 
19:46:59.0 +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 
+Author: Ying-Chun Liu (PaulLiu) 
+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 
+ #include 
+ #include 
+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 
+ #include 
+ 
+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 
+ #include 
+ 
+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 
+ #include 
+ 
+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 
+ #include 
+ #include 
+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 
+ #include 
+ #include 
+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:

Bug#834472: vmmlib: Patch for address #834472 , #897845

2018-10-30 Thread Ying-Chun Liu (PaulLiu) 
Tags: patch

Hi, I make a patch to address these 2 bugs.
Please see the attachment.

I've also tested build with repsnapper.
repsnapper needs another patch to use libpolyclipping-dev, but it builds
well after this patch applied to vmmlib.

Yours,
Paul

-- 
PaulLiu (劉穎駿)
E-mail: Ying-Chun Liu (PaulLiu) 
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 
Author: Ying-Chun Liu (PaulLiu) 
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 
 #include 
 #include 
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 
 #include 
 
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 
 #include 
 
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 
 #include 
 
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 
 #include 
 #include 
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 
 #include 
 #include 
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 
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 
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 


signature.asc
Description: OpenPGP digital signature