diff -Nru repsnapper-2.4a0/debian/changelog repsnapper-2.4a0/debian/changelog --- repsnapper-2.4a0/debian/changelog 2015-11-26 14:15:47.000000000 -0200 +++ repsnapper-2.4a0/debian/changelog 2016-09-01 17:08:34.000000000 -0300 @@ -1,3 +1,13 @@ +repsnapper (2.4a0-1ubuntu1) yakkety; urgency=medium + + * debian/patches/0004-make-compile-with-gcc6.patch: fixes FTBFS + for gcc 6. (LP: #1619289) + * 0005-include-asm-generic.patch: workaround for mismathing headers + from linux-libc-dev package that causes repsnapper to FTBFS in both + powerpc and ppc64el. Closes: #810907. (LP: #1619100) + + -- Tiago Stürmer Daitx Thu, 01 Sep 2016 00:54:15 +0000 + repsnapper (2.4a0-1) unstable; urgency=low * New upstream release diff -Nru repsnapper-2.4a0/debian/patches/0004-make-compile-with-gcc6.patch repsnapper-2.4a0/debian/patches/0004-make-compile-with-gcc6.patch --- repsnapper-2.4a0/debian/patches/0004-make-compile-with-gcc6.patch 1969-12-31 21:00:00.000000000 -0300 +++ repsnapper-2.4a0/debian/patches/0004-make-compile-with-gcc6.patch 2016-09-01 10:08:44.000000000 -0300 @@ -0,0 +1,22 @@ +Description: call of overloaded ‘abs(double)’ is ambiguous + AMF Tools are integrated into Repsnapper and currently FTBFS on + Yakkety. Any abs(double) must be replaced by std::abs(double). + While the expectation was for it to affect all arches, for some + reason only PPC64EL and PPC are being affected. +Author: Tiago Stürmer Daitx +Bug: https://sourceforge.net/p/amftools/discussion/general/thread/bea6ee53/ +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/repsnapper/+bug/1619289 +Last-Update: 2016-09-01 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/libraries/amf/amftools-code/include/STL_File.h ++++ b/libraries/amf/amftools-code/include/STL_File.h +@@ -89,7 +89,7 @@ public: + Vec3D v; + int OrigIndex; + +- static inline bool IsSoftLessThan(const aWeldVertex& v1, const aWeldVertex& v2){if(abs(v1.v.z - v2.v.z) <= WeldThresh){ if(abs(v1.v.y - v2.v.y) <= WeldThresh){ return v1.v.x < v2.v.x-WeldThresh;}else return (v1.v.y < v2.v.y-WeldThresh);} else return (v1.v.z < v2.v.z-WeldThresh); } //Is less then (generates a "hash" for sorting vertices by z for set ++ static inline bool IsSoftLessThan(const aWeldVertex& v1, const aWeldVertex& v2){if(std::abs(v1.v.z - v2.v.z) <= WeldThresh){ if(std::abs(v1.v.y - v2.v.y) <= WeldThresh){ return v1.v.x < v2.v.x-WeldThresh;}else return (v1.v.y < v2.v.y-WeldThresh);} else return (v1.v.z < v2.v.z-WeldThresh); } //Is less then (generates a "hash" for sorting vertices by z for set + static double WeldThresh; //weld threshold for importing from STL + }; + diff -Nru repsnapper-2.4a0/debian/patches/0005-include-asm-generic.patch repsnapper-2.4a0/debian/patches/0005-include-asm-generic.patch --- repsnapper-2.4a0/debian/patches/0005-include-asm-generic.patch 1969-12-31 21:00:00.000000000 -0300 +++ repsnapper-2.4a0/debian/patches/0005-include-asm-generic.patch 2016-09-01 17:00:02.000000000 -0300 @@ -0,0 +1,29 @@ +Description: resnapper FTBFS due to mismathing headers in linux-libc-dev + The headers in linux-libc-dev are different in powerpc/ppc64el compared + to other archs, they seems to be missing include clauses to the + header under the asm-generic/ directory. + This patch works around that by explicitly including both headers under + asm-generic. + Note that the include of arm/termbits.h had to be removed because it + causes yet another conflict, this time due to the redefinition of types + termios and ktermios, which also only affects powepc/ppc64el. + +Author: Tiago Stürmer Daitx +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=810907 +Bug-Ubuntu: https://bugs.launchpad.net/debian/+source/repsnapper/+bug/1619100 +Forwarded: not-needed +Last-Update: 2016-09-01 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/src/printer/custom_baud.cpp ++++ b/src/printer/custom_baud.cpp +@@ -6,7 +6,8 @@ + #include + #include + #include +-#include ++#include ++#include + #endif + + bool set_custom_baudrate( int device_fd, int baudrate ) { diff -Nru repsnapper-2.4a0/debian/patches/series repsnapper-2.4a0/debian/patches/series --- repsnapper-2.4a0/debian/patches/series 2015-11-26 13:58:06.000000000 -0200 +++ repsnapper-2.4a0/debian/patches/series 2016-09-01 17:08:52.000000000 -0300 @@ -1,3 +1,5 @@ 01_use_system_libvmmlib.patch 02_fix_POTFILES.in.patch 0003-make-compile-with-gcc5.2.patch +0004-make-compile-with-gcc6.patch +0005-include-asm-generic.patch