[Libreoffice-commits] core.git: 2 commits - libodfgen/ExternalProject_libodfgen.mk libodfgen/libodfgen-0.0.0-android.patch libodfgen/UnpackedTarball_odfgen.mk

[Fridrich Å trba]

 libodfgen/ExternalProject_libodfgen.mk  |    1 +
 libodfgen/UnpackedTarball_odfgen.mk     |    6 ++++++
 libodfgen/libodfgen-0.0.0-android.patch |   13 +++++++++++++
 3 files changed, 20 insertions(+)

New commits:
commit 8f891ad025f05d7888f7e0807a74b5aa6c8272a3
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu May 2 21:33:14 2013 +0200

    Trying to fix android build of libodfgen
    
    Change-Id: I40be8e54199baf6f24a7b69b268fbff713a9a0a6

diff --git a/libodfgen/UnpackedTarball_odfgen.mk b/libodfgen/UnpackedTarball_odfgen.mk
index 45b8aaa..8d595b9 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 0000000..2fea2ca
--- /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(".");
commit b9237f2af295c3af2e8a7fcb7761ee44c70e02bf
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu May 2 21:24:06 2013 +0200

    We like Scott, but these warnings are not for public consumption
    
    Change-Id: I8af4c25abd288ed4d5ac754d2b685c3dcf9d081b

diff --git a/libodfgen/ExternalProject_libodfgen.mk b/libodfgen/ExternalProject_libodfgen.mk
index eb6e9c5..e7b5fa3 100644
--- a/libodfgen/ExternalProject_libodfgen.mk
+++ b/libodfgen/ExternalProject_libodfgen.mk
@@ -32,6 +32,7 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) :
 			--disable-shared \
 			--disable-debug \
 			--disable-werror \
+			--disable-weffc \
 			CXXFLAGS="$(if $(filter NO,$(SYSTEM_BOOST)),-I$(call gb_UnpackedTarball_get_dir,boost),$(BOOST_CPPFLAGS))" \
 			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
 		&& (cd $(EXTERNAL_WORKDIR)/src && $(MAKE)) \