[Libreoffice-commits] .: 2 commits - libvisio/libvisio-android.patch libvisio/makefile.mk libwpg/libwpg-0.2.0.patch libwpg/makefile.mk

[Tor Lillqvist]

 libvisio/libvisio-android.patch |   14 ++++++++++++++
 libvisio/makefile.mk            |    3 ++-
 libwpg/libwpg-0.2.0.patch       |   14 ++++++++++++++
 libwpg/makefile.mk              |    4 ++++
 4 files changed, 34 insertions(+), 1 deletion(-)

New commits:
commit c7a79f53c335e297afb522422b2c1b1bd3fe0039
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Jun 10 00:34:18 2011 +0300

    Need a small patch for Android

diff --git a/libvisio/libvisio-android.patch b/libvisio/libvisio-android.patch
new file mode 100644
index 0000000..b547913
--- /dev/null
+++ b/libvisio/libvisio-android.patch
@@ -0,0 +1,14 @@
+--- misc/build/libvisio-0.0.0/src/lib/VSDSVGGenerator.cpp
++++ misc/build/libvisio-0.0.0/src/lib/VSDSVGGenerator.cpp
+@@ -33,7 +33,11 @@
+ {
+   std::ostringstream tempStream;
+   tempStream << value;
++#ifndef __ANDROID__
+   std::string decimalPoint(localeconv()->decimal_point);
++#else
++  std::string decimalPoint(".");
++#endif
+   if ((decimalPoint.size() == 0) || (decimalPoint == "."))
+     return tempStream.str();
+   std::string stringValue(tempStream.str());
diff --git a/libvisio/makefile.mk b/libvisio/makefile.mk
index 33708ba..7f2cbf3 100644
--- a/libvisio/makefile.mk
+++ b/libvisio/makefile.mk
@@ -58,7 +58,8 @@ TARFILE_NAME=libvisio-0.0.0
 TARFILE_MD5=763bb9b14eec5ba9a533d7a9279301db
 
 PATCH_FILES=\
-    libvisio-mingw-cross.patch
+    libvisio-mingw-cross.patch \
+    libvisio-android.patch
 
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src$/lib
commit b19fa8c1a642f9fce9e6dcb9f07ed4aa176672d6
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Jun 10 00:30:50 2011 +0300

    Need a small patch for Android

diff --git a/libwpg/libwpg-0.2.0.patch b/libwpg/libwpg-0.2.0.patch
new file mode 100644
index 0000000..86567b1
--- /dev/null
+++ b/libwpg/libwpg-0.2.0.patch
@@ -0,0 +1,14 @@
+--- misc/build/libwpg-0.2.0/src/lib/WPGSVGGenerator.cpp
++++ misc/build/libwpg-0.2.0/src/lib/WPGSVGGenerator.cpp
+@@ -30,7 +30,11 @@
+ {
+   std::ostringstream tempStream;
+   tempStream << value;
++#ifndef __ANDROID__
+   std::string decimalPoint(localeconv()->decimal_point);
++#else
++  std::string decimalPoint(".");
++#endif
+   if ((decimalPoint.size() == 0) || (decimalPoint == "."))
+     return tempStream.str();
+   std::string stringValue(tempStream.str());
diff --git a/libwpg/makefile.mk b/libwpg/makefile.mk
index 0fa701f..44eccce 100644
--- a/libwpg/makefile.mk
+++ b/libwpg/makefile.mk
@@ -51,6 +51,10 @@ INCPRE+=$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc$/libwpd-stream
 
 TARFILE_NAME=libwpg-0.2.0
 TARFILE_MD5=5ba6a61a2f66dfd5fee8cdd4cd262a37
+
+PATCH_FILES=$(TARFILE_NAME).patch
+
+
 BUILD_ACTION=dmake $(MFLAGS) $(CALLMACROS)
 BUILD_DIR=src/lib