fix android build

Change-Id: Ibb536240a623559f9da45b450eae1ec58e951d6e
Reviewed-on: https://gerrit.libreoffice.org/42373Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

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:

external/libzmf/android-workaround.patch.1

+--- 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<Point> &points_)
+   : m_points(points_)
+   , m_width(0.0)