diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-09-17 12:18:28 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-09-17 15:04:24 +0200 |
| commit | 9177f87b69f877c88eab584cd39cb423b400c13d (patch) | |
| tree | 0e3f454e883b1f33e769631c19dbf4622fa14eaa /external/libzmf | |
| parent | e564aff1f064ce157643978ff9231808095c43a5 (diff) | |
fix android build
Change-Id: Ibb536240a623559f9da45b450eae1ec58e951d6e
Reviewed-on: https://gerrit.libreoffice.org/42373
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/libzmf')
| -rw-r--r-- | external/libzmf/UnpackedTarball_libzmf.mk | 4 | ||||
| -rw-r--r-- | external/libzmf/android-workaround.patch.1 | 14 |
2 files changed, 18 insertions, 0 deletions
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<Point> &points_) + : m_points(points_) + , m_width(0.0) |