sci-misc/repsnapper: Added patch to fix compilation error with newer gcc

This bug is issued in newer gcc's because of abs() method is moved into
std namespace. Added a patch to fix the issue.
Reported in bug 594474

Reported-By: Toralf Förster <toralf.foerster@gmx.de>
Package-Manager: portage-2.3.0

diff --git a/sci-misc/repsnapper/files/std_abs.patch b/sci-misc/repsnapper/files/std_abs.patch
new file mode 100644 (file)
index 0000000..35aefe9
--- /dev/null
+++ b/sci-misc/repsnapper/files/std_abs.patch
@@ -0,0 +1,11 @@
+--- libraries/amf/amftools-code/include/STL_File.h.orig        2016-09-21 08:35:10.600313039 +0200
++++ libraries/amf/amftools-code/include/STL_File.h     2016-09-21 08:35:58.303647256 +0200
+@@ -89,7 +89,7 @@
+       Vec3D v;\r
+       int OrigIndex;\r
+ \r
+-      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\r
++      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\r
+       static double WeldThresh; //weld threshold for importing from STL\r
+ };\r
+ \r

diff --git a/sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild b/sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild
index a976a170f185b77165fa953c7b240c1ac4bd4523..ce016a8a30d5f4939c00823d92fb7d6779c96699 100644 (file)
--- a/sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild
+++ b/sci-misc/repsnapper/repsnapper-2.4a_p0.ebuild
@@ -31,6 +31,7 @@ RDEPEND=${DEPEND}
 
 src_prepare() {
        epatch "${FILESDIR}/std-c11.patch"
+       epatch "${FILESDIR}/std_abs.patch"
        eautoreconf
        append-cxxflags -std=c++11
 }

diff --git a/sci-misc/repsnapper/repsnapper-9999.ebuild b/sci-misc/repsnapper/repsnapper-9999.ebuild
index c56bddddca074c809e060ea5f7209397e9f5a1db..34e7a93b74be61bb5a7cf91bec8a280d6c1f1bd5 100644 (file)
--- a/sci-misc/repsnapper/repsnapper-9999.ebuild
+++ b/sci-misc/repsnapper/repsnapper-9999.ebuild
@@ -25,5 +25,8 @@ DEPEND="
 RDEPEND=${DEPEND}
 
 src_prepare() {
+       epatch "${FILESDIR}/std-c11.patch"
+       epatch "${FILESDIR}/std_abs.patch"
        eautoreconf
+       append-cxxflags -std=c++11
 }