summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2011-06-10 00:22:07 +0300
committerTor Lillqvist <tml@iki.fi>2011-06-10 00:22:07 +0300
commit2b04f15213f83b3e7ff5d6cb9f8b0c4a4f053eb9 (patch)
treeddab4eef4e09460fb94831320c3f70f65af16ff1
parenta63802105e2df2c57c7bdad0ea6d5fd6e5a14a9a (diff)
Need a small patch for Android
-rw-r--r--libwpd/libwpd-0.9.2.patch14
-rw-r--r--libwpd/makefile.mk3
2 files changed, 17 insertions, 0 deletions
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