[Libreoffice-commits] .: 2 commits - distro-configs/LibreOfficeAndroid.conf libcmis/ExternalLib_libcmis.mk libcmis/libcmis-0.1.0-autotools.patch libcmis/Module_libcmis.mk

[Thorsten Behrens]

 distro-configs/LibreOfficeAndroid.conf |    1 +
 libcmis/ExternalLib_libcmis.mk         |    3 ++-
 libcmis/Module_libcmis.mk              |    2 +-
 libcmis/libcmis-0.1.0-autotools.patch  |   29 +++++++++++++++++++++++++++++
 4 files changed, 33 insertions(+), 2 deletions(-)

New commits:
commit ff04ef4ed7c370a4da4e9467937e5a66450c72cc
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Tue Oct 4 11:05:46 2011 +0200

    Disable libcmis for Android for the while

diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index 6075646..45befb1 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -18,4 +18,5 @@
 --without-java
 --without-junit
 --without-ppds
+--without-cmis
 --without-stlport
diff --git a/libcmis/Module_libcmis.mk b/libcmis/Module_libcmis.mk
index 3c0beeb..f311acf 100644
--- a/libcmis/Module_libcmis.mk
+++ b/libcmis/Module_libcmis.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Module_Module,libcmis))
 
-ifneq ($(ENABLE_CMIS),)
+ifeq ($(ENABLE_CMIS),TRUE)
 $(eval $(call gb_Module_add_targets,libcmis,\
 	ExternalLib_libcmis \
 ))
commit 9c74d5c3f614171dcf045e9b1165a615d3161695
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Tue Oct 4 10:27:31 2011 +0200

    Initial support for Android

diff --git a/libcmis/ExternalLib_libcmis.mk b/libcmis/ExternalLib_libcmis.mk
index 156b8c3..12f6b74 100644
--- a/libcmis/ExternalLib_libcmis.mk
+++ b/libcmis/ExternalLib_libcmis.mk
@@ -30,8 +30,9 @@ $(eval $(call gb_ExternalLib_ExternalLib,libcmis,autotools))
 
 $(eval $(call gb_ExternalLib_set_src_package,libcmis,d821b3cdeba34db1d084b9bd709b3a52-libcmis-0.1.0.tar.gz))
 $(eval $(call gb_ExternalLib_add_conf_arg,libcmis,--disable-client))
+$(eval $(call gb_ExternalLib_add_patch,libcmis,libcmis/libcmis-0.1.0-autotools.patch))
 
-ifeq ($(OS),MACOSX)
+ifneq ($(filter $(OS),MACOSX ANDROID),)
 
 $(eval $(call gb_ExternalLib_add_conf_arg,libcmis,'CPPUNIT_LIBS=""'))
 $(eval $(call gb_ExternalLib_add_conf_arg,libcmis,'CPPUNIT_CFLAGS=""'))
diff --git a/libcmis/libcmis-0.1.0-autotools.patch b/libcmis/libcmis-0.1.0-autotools.patch
new file mode 100644
index 0000000..29e492e
--- /dev/null
+++ b/libcmis/libcmis-0.1.0-autotools.patch
@@ -0,0 +1,29 @@
+--- bleh/config.sub	2011-09-27 22:48:43.000000000 +0200
++++ blah/config.sub	2011-10-04 09:26:51.000000000 +0200
+@@ -4,7 +4,7 @@
+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+ #   Free Software Foundation, Inc.
+ 
+-timestamp='2009-11-20'
++timestamp='2011-10-04'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -123,7 +123,7 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
++  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+   kopensolaris*-gnu* | \
+   storm-chaos* | os2-emx* | rtmk-nova*)
+@@ -1294,7 +1294,7 @@
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* | -cegcc* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
++	      | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
+ 	      | -uxpv* | -beos* | -mpeix* | -udk* \
+ 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \