From 9177f87b69f877c88eab584cd39cb423b400c13d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Sun, 17 Sep 2017 12:18:28 +0100 Subject: [PATCH] fix android build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ibb536240a623559f9da45b450eae1ec58e951d6e Reviewed-on: https://gerrit.libreoffice.org/42373 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- external/libzmf/UnpackedTarball_libzmf.mk | 4 ++++ external/libzmf/android-workaround.patch.1 | 14 ++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 external/libzmf/android-workaround.patch.1 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)