diff --git a/external/libzmf/UnpackedTarball_libzmf.mk b/external/libzmf/UnpackedTarball_libzmf.mk index 324638479ebb..4055bde8c858 100644 --- a/external/libzmf/UnpackedTarball_libzmf.mk +++ b/external/libzmf/UnpackedTarball_libzmf.mk @@ -21,4 +21,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libzmf, \ endif endif +$(eval $(call gb_UnpackedTarball_add_patches,libzmf, \ + external/libzmf/android-workaround.patch.1 \ +)) + # vim: set noet sw=4 ts=4: diff --git a/external/libzmf/android-workaround.patch.1 b/external/libzmf/android-workaround.patch.1 new file mode 100644 index 000000000000..a46c5e8c3972 --- /dev/null +++ b/external/libzmf/android-workaround.patch.1 @@ -0,0 +1,14 @@ +--- libzmf.orig/src/lib/ZMFTypes.cpp 2017-09-17 12:14:41.987990622 +0100 ++++ libzmf/src/lib/ZMFTypes.cpp 2017-09-17 12:16:32.636850391 +0100 +@@ -38,10 +38,9 @@ + + double Point::distance(const Point &p2) const + { +- return std::hypot(p2.x - x, p2.y - y); ++ return ::hypot(p2.x - x, p2.y - y); + } + +- + BoundingBox::BoundingBox(const std::vector &points_) + : m_points(points_) + , m_width(0.0)