[Libreoffice-commits] .: libwpd/libwpd-0.9.2.patch libwpd/makefile.mk

[Tor Lillqvist]

 libwpd/libwpd-0.9.2.patch |   14 ++++++++++++++
 libwpd/makefile.mk        |    3 +++
 2 files changed, 17 insertions(+)

New commits:
commit 2b04f15213f83b3e7ff5d6cb9f8b0c4a4f053eb9
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Jun 10 00:22:07 2011 +0300

    Need a small patch for Android

diff --git a/libwpd/libwpd-0.9.2.patch b/libwpd/libwpd-0.9.2.patch
new file mode 100644
index 0000000..2fc7074
--- /dev/null
+++ b/libwpd/libwpd-0.9.2.patch
@@ -0,0 +1,14 @@
+--- misc/build/libwpd-0.9.2/src/lib/libwpd_internal.cpp
++++ misc/build/libwpd-0.9.2/src/lib/libwpd_internal.cpp
+@@ -1229,7 +1229,11 @@
+ 		tempString.sprintf("0.0000");
+ 	else
+ 		tempString.sprintf("%.4f", value);
++#ifndef __ANDROID__
+ 	std::string decimalPoint(localeconv()->decimal_point);
++#else
++	std::string decimalPoint(".");
++#endif
+ 	if ((decimalPoint.size() == 0) || (decimalPoint == "."))
+ 		return tempString;
+ 	std::string stringValue(tempString.cstr());
diff --git a/libwpd/makefile.mk b/libwpd/makefile.mk
index a8b17ff..8761bbb 100644
--- a/libwpd/makefile.mk
+++ b/libwpd/makefile.mk
@@ -43,6 +43,9 @@ TARGET=wpd
 
 TARFILE_NAME=libwpd-0.9.2
 TARFILE_MD5=8d265a592619166f29c4672ea54812b7
+
+PATCH_FILES=$(TARFILE_NAME).patch
+
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src$/lib