strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix android build

Browse source 
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>
This commit is contained in:
Caolán McNamara 2017-09-17 12:18:28 +01:00
parent e564aff1f0
commit 9177f87b69
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
external/libzmf/UnpackedTarball_libzmf.mk vendored
View file

@ -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:

14
external/libzmf/android-workaround.patch.1 vendored Normal file
View file

@ -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)