From 8f891ad025f05d7888f7e0807a74b5aa6c8272a3 Mon Sep 17 00:00:00 2001
From: Fridrich Štrba <fridrich.strba@bluewin.ch>
Date: Thu, 2 May 2013 21:33:14 +0200
Subject: Trying to fix android build of libodfgen

Change-Id: I40be8e54199baf6f24a7b69b268fbff713a9a0a6
---
 libodfgen/UnpackedTarball_odfgen.mk     |  6 ++++++
 libodfgen/libodfgen-0.0.0-android.patch | 13 +++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 libodfgen/libodfgen-0.0.0-android.patch

(limited to 'libodfgen')

diff --git a/libodfgen/UnpackedTarball_odfgen.mk b/libodfgen/UnpackedTarball_odfgen.mk
index 45b8aaaa2670..8d595b917de0 100644
--- a/libodfgen/UnpackedTarball_odfgen.mk
+++ b/libodfgen/UnpackedTarball_odfgen.mk
@@ -11,4 +11,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,odfgen))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,odfgen,$(ODFGEN_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_set_patchlevel,odfgen,1))
+
+$(eval $(call gb_UnpackedTarball_add_patches,odfgen,\
+       libodfgen/libodfgen-0.0.0-android.patch \
+))
+
 # vim: set noet sw=4 ts=4:
diff --git a/libodfgen/libodfgen-0.0.0-android.patch b/libodfgen/libodfgen-0.0.0-android.patch
new file mode 100644
index 000000000000..2fea2caae07e
--- /dev/null
+++ b/libodfgen/libodfgen-0.0.0-android.patch
@@ -0,0 +1,13 @@
+diff --git a/src/OdgGenerator.cxx b/src/OdgGenerator.cxx
+index 39d571b..5ebf60d 100644
+--- a/src/OdgGenerator.cxx
++++ b/src/OdgGenerator.cxx
+@@ -282,7 +282,7 @@ static WPXString doubleToString(const double value)
+ {
+ 	WPXString tempString;
+ 	tempString.sprintf("%.4f", value);
+-#ifndef ANDROID
++#ifndef __ANDROID__
+ 	std::string decimalPoint(localeconv()->decimal_point);
+ #else
+ 	std::string decimalPoint(".");
-- 
cgit